Merge lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error into lp:~extra-addons-commiter/e-commerce-addons/7.0
Proposed by
Guewen Baconnier @ Camptocamp
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Yannick Vaucher @ Camptocamp | ||||
Approved revision: | 291 | ||||
Merged at revision: | 292 | ||||
Proposed branch: | lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error | ||||
Merge into: | lp:~extra-addons-commiter/e-commerce-addons/7.0 | ||||
Diff against target: |
21 lines (+5/-4) 1 file modified
sale_automatic_workflow/invoice.py (+5/-4) |
||||
To merge this branch: | bzr merge lp:~camptocamp/e-commerce-addons/7.0-sale_automatic_workflow-reconcile-error | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sébastien BEAU - http://www.akretion.com | Approve | ||
Yannick Vaucher @ Camptocamp | code review, no tests | Approve | |
Review via email: mp+201727@code.launchpad.net |
Description of the change
Fixes lp:1269291
Code was just broken...
The automatic reconciliation was no longer possible.
"invoice.
To post a comment you must log in.
It seems to me a conflict wasn't correctly resolved between
revid:<email address hidden>
and revid:<email address hidden>
This merge does the right changes