Merge lp:~yann-papouin/openobject-addons/7.0-bug-1091268-purchase-merge-no-origin-duplicates into lp:openobject-addons/7.0

[Yann Papouin]

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

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

Thus it will fail when checking

not porder.origin in order_infos['origin']

review: Needs Fixing

Unmerged revisions

9885. By Yann Papouin on 2014-03-09

Do not duplicate origin when merging purchase orders

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-01-29 16:32:38 +0000
+++ purchase/purchase.py	2014-03-10 08:59:32 +0000
@@ -797,7 +797,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'] and not order_infos['origin'] in porder.origin:
+                        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'))