Merge lp://staging/~jfb-tempo-consulting/unifield-server/US-7617 into lp://staging/unifield-server
Proposed by
jftempo
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-server/US-7617 |
Merge into: | lp://staging/unifield-server |
Diff against target: |
1442 lines (+444/-183) (has conflicts) 29 files modified
bin/addons/analytic_distribution_supply/invoice.py (+12/-4) bin/addons/delivery_mechanism/delivery_mechanism.py (+6/-3) bin/addons/delivery_mechanism/wizard/enter_reason.py (+2/-0) bin/addons/delivery_mechanism/wizard/enter_reason_view.xml (+7/-0) bin/addons/finance/purchase.py (+2/-2) bin/addons/msf_outgoing/msf_outgoing.py (+7/-3) bin/addons/msf_profile/data/patches.xml (+7/-0) bin/addons/msf_profile/i18n/fr_MF.po (+7/-1) bin/addons/msf_profile/msf_profile.py (+10/-0) bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+37/-6) bin/addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako (+11/-1) bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv (+8/-3) bin/addons/purchase/purchase_order.py (+23/-12) bin/addons/purchase/purchase_order_line.py (+26/-0) bin/addons/purchase/purchase_view.xml (+3/-2) bin/addons/purchase/purchase_workflow.py (+46/-11) bin/addons/purchase_override/wizard/split_order_line.py (+0/-1) bin/addons/sale/sale_order.py (+11/-3) bin/addons/sale/sale_workflow.py (+53/-41) bin/addons/sourcing/sale_order_line.py (+5/-2) bin/addons/stock/stock.py (+6/-0) bin/addons/stock/stock_move.py (+8/-4) bin/addons/stock_override/stock.py (+17/-46) bin/addons/stock_override/stock_view.xml (+6/-0) bin/addons/sync_client/message.py (+3/-2) bin/addons/sync_client/orm.py (+1/-1) bin/addons/sync_so/picking.py (+118/-34) bin/addons/sync_so/purchase.py (+1/-0) bin/osv/orm.py (+1/-1) Text conflict in bin/addons/msf_profile/data/patches.xml Text conflict in bin/addons/msf_profile/msf_profile.py Text conflict in bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv Text conflict in bin/addons/purchase/purchase_order_line.py Text conflict in bin/addons/purchase/purchase_workflow.py Text conflict in bin/addons/sale/sale_order.py |
To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-server/US-7617 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+397372@code.staging.launchpad.net |
To post a comment you must log in.