Sales - Workflow and Organization

Merge lp:~camptocamp/sale-wkfl/7.0-fix_1295706-rde into lp:~sale-core-editors/sale-wkfl/7.0

  1. 7.0-fix_1295706-rde
  2. Merge into 7.0
Proposed by Romain Deheele - Camptocamp
Status: Merged
Approved by: Yannick Vaucher @ Camptocamp
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~camptocamp/sale-wkfl/7.0-fix_1295706-rde
Merge into: lp:~sale-core-editors/sale-wkfl/7.0
Diff against target: 12 lines (+1/-1)
1 file modified
sale_dropshipping/sale.py (+1/-1)
To merge this branch: bzr merge lp:~camptocamp/sale-wkfl/7.0-fix_1295706-rde
Reviewer Review Type Date Requested Status
Yannick Vaucher @ Camptocamp Approve
Guewen Baconnier @ Camptocamp code review Approve
Alexandre Fayolle - camptocamp code review, no test Approve
Review via email: mp+212175@code.launchpad.net

Description of the change

Hi,

It fixes https://bugs.launchpad.net/sale-wkfl/+bug/1295706
It avoids losing picking_id information and generating more pickings than expected.

Romain

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

Indeed, thanks for the fix.

LGTM

review: Approve (code review, no test)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Thanks!

review: Approve (code review)
Revision history for this message
Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sale_dropshipping/sale.py'
2--- sale_dropshipping/sale.py 2014-03-05 16:28:48 +0000
3+++ sale_dropshipping/sale.py 2014-03-21 15:02:23 +0000
4@@ -137,7 +137,7 @@
5 self._create_procurements_direct_mto(cr, uid, order, dropship_lines,
6 context=context)
7 res = super(sale_order, self)._create_pickings_and_procurements(
8- cr, uid, order, normal_lines, None, context)
9+ cr, uid, order, normal_lines, picking_id, context)
10 return res
11
12 def action_button_confirm(self, cr, uid, ids, context=None):

Subscribers

People subscribed via source and target branches