Merge lp://staging/~unifield-team/unifield-server/us-1960 into lp://staging/unifield-server/uf3
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~unifield-team/unifield-server/us-1960 |
| Merge into: | lp://staging/unifield-server/uf3 |
| Diff against target: |
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/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/product_attributes/product_attributes.py (+1/-1) 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) |
| To merge this branch: | bzr merge lp://staging/~unifield-team/unifield-server/us-1960 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Dev Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 4127. By Quentin THEURET @Amaris
-
US-1960 [FIX] Do not raise an error if the product is already inactive when a sync. update deactivate the product
- 4126. By jftempo
-
Version 4.0dev
- 4125. By jftempo
-
US-2047 [FIX] Attachment config: French translation missing
- 4124. By jftempo
-
US-1822 [FIX] Unreconciliation: allow to unreconcile manually reconciled system JIs
- 4123. By jftempo
-
US-1900 [FIX] View translation when a node have multiplte attributes + export/translate help msg
- 4122. By jftempo
-
US-1571 [IMP] Delivery Orders: new "Draft" search button
- 4121. By jftempo
-
US-1694 [FIX] Comparison RFQ report: fix currency
- 4120. By jftempo
-
US-1804 [FIX] Typo + translation
- 4119. By jftempo
-
US-1743 [FIX] Export xls PO simulation: fix xls corruption when RTS is not set
- 4118. By jftempo
-
US-1773 [IMP] Reconciliation must include at least one debit and one credit
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
