Merge lp:~camptocamp/ocb-addons/7.0-fix-1335887 into lp:ocb-addons

[Yannick Vaucher @ Camptocamp]

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

Fix a bug only introduced on OCB

[Ronald Portier (Therp) (rportier1962)]

Personally I think this merge proposal is tackling the problem from the wrong end.

If we do not have an origin for a purchase order, the value for origin should be NULL, not an empty string.

The original code that introduced the bug should be amended to account for the possibility of NULL values in the database.

review: Disapprove

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Ok I though empty string were store as Null as zero value for integer. Just check and it seems I'm wrong. I'll add a check instead of forcing to empty string.

Thanks for the review

[lp:~camptocamp/ocb-addons/7.0-fix-1335887]

10223. By Yannick Vaucher @ Camptocamp on 2014-06-30

Fix purchase order do_merge w/ 1st origin empty introduced on OCB on rev

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Ronald, I changed the fix according to your review

[Ronald Portier (Therp) (rportier1962)]

LGTM

Thanx!

review: Approve

[Yann Papouin (yann-papouin)]

Indeed, it seems the right way to do.
Thank you.

review: Approve

[Pedro Manuel Baeza (pedro.baeza)]

Little comment inline.

Regards.

review: Needs Fixing (code review)

[lp:~camptocamp/ocb-addons/7.0-fix-1335887]

10224. By Yannick Vaucher @ Camptocamp on 2014-07-01

Imp concat

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks Pedro

Change made

[Pedro Manuel Baeza (pedro.baeza)]

LGTM

Regards.

review: Approve (code review)

[Holger Brunn (Therp) (hbrunn)]

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10224. By Yannick Vaucher @ Camptocamp on 2014-07-01

Imp concat

10223. By Yannick Vaucher @ Camptocamp on 2014-06-30

Fix purchase order do_merge w/ 1st origin empty introduced on OCB on rev

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2014-04-15 08:12:11 +0000
+++ purchase/purchase.py	2014-07-01 13:05:29 +0000
@@ -793,8 +793,11 @@
                 if porder.notes:
                     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
+                    if not order_infos['origin']:
+                        order_infos['origin'] = porder.origin
+                    elif (not porder.origin in order_infos['origin']
+                            and not order_infos['origin'] in porder.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'))