Merge lp:~unifield-team/unifield-server/us-2367-2 into lp:unifield-server
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 4382 |
Proposed branch: | lp:~unifield-team/unifield-server/us-2367-2 |
Merge into: | lp:unifield-server |
Diff against target: |
153 lines (+39/-4) (has conflicts) 6 files modified
bin/addons/msf_cross_docking/cross_docking_view.xml (+1/-1) bin/addons/msf_doc_import/wizard/wiz_common_import.py (+2/-0) bin/addons/msf_printed_documents/report/report_reception.py (+4/-0) bin/addons/stock/stock.py (+4/-0) bin/addons/stock_override/stock.py (+24/-1) bin/addons/stock_override/stock_view.xml (+4/-2) Text conflict in bin/addons/msf_printed_documents/report/report_reception.py |
To merge this branch: | bzr merge lp:~unifield-team/unifield-server/us-2367-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+324387@code.launchpad.net |
To post a comment you must log in.
Please also add the missing translations.