Merge lp://staging/~jfb-tempo-consulting/unifield-server/us7025-7039 into lp://staging/~dorian-kemps/unifield-server/US-7025-7039
Proposed by
jftempo
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~jfb-tempo-consulting/unifield-server/us7025-7039 |
Merge into: | lp://staging/~dorian-kemps/unifield-server/US-7025-7039 |
Diff against target: |
18564 lines (+9641/-3354) 160 files modified
bin/addons/account/account.py (+1/-1) bin/addons/account/account_invoice_view.xml (+6/-2) bin/addons/account/invoice.py (+2/-0) bin/addons/account/report/account_balance_sheet.py (+24/-22) bin/addons/account/report/account_general_ledger.py (+10/-6) bin/addons/account/report/account_partner_ledger.py (+6/-6) bin/addons/account/report/account_profit_loss.py (+26/-23) bin/addons/account/wizard/account_invoice_refund.py (+1/-0) bin/addons/account_corrections/account_analytic_line.py (+1/-1) bin/addons/account_corrections/wizard/analytic_distribution_wizard.py (+12/-5) bin/addons/account_override/account.py (+1/-1) bin/addons/account_override/account_invoice_view.xml (+6/-1) bin/addons/account_override/invoice.py (+24/-2) bin/addons/analytic_distribution/account_move_line.py (+5/-3) bin/addons/analytic_distribution/analytic_distribution_wizard_view.xml (+9/-2) bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py (+2/-1) bin/addons/analytic_override/analytic_line.py (+1/-1) bin/addons/base/__openerp__.py (+1/-1) bin/addons/base/ir/ir.xml (+2/-1) bin/addons/base/ir/ir_actions.py (+1/-0) bin/addons/base/ir/ir_cron.py (+4/-2) bin/addons/base/ir/ir_sequence.py (+2/-2) bin/addons/base/migrations/8.0.1.6/pre-replenishment.py (+10/-0) bin/addons/base/module/instance_auto_creation.py (+17/-7) bin/addons/base/res/res_currency.py (+2/-2) bin/addons/base/res/res_user.py (+2/-0) bin/addons/base/rng/view.rng (+4/-1) bin/addons/consumption_calculation/consumption_calculation.py (+80/-49) bin/addons/consumption_calculation/expiry_calculation.py (+112/-54) bin/addons/consumption_calculation/expiry_calculation_view.xml (+2/-0) bin/addons/consumption_calculation/history_consumption.py (+2/-1) bin/addons/consumption_calculation/report/product_likely_expire.rml (+1/-1) bin/addons/consumption_calculation/report/product_likely_expire_xls.mako (+1/-1) bin/addons/delivery_mechanism/delivery_mechanism.py (+0/-155) bin/addons/documents_done/documents_done.py (+1/-9) bin/addons/finance/report/account_partner_balance_tree.py (+10/-6) bin/addons/import_data/import_data.py (+1/-1) bin/addons/kit/kit.py (+2/-3) bin/addons/kit/kit_view.xml (+2/-1) bin/addons/mission_stock/mission_stock.py (+19/-6) bin/addons/msf_budget/msf_budget_line.py (+2/-2) bin/addons/msf_cross_docking/cross_docking.py (+0/-38) bin/addons/msf_custom_settings/__openerp__.py (+1/-2) bin/addons/msf_doc_import/__init__.py (+0/-1) bin/addons/msf_doc_import/__openerp__.py (+0/-5) bin/addons/msf_doc_import/wizard/__init__.py (+0/-4) bin/addons/msf_doc_import/wizard/wiz_common_import.py (+16/-219) bin/addons/msf_doc_import/wizard/wiz_common_import_view.xml (+34/-20) bin/addons/msf_doc_import/wizard/wizard_delete_lines.py (+0/-75) bin/addons/msf_doc_import/wizard/wizard_delete_lines_view.xml (+0/-58) bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+74/-42) bin/addons/msf_homere_interface/hr_payroll_wizard.xml (+1/-1) bin/addons/msf_instance/data/instance_data.xml (+0/-13) bin/addons/msf_instance/data/remote_backup.xml (+1/-0) bin/addons/msf_instance/msf_instance.py (+14/-2) bin/addons/msf_instance/res_company.py (+19/-8) bin/addons/msf_order_date/order_dates.py (+1/-43) bin/addons/msf_outgoing/msf_outgoing.py (+0/-26) bin/addons/msf_outgoing/msf_outgoing_view.xml (+3/-3) bin/addons/msf_processes/__openerp__.py (+2/-3) bin/addons/msf_processes/process/sale_process.xml (+0/-216) bin/addons/msf_profile/__openerp__.py (+1/-3) bin/addons/msf_profile/data/patches.xml (+18/-1) bin/addons/msf_profile/i18n/fr_MF.po (+2143/-72) bin/addons/msf_profile/msf_profile.py (+74/-7) bin/addons/msf_profile/user_rights/ir.model.access.csv (+0/-84) bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv (+0/-42) bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv (+2/-26) bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+7/-116) bin/addons/msf_tools/msf_tools.py (+11/-0) bin/addons/msf_tools/report/report_stopped_products_xls.mako (+1/-2) bin/addons/order_line_number/order_line_number.py (+0/-33) bin/addons/out_step/out_step.py (+19/-11) bin/addons/out_step/out_step_view.xml (+2/-2) bin/addons/procurement/__init__.py (+1/-4) bin/addons/procurement/__openerp__.py (+1/-12) bin/addons/procurement_auto/__init__.py (+2/-4) bin/addons/procurement_auto/__openerp__.py (+1/-4) bin/addons/procurement_cycle/__init__.py (+4/-4) bin/addons/procurement_cycle/__openerp__.py (+5/-10) bin/addons/procurement_cycle/replenishment.py (+2255/-0) bin/addons/procurement_cycle/replenishment_data.xml (+62/-0) bin/addons/procurement_cycle/replenishment_report.xml (+54/-0) bin/addons/procurement_cycle/replenishment_view.xml (+865/-0) bin/addons/procurement_cycle/replenishment_wizard.xml (+35/-0) bin/addons/procurement_cycle/report/__init__.py (+4/-0) bin/addons/procurement_cycle/report/replenishment_inventory_review.mako (+1126/-0) bin/addons/procurement_cycle/report/replenishment_inventory_review.py (+23/-0) bin/addons/procurement_cycle/report/replenishment_order_calc.mako (+555/-0) bin/addons/procurement_cycle/report/replenishment_order_calc.py (+24/-0) bin/addons/procurement_cycle/report/replenishment_product_list.mako (+164/-0) bin/addons/procurement_cycle/report/replenishment_product_list.py (+26/-0) bin/addons/procurement_cycle/report/replenishment_segment.mako (+523/-0) bin/addons/procurement_cycle/report/replenishment_segment.py (+11/-0) bin/addons/procurement_request/__openerp__.py (+0/-1) bin/addons/product/product.py (+0/-39) bin/addons/product_attributes/product_attributes.py (+47/-49) bin/addons/product_attributes/product_attributes_view.xml (+3/-1) bin/addons/purchase/__init__.py (+0/-1) bin/addons/purchase/purchase_order.py (+2/-1) bin/addons/purchase/purchase_order_line.py (+17/-0) bin/addons/purchase/purchase_view.xml (+0/-15) bin/addons/purchase_msf/purchase_msf.py (+27/-29) bin/addons/reason_types_moves/reason_type_view.xml (+1/-1) bin/addons/register_accounting/account_bank_statement.py (+22/-0) bin/addons/register_accounting/account_move_line.py (+1/-1) bin/addons/register_accounting/account_view.xml (+8/-4) bin/addons/register_accounting/wizard/import_cheque_on_bank_registers.py (+6/-0) bin/addons/register_accounting/wizard/import_invoice_on_registers.py (+6/-0) bin/addons/resource/wizard_template.py (+2/-2) bin/addons/sale/sale_demo.xml (+0/-3) bin/addons/sale/sale_order.py (+0/-27) bin/addons/sale/sale_unit_test.xml (+0/-2) bin/addons/sale/sale_view.xml (+0/-25) bin/addons/sales_followup/report/ir_follow_up_location_report.py (+0/-88) bin/addons/sourcing/__init__.py (+0/-1) bin/addons/sourcing/sale_order_line.py (+0/-6) bin/addons/sourcing/sourcing_view.xml (+0/-9) bin/addons/specific_rules/specific_rules.py (+0/-339) bin/addons/specific_rules/specific_rules_view.xml (+0/-41) bin/addons/stock/product.py (+18/-2) bin/addons/stock/report/stock_reception_report.py (+27/-3) bin/addons/stock/stock.py (+130/-0) bin/addons/stock/stock_move.py (+41/-12) bin/addons/stock/stock_view.xml (+69/-0) bin/addons/stock/wizard/physical_inventory_import.py (+14/-0) bin/addons/stock/wizard/physical_inventory_import_view.xml (+20/-0) bin/addons/stock_forecast/wizard/stock_forecast.py (+1/-20) bin/addons/stock_override/__openerp__.py (+0/-1) bin/addons/stock_override/stock.py (+0/-81) bin/addons/stock_override/stock_view.xml (+3/-3) bin/addons/stock_schedule/__openerp__.py (+1/-2) bin/addons/stock_schedule/schedule.py (+115/-114) bin/addons/stock_schedule/scheduler_view.xml (+1/-6) bin/addons/sync_client/backup.py (+38/-10) bin/addons/sync_client/backup_view.xml (+20/-18) bin/addons/sync_client/data/cron.xml (+2/-1) bin/addons/sync_client/message.py (+6/-3) bin/addons/sync_client/orm.py (+3/-1) bin/addons/sync_client/rpc.py (+9/-4) bin/addons/sync_client/sync_client.py (+5/-2) bin/addons/sync_client/timeout_transport.py (+5/-1) bin/addons/sync_client/update.py (+2/-3) bin/addons/sync_common/common.py (+6/-8) bin/addons/sync_so/picking_rw.py (+213/-244) bin/addons/sync_so/rw_special_view_handler.py (+0/-45) bin/addons/sync_so/specific_xml_id.py (+2/-0) bin/addons/tender_flow/tender_flow.py (+3/-304) bin/addons/tender_flow/tender_flow_workflow.xml (+0/-113) bin/addons/useability_dashboard_and_menu/dashboard/board_warehouse_view.xml (+0/-2) bin/addons/useability_dashboard_and_menu/menu/warehouse_menu.xml (+0/-30) bin/addons/vertical_integration/report/hq_report_ocb.py (+16/-6) bin/osv/fields.py (+41/-9) bin/osv/orm.py (+17/-6) bin/release.py (+1/-1) bin/service/web_services.py (+8/-1) bin/tools/graph.py (+6/-7) bin/tools/misc.py (+51/-7) bin/tools/translate.py (+1/-1) bin/unifield-version.txt (+2/-0) |
To merge this branch: | bzr merge lp://staging/~jfb-tempo-consulting/unifield-server/us7025-7039 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dorian | Approve | ||
Review via email: mp+380094@code.staging.launchpad.net |
To post a comment you must log in.