lp:~julie-w/unifield-server/US-1520

Branch merges

Ready for review for merging into lp:unifield-server/uf3

UniField Dev Team: Pending requested 2017-01-13

Diff: 1291 lines (+341/-194)

21 files modified

bin/addons/account_override/account_move_line.py (+7/-1)
bin/addons/account_override/finance_export.py (+20/-1)
bin/addons/account_reconciliation/wizard/account_reconcile.py (+31/-7)
bin/addons/base/ir/ir_attachment.py (+4/-4)
bin/addons/finance/account_view.xml (+1/-1)
bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako (+2/-2)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py (+14/-5)
bin/addons/msf_profile/i18n/fr_MF.po (+81/-2)
bin/addons/order_types/stock.py (+13/-15)
bin/addons/purchase_override/report/merged_order.rml (+1/-1)
bin/addons/purchase_override/report/purchase_order.rml (+1/-1)
bin/addons/stock/stock_view.xml (+2/-1)
bin/addons/supplier_catalogue/product.py (+116/-99)
bin/addons/tender_flow/report/tender_rfq_comparison_xls.mako (+1/-1)
bin/addons/tender_flow/report/tender_rfq_comparison_xls.py (+0/-39)
bin/addons/vertical_integration/report/hq_report_ocb.py (+14/-6)
bin/addons/vertical_integration/wizard/ocb_export.py (+21/-2)
bin/osv/orm.py (+7/-3)
bin/release.py (+1/-1)
bin/service/web_services.py (+2/-2)
bin/tools/translate.py (+2/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4127. By Julie Nuguet on 2016-12-20

US-1520 [FIX] JE creation: display only the open periods

4126. By jftempo on 2016-12-15

Version 4.0dev

4125. By jftempo on 2016-12-15

US-2047 [FIX] Attachment config: French translation missing

lp:~fabien-morin/unifield-server/fm-us-2047

4124. By jftempo on 2016-12-15

US-1822 [FIX] Unreconciliation: allow to unreconcile manually reconciled system JIs

lp:~julie-w/unifield-server/US-1822

4123. By jftempo on 2016-12-15

US-1900 [FIX] View translation when a node have multiplte attributes + export/translate help msg

lp:~fabien-morin/unifield-server/fm-fix-orm-translation

4122. By jftempo on 2016-12-15

US-1571 [IMP] Delivery Orders: new "Draft" search button

lp:~mallorymarcot/unifield-server/us-1571

4121. By jftempo on 2016-12-15

US-1694 [FIX] Comparison RFQ report: fix currency

lp:~unifield-team/unifield-server/us-1694

4120. By jftempo on 2016-12-15

US-1804 [FIX] Typo + translation

4119. By jftempo on 2016-12-15

US-1743 [FIX] Export xls PO simulation: fix xls corruption when RTS is not set

lp:~unifield-team/unifield-server/us-1743

4118. By jftempo on 2016-12-15

US-1773 [IMP] Reconciliation must include at least one debit and one credit

lp:~julie-w/unifield-server/US-1773