Merge lp:~camptocamp/openobject-addons/6.1-merge-from-upstream-mdh into lp:~camptocamp/openobject-addons/6.1-c2c-official
Proposed by
Matthieu Dietrich @ camptocamp
Status: | Merged |
---|---|
Merged at revision: | 6641 |
Proposed branch: | lp:~camptocamp/openobject-addons/6.1-merge-from-upstream-mdh |
Merge into: | lp:~camptocamp/openobject-addons/6.1-c2c-official |
Diff against target: |
39 lines (+12/-16) 1 file modified
stock/wizard/stock_return_picking.py (+12/-16) |
To merge this branch: | bzr merge lp:~camptocamp/openobject-addons/6.1-merge-from-upstream-mdh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandre Fayolle - camptocamp | Approve | ||
Guewen Baconnier @ Camptocamp | Approve | ||
Review via email: mp+218291@code.launchpad.net |
Commit message
[MRG] merged back a fix from upstream
Description of the change
There was a commit remaining on the upstream only, but not on the 6.1-c2c-official.
I made this MP to keep things consistent.
Regards,
Matthieu Dietrich
To post a comment you must log in.