openerp-community-reviewer team mailing list archive

["Yannick Vaucher @ Camptocamp" <yannick.vaucher@xxxxxxxxxxxxxx>]

Yannick Vaucher @ Camptocamp has proposed merging lp:~camptocamp/ocb-addons/7.0-fix-1335887 into lp:ocb-addons.

Commit message:
Fix purchase order do_merge w/ 1st origin empty introduced on OCB on rev 10009

Requested reviews:
  Yann Papouin (yann-papouin)
  OpenERP Community Backports (ocb)
Related bugs:
  Bug #1335887 in OpenERP Community Backports (Addons): "[7.0] Merging purchase order will fail when first one has no origin"
  https://bugs.launchpad.net/ocb-addons/+bug/1335887

For more details, see:
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1335887/+merge/225028

Fix a bug only introduced on OCB
-- 
https://code.launchpad.net/~camptocamp/ocb-addons/7.0-fix-1335887/+merge/225028
Your team OpenERP Community Backports is requested to review the proposed merge of lp:~camptocamp/ocb-addons/7.0-fix-1335887 into lp:ocb-addons.

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-04-15 08:12:11 +0000
+++ purchase/purchase.py	2014-06-30 15:10:08 +0000
@@ -775,7 +775,7 @@
             order_infos = new_order[0]
             if not order_infos:
                 order_infos.update({
-                    'origin': porder.origin,
+                    'origin': porder.origin or '',
                     'date_order': porder.date_order,
                     'partner_id': porder.partner_id.id,
                     'dest_address_id': porder.dest_address_id.id,
@@ -794,7 +794,7 @@
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if 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
+                        order_infos['origin'] = order_infos['origin'] + ' ' + 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'))