Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons_issue-fix-mma into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue-fix-mma/+merge/120527
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons_issue-fix-mma/+merge/120527
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons_issue-fix-mma.
=== modified file 'crm/crm_lead_view.xml'
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2012-08-15 22:30:38 +0000
+++ crm/crm_phonecall_view.xml 2012-08-21 09:56:30 +0000
@@ -110,6 +110,7 @@
states="open,pending"/>
<button name="case_reset" string="Reset to Todo" type="object"
states="cancel"/>
+<<<<<<< TREE
<button string="Convert to Opportunity"
name="%(phonecall2opportunity_act)d"
type="action"
@@ -118,6 +119,16 @@
name="%(phonecall2opportunity_act)d"
type="action"
attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
+=======
+ <button string="Convert to Opportunity"
+ name="%(phonecall2opportunity_act)d"
+ type="action"
+ attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}" />
+ <button string="Convert to Opportunity" class="oe_highlight"
+ name="%(phonecall2opportunity_act)d"
+ type="action"
+ attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}" />
+>>>>>>> MERGE-SOURCE
<button string="Schedule Other Call"
name="%(phonecall_to_phonecall_act)d"
type="action"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
