Merge lp:~openerp-dev/openobject-addons/trunk-bug-1091268-api into lp:openobject-addons

[Arnaud Pineux (OpenERP)]

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

order_infos['origin'] can be False if first origin of first purchase order is empty.

Thus it will fail on order_infos['origin'].split(" ")

review: Needs Fixing

Unmerged revisions

8404. By Arnaud Pineux (OpenERP) on 2012-12-19

[FIX] origin duplication during purchase merge resolved

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-12-18 22:50:15 +0000
+++ purchase/purchase.py	2012-12-19 10:57:23 +0000
@@ -766,8 +766,8 @@
                 if porder.notes:
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if porder.origin:
-                    order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
-
+                    if not porder.origin in order_infos['origin'].split(" ") and not order_infos['origin'] in porder.origin.split(" "):
+                        order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
             for order_line in porder.order_line:
                 line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'product_id', 'move_dest_id', 'account_analytic_id'))
                 o_line = order_infos['order_line'].setdefault(line_key, {})