OpenERP Community Backports (Addons)

Merge lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe into lp:ocb-addons

  1. ocb-7.0-595240-opw-skh_fix_1192115-afe
  2. Merge into 7.0
Proposed by Alexandre Fayolle - camptocamp
Status: Merged
Merged at revision: 10143
Proposed branch: lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe
Merge into: lp:ocb-addons
Diff against target: 13 lines (+1/-2)
1 file modified
delivery/sale.py (+1/-2)
To merge this branch: bzr merge lp:~camptocamp/ocb-addons/ocb-7.0-595240-opw-skh_fix_1192115-afe
Reviewer Review Type Date Requested Status
Raphaël Valyi - http://www.akretion.com Approve
Nicolas Bessi - Camptocamp (community) no test, code review Approve
Holger Brunn (Therp) code review Approve
Review via email: mp+211264@code.launchpad.net

Description of the change

[FIX] delivery: carrier information not propagated from sale order to pickings.

port of https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-595240-opw-skh/+merge/180790 to OCB

To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

LGTM

review: Approve (no test, code review)
Revision history for this message
Raphaël Valyi - http://www.akretion.com (rvalyi) wrote :

LGTM,

for reference: commit of Quentin bringing the culprit lines altogether without real reason:
https://github.com/akretion/openerp-addons/commit/c98b484699f349fef2f7e258c44a9861fa51b143

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'delivery/sale.py'
2--- delivery/sale.py 2012-10-23 16:05:04 +0000
3+++ delivery/sale.py 2014-03-17 08:38:11 +0000
4@@ -72,8 +72,7 @@
5 'tax_id': [(6,0,taxes_ids)],
6 'type': 'make_to_stock'
7 })
8- #remove the value of the carrier_id field on the sale order
9- return self.write(cr, uid, ids, {'carrier_id': False}, context=context)
10+ return True
11 #return {'type': 'ir.actions.act_window_close'} action reload?
12
13 sale_order()