[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130521085838-315xr9p5c3k4rufn
2013-05-21 10:58:38 +02:00
parent 2f2d833a4a d51cf60616
commit d7d26abe81
2 changed files with 1913 additions and 1 deletions
@@ -614,7 +614,7 @@
            <field name="state">code</field>
            <field name="code">
                if context.get('active_model') == 'crm.lead' and context.get('active_ids'):
-                    self.case_mark_lost(cr, uid, context['active_ids'], context=context)
+                    self.case_cancel(cr, uid, context['active_ids'], context=context)
            </field>
        </record>