Merge lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1168398-tta+afe+vv into lp:openobject-addons/7.0
Proposed by
Vincent Vinet
Status: | Needs review |
---|---|
Proposed branch: | lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1168398-tta+afe+vv |
Merge into: | lp:openobject-addons/7.0 |
Diff against target: |
190 lines (+152/-2) (has conflicts) 4 files modified
mrp/__openerp__.py (+8/-0) mrp/mrp.py (+11/-2) mrp/test/order_process_prodlot_partial_consume.yml (+66/-0) mrp/test/order_process_prodlot_split.yml (+67/-0) Text conflict in mrp/__openerp__.py |
To merge this branch: | bzr merge lp:~savoirfairelinux-openerp/openobject-addons/7.0-bug-1168398-tta+afe+vv |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Core Team | Pending | ||
Review via email: mp+225532@code.launchpad.net |
This proposal supersedes a proposal from 2014-07-03.
Description of the change
based on lp:~camptocamp/openobject-addons/7.0-bug-1168398-tta+afe with additional test
that shows wrong behavior.
To post a comment you must log in.
Unmerged revisions
- 9051. By Vincent Vinet
-
fix merge conflict
- 9050. By Vincent Vinet
-
[FIX] use the remaining quantity to split instead of original qty when splitting consume moves
- 9049. By Alexandre Fayolle - camptocamp
-
[MRG] merge back the fix on 7.0 head, and hopefully get green on runbot
- 9048. By Alexandre Fayolle - camptocamp
-
[IMP] fix typo in test, delete trailing whitespace, add an assertion
- 9047. By Alexandre Fayolle - camptocamp
-
[TEST] added test for bug lp:1168398
- 9046. By SnippetBucket.com
-
[FIX] bug:1168398/
Incorrect behaviour when producing MO with component split in serial numbers.