Merge lp://staging/~unifield-team/unifield-server/us-2326 into lp://staging/unifield-server/uf3
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~unifield-team/unifield-server/us-2326 |
| Merge into: | lp://staging/unifield-server/uf3 |
| Diff against target: |
6911 lines (+1256/-844) 166 files modified
bin/addons/account/account.py (+2/-1) bin/addons/account/invoice.py (+83/-80) bin/addons/account/partner_view.xml (+2/-1) bin/addons/account/product_view.xml (+3/-0) bin/addons/account_corrections/account_view.xml (+1/-0) bin/addons/account_hq_entries/account_view.xml (+1/-1) bin/addons/account_hq_entries/wizard/hq_entries_split.py (+6/-5) bin/addons/account_journal/account_journal_view.xml (+1/-0) bin/addons/account_override/account_invoice_view.xml (+1/-0) bin/addons/account_override/account_view.xml (+1/-1) bin/addons/account_override/product_product_view.xml (+2/-2) bin/addons/account_override/res_partner_view.xml (+1/-0) bin/addons/account_override/wizard/account_chart.xml (+1/-0) bin/addons/account_payment/account_payment_view.xml (+1/-0) bin/addons/account_period_closing_level/account_year_end_closing.xml (+1/-0) bin/addons/account_reconciliation/wizard/account_reconcile.py (+31/-7) bin/addons/account_voucher/account_voucher_pay_invoice.xml (+2/-0) bin/addons/account_voucher/account_voucher_view.xml (+5/-0) bin/addons/analytic_distribution/account_invoice_view.xml (+1/-0) bin/addons/analytic_distribution/account_move_line.py (+41/-40) bin/addons/analytic_distribution/account_view.xml (+1/-1) bin/addons/analytic_distribution/analytic_account_view.xml (+1/-0) bin/addons/analytic_distribution/wizard/account_analytic_chart_view.xml (+1/-0) bin/addons/analytic_distribution_supply/purchase_view.xml (+2/-2) bin/addons/analytic_distribution_supply/sale_view.xml (+1/-1) bin/addons/base/__openerp__.py (+0/-3) bin/addons/base/i18n/fr.po (+1/-1) bin/addons/base/ir/ir_attachment.py (+4/-4) bin/addons/base/ir/ir_ui_view.py (+18/-14) bin/addons/base/module/module_data.xml (+0/-11) bin/addons/base/module/wizard/base_module_shortcut_data.xml (+0/-13) bin/addons/base/res/partner/partner_shortcut_data.xml (+0/-13) bin/addons/base/rng/view.rng (+2/-0) bin/addons/consumption_calculation/consumption_view.xml (+2/-0) bin/addons/delete_button/__openerp__.py (+7/-8) bin/addons/delete_button/view/picking_view.xml (+7/-3) bin/addons/delete_button/view/purchase_view.xml (+1/-1) bin/addons/delete_button/view/sale_view.xml (+2/-2) bin/addons/delete_button/view/shortcut_data.xml (+0/-16) bin/addons/delivery_mechanism/delivery_mechanism_view.xml (+2/-0) bin/addons/delivery_mechanism/wizard/stock_partial_move_view.xml (+2/-0) bin/addons/finance/account_view.xml (+1/-0) bin/addons/hr/hr_department_view.xml (+1/-0) bin/addons/kit/kit_view.xml (+2/-2) bin/addons/kit/wizard/stock_partial_move_view.xml (+2/-2) bin/addons/mission_stock/mission_stock.py (+10/-1) bin/addons/mission_stock/wizard/mission_stock_wizard.py (+2/-1) bin/addons/msf_accrual/account_view.xml (+1/-0) bin/addons/msf_cross_docking/cross_docking_view.xml (+7/-6) bin/addons/msf_currency_revaluation/account_view.xml (+1/-0) bin/addons/msf_custom_settings/view/batch_view.xml (+1/-0) bin/addons/msf_custom_settings/view/delivery_mecanism_view.xml (+1/-1) bin/addons/msf_custom_settings/view/physical_inventories_view.xml (+1/-0) bin/addons/msf_custom_settings/view/procurement_exception_view.xml (+1/-0) bin/addons/msf_custom_settings/view/purchase_view.xml (+1/-1) bin/addons/msf_custom_settings/view/stock_view.xml (+2/-0) bin/addons/msf_custom_settings/view/warehouse_view.xml (+1/-0) bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako (+2/-2) bin/addons/msf_doc_import/view/initial_stock_inventory_line_view.xml (+1/-0) bin/addons/msf_doc_import/view/purchase_order_import_line_view.xml (+2/-2) bin/addons/msf_doc_import/view/sale_order_import_lines_view.xml (+1/-1) bin/addons/msf_doc_import/view/stock_picking_import_lines_view.xml (+4/-1) bin/addons/msf_doc_import/wizard/abstract_wizard_import.py (+13/-5) bin/addons/msf_doc_import/wizard/wizard_import_batch.py (+20/-8) bin/addons/msf_doc_import/wizard/wizard_import_product_list.py (+3/-3) bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py (+9/-1) bin/addons/msf_instance/msf_instance_view.xml (+5/-2) bin/addons/msf_instance/wizard/account_analytic_chart_view.xml (+1/-0) bin/addons/msf_instance/wizard/account_chart_view.xml (+1/-0) bin/addons/msf_order_date/order_dates_view.xml (+5/-2) bin/addons/msf_outgoing/msf_outgoing.py (+11/-3) bin/addons/msf_outgoing/msf_outgoing_view.xml (+3/-0) bin/addons/msf_outgoing/wizard/ppl_processor.py (+39/-2) bin/addons/msf_outgoing/wizard/ppl_processor_view.xml (+4/-3) bin/addons/msf_outgoing/wizard/stock_partial_move.py (+50/-49) bin/addons/msf_partner/partner.py (+7/-0) bin/addons/msf_partner/partner_view.xml (+5/-3) bin/addons/msf_partner/product_view.xml (+2/-0) bin/addons/msf_printed_documents/printed_report_view.xml (+1/-0) bin/addons/msf_profile/i18n/allmsf.pot (+1/-1) bin/addons/msf_profile/i18n/en_MF.po (+12/-0) bin/addons/msf_profile/i18n/es_MF.po (+2/-2) bin/addons/msf_profile/i18n/fr_MF.po (+175/-16) bin/addons/msf_profile/user_access_configurator_view.xml (+2/-0) bin/addons/msf_sync_data_hq/__openerp__.py (+1/-0) bin/addons/msf_sync_data_hq/data/account.tax.csv (+3/-0) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+1/-1) bin/addons/order_line_number/order_line_number_view.xml (+1/-1) bin/addons/order_nomenclature/order_nomenclature_view.xml (+2/-2) bin/addons/order_types/stock_view.xml (+9/-0) bin/addons/out_step/out_step_view.xml (+2/-0) bin/addons/partner_modification/partner_modification_view.xml (+2/-2) bin/addons/procurement_cycle/procurement.py (+62/-58) bin/addons/procurement_report/wizard/schedulers_all_view.xml (+3/-3) bin/addons/product/__openerp__.py (+0/-2) bin/addons/product/partner_view.xml (+0/-21) bin/addons/product/product.py (+68/-66) bin/addons/product/product_shortcut_data.xml (+0/-13) bin/addons/product_asset/product_asset_view.xml (+1/-0) bin/addons/product_asset/wizard/stock_partial_move_view.xml (+2/-0) bin/addons/product_attributes/product_attributes.py (+7/-0) bin/addons/product_attributes/product_attributes_view.xml (+11/-2) bin/addons/product_expiry/product_expiry_view.xml (+2/-0) bin/addons/product_list/product_list.py (+19/-2) bin/addons/product_list/product_list_view.xml (+24/-0) bin/addons/product_manufacturer/product_manufacturer_view.xml (+1/-0) bin/addons/product_nomenclature/product_nomenclature.py (+1/-23) bin/addons/product_nomenclature/product_nomenclature_view.xml (+3/-0) bin/addons/purchase/partner_view.xml (+1/-1) bin/addons/purchase/purchase_view.xml (+1/-0) bin/addons/purchase/stock_view.xml (+3/-0) bin/addons/purchase_msf/purchase_msf_view.xml (+2/-2) bin/addons/purchase_override/purchase.py (+1/-1) bin/addons/purchase_override/purchase_view.xml (+3/-0) bin/addons/purchase_override/report/merged_order.rml (+22/-21) bin/addons/purchase_override/report/purchase_order.rml (+22/-21) bin/addons/purchase_override/report/rfq.rml (+1/-1) bin/addons/reason_types_moves/reason_type_view.xml (+5/-0) bin/addons/reason_types_moves/stock_view.xml (+9/-0) bin/addons/register_accounting/account_view.xml (+3/-2) bin/addons/register_accounting/purchase_view.xml (+1/-0) bin/addons/report_webkit/ir_report_view.xml (+1/-0) bin/addons/res_currency_functional/account_bank_statement_view.xml (+2/-2) bin/addons/res_currency_functional/account_move_line_view.xml (+1/-0) bin/addons/res_currency_functional/order_line_view.xml (+2/-2) bin/addons/res_currency_functional/res_currency_functional_view.xml (+1/-0) bin/addons/return_claim/return_claim_view.xml (+3/-0) bin/addons/sale/stock_view.xml (+3/-0) bin/addons/sale_override/sale.py (+21/-8) bin/addons/sale_override/sale_view.xml (+2/-0) bin/addons/service_purchasing/service_purchasing_view.xml (+9/-1) bin/addons/specific_locations/specific_locations_view.xml (+6/-3) bin/addons/specific_rules/report/report_stock_inventory_view.xml (+1/-1) bin/addons/specific_rules/specific_rules_view.xml (+11/-6) bin/addons/specific_rules/wizard/stock_partial_move_view.xml (+2/-0) bin/addons/stock/partner_view.xml (+1/-2) bin/addons/stock/product_view.xml (+7/-1) bin/addons/stock/stock_view.xml (+2/-1) bin/addons/stock_batch_recall/__openerp__.py (+3/-3) bin/addons/stock_batch_recall/stock.py (+13/-20) bin/addons/stock_batch_recall/stock_view.xml (+5/-5) bin/addons/stock_override/procurement_view.xml (+2/-0) bin/addons/stock_override/report/report_stock_move_view.xml (+1/-1) bin/addons/stock_override/stock_view.xml (+8/-1) bin/addons/stock_override/wizard/stock_partial_move_view.xml (+2/-2) bin/addons/stock_schedule/scheduler_view.xml (+1/-1) bin/addons/supplier_catalogue/partner_view.xml (+1/-1) bin/addons/supplier_catalogue/product.py (+116/-99) bin/addons/supplier_catalogue/product_view.xml (+6/-0) bin/addons/sync_so/purchase_view.xml (+1/-0) bin/addons/sync_so/rw_special_view_handler.py (+31/-29) bin/addons/sync_so/so_po_common.py (+1/-1) 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/tender_flow/tender_flow_view.xml (+3/-1) bin/addons/transport_mgmt/product_view.xml (+1/-0) bin/addons/transport_mgmt/purchase_view.xml (+2/-0) bin/addons/transport_mgmt/sale_view.xml (+2/-0) bin/addons/unifield_setup/view/product_view.xml (+1/-0) bin/addons/useability_dashboard_and_menu/dashboard/board_warehouse_view.xml (+1/-1) bin/addons/useability_dashboard_and_menu/view/purchase_view.xml (+1/-1) bin/osv/orm.py (+8/-12) bin/release.py (+1/-1) bin/tools/translate.py (+2/-0) bin/unifield-version.txt (+0/-1) bin/updater.py (+11/-1) |
| To merge this branch: | bzr merge lp://staging/~unifield-team/unifield-server/us-2326 |
| 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
- 4167. By Quentin THEURET @Amaris
-
US-2326 [FIX] Double 'store' argument
- 4166. By Quentin THEURET @Amaris
-
US-2326 [FIX] Fix issue with User Rights when UniData changes the default_code of the product without the write access to the stock.mission.
report. line object - 4165. By jftempo
-
US-1335 [FIX] Load of XML file with relative path in ENTITY ... SYSTEM
- 4164. By jftempo
-
UF3.1rc1 [MERGE]
US-2146 [FIX] Finance data integrity: spot JIs with no AJ
US-1804 [FIX] IN process: fix issue with IN process saved as draft with missing batch
US-2193 [FIX] FO lines updated by PO: converted unit price less than 0.01 raises error
US-2194 [FIX] Cancel and Resource at coordo: do not unlink the OUT lines when project receive IN
US-1822 [FIX] Unreconciliation: allow to unreconcile manually reconciled system JIs
US-2085 [FIX] Delete the last non sourced line of FO should run Auto POs creation with no error
US-1520 [IMP] Manual JE in not open period: server side check - 4163. By jftempo
-
Hot fixes UF3.1
US-1335 [IMP] Finance wizard reports: save template + don't close the wizard
US-1520 [FIX] JE creation: display only the open periods
US-1960 [FIX] Sync update to inactive a product: do not raise if the product is already inactive
US-2141 [FIX] Grouped import payment in register: float comparison to check paid amount does not exceed amount to pay
US-2148 [FIX] AD: distibrution should have fp lines + generate NotRun if distribution_id is not found
US-2229 [FIX] Register line changed to set amount in = out = 0 should be reflected in JI
US-2167 [FIX] Account / partner compatibility on register: check performed after write
US-2175 [FIX] Report Order impact vs. Budget: fix format on PO date - 4162. By jftempo
-
US-1632 [IMP] Real consumption report PDF: French translations
- 4161. By jftempo
-
US-1696 [FIX] 'Export moves analysis' and 'Export Inventory level' tree view: remove Edit button
- 4160. By jftempo
-
US-1698 [FIX] PO report: French mispelling
- 4159. By jftempo
-
US-2071 [FIX] Sync message: display clean error if AD is not found
- 4158. By jftempo
-
US-2173 [FIX] Check mako file for ExpandedColumnC
ount: ignore backup directory
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
