Ujjvala Collins (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/addons1-crm-imp-uco-yml into
lp:~openerp-dev/openobject-addons/addons1-crm-imp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons1-crm-imp-uco-yml/+merge/48890
[FIX] crm_claim: Reverted changes of Revision ID:
[email protected].
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons1-crm-imp-uco-yml/+merge/48890
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/addons1-crm-imp-uco-yml into
lp:~openerp-dev/openobject-addons/addons1-crm-imp.
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-02-08 09:52:19 +0000
+++ crm/crm.py 2011-02-08 10:01:26 +0000
@@ -225,7 +225,10 @@
next_stage_id = False
for case in self.browse(cr, uid, ids, context=context):
+<<<<<<< TREE
+=======
+>>>>>>> MERGE-SOURCE
next_stage = False
value = {}
if case.section_id.id :
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-web
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-web
More help : https://help.launchpad.net/ListHelp
