Merge lp://staging/~jfb-tempo-consulting/unifield-server/US-10748 into lp://staging/unifield-server

bin/addons/consumption_calculation/consumption_calculation.py (+8/-1)
bin/addons/consumption_calculation/consumption_view.xml (+2/-0)
bin/addons/consumption_calculation/weekly_forecast_report.py (+14/-0)
bin/addons/kit/kit.py (+13/-6)
bin/addons/kit/kit_creation.py (+11/-5)
bin/addons/kit/kit_creation_view.xml (+4/-0)
bin/addons/kit/kit_view.xml (+8/-0)
bin/addons/kit/report/kit_report.rml (+13/-1)
bin/addons/kit/report/kitting_order_report.rml (+13/-1)
bin/addons/mission_stock/mission_stock.py (+113/-18)
bin/addons/mission_stock/mission_stock_view.xml (+3/-1)
bin/addons/mission_stock/wizard/mission_stock_wizard.py (+3/-0)
bin/addons/msf_doc_import/initial_stock_inventory.py (+5/-0)
bin/addons/msf_doc_import/view/initial_stock_inventory_line_view.xml (+1/-1)
bin/addons/msf_instance/msf_instance.py (+17/-0)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+6/-0)
bin/addons/msf_outgoing/report/empty_picking_ticket.rml (+52/-3)
bin/addons/msf_outgoing/report/packing_list.rml (+15/-3)
bin/addons/msf_outgoing/report/picking_ticket.py (+2/-0)
bin/addons/msf_outgoing/report/picking_ticket.rml (+43/-3)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py (+22/-1)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml (+14/-0)
bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml (+2/-0)
bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml (+15/-1)
bin/addons/msf_outgoing/wizard/picking_processor.py (+36/-1)
bin/addons/msf_outgoing/wizard/picking_processor_view.xml (+2/-0)
bin/addons/msf_printed_documents/printed_report.xml (+1/-0)
bin/addons/msf_printed_documents/report/consumption_report.rml (+13/-1)
bin/addons/msf_printed_documents/report/product_list.rml (+21/-8)
bin/addons/msf_printed_documents/report/report_reception.rml (+72/-63)
bin/addons/msf_printed_documents/report/sale_order.rml (+44/-28)
bin/addons/msf_profile/data/patches.xml (+7/-0)
bin/addons/msf_profile/i18n/es_MF.po (+1/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+78/-6)
bin/addons/msf_profile/msf_profile.py (+26/-0)
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+29/-1)
bin/addons/msf_supply_doc_export/report/product_list_xls.mako (+23/-4)
bin/addons/msf_supply_doc_export/report/report_composition_kit_xls.mako (+6/-0)
bin/addons/msf_supply_doc_export/report/report_po_follow_up.rml (+17/-3)
bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako (+6/-0)
bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+156/-2)
bin/addons/msf_supply_doc_export/wizard/po_follow_up_view.xml (+2/-0)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+4/-3)
bin/addons/msf_tools/__init__.py (+1/-0)
bin/addons/msf_tools/message_action.py (+80/-0)
bin/addons/object_query/query.py (+5/-2)
bin/addons/procurement_cycle/replenishment.py (+95/-8)
bin/addons/procurement_cycle/replenishment_view.xml (+47/-9)
bin/addons/procurement_cycle/report_doc/replenishment_inventory_review.py (+94/-74)
bin/addons/procurement_cycle/report_doc/replenishment_product_list.mako (+40/-8)
bin/addons/procurement_request/procurement_request_view.xml (+14/-1)
bin/addons/procurement_request/report/procurement_request_report.rml (+41/-38)
bin/addons/product/product.py (+25/-2)
bin/addons/product_attributes/__openerp__.py (+1/-0)
bin/addons/product_attributes/product_attributes.py (+80/-112)
bin/addons/product_attributes/product_attributes_view.xml (+12/-11)
bin/addons/product_attributes/product_report.xml (+100/-2)
bin/addons/product_attributes/report/__init__.py (+3/-20)
bin/addons/product_attributes/report/hq_product_mml_nonconform.py (+222/-0)
bin/addons/product_attributes/report/product_mml.py (+6/-6)
bin/addons/product_attributes/report/product_mml_nonconform.py (+349/-0)
bin/addons/product_attributes/report/product_msl.py (+115/-0)
bin/addons/product_attributes/report/standard_price_track_changes_report.xml (+2/-1)
bin/addons/product_attributes/unidata_sync.py (+127/-22)
bin/addons/product_attributes/unidata_sync.xml (+270/-67)
bin/addons/product_attributes/wizard/__init__.py (+1/-20)
bin/addons/product_attributes/wizard/non_conform_inpipe.py (+36/-0)
bin/addons/product_attributes/wizard/non_conform_inpipe_view.xml (+23/-0)
bin/addons/product_list/product_list.py (+11/-2)
bin/addons/product_list/product_list_view.xml (+16/-0)
bin/addons/product_list/wizard/product_to_list_view.xml (+3/-2)
bin/addons/purchase/purchase_order.py (+2/-0)
bin/addons/purchase/purchase_order_line.py (+6/-1)
bin/addons/purchase/purchase_view.xml (+44/-1)
bin/addons/purchase/purchase_workflow.py (+40/-2)
bin/addons/purchase_override/report/merged_order.py (+3/-0)
bin/addons/purchase_override/report/merged_order.rml (+41/-26)
bin/addons/purchase_override/report/purchase_order.rml (+47/-31)
bin/addons/register_accounting/wizard/__init__.py (+0/-1)
bin/addons/register_accounting/wizard/auto_book_transfer_error.py (+0/-73)
bin/addons/sale/sale_order.py (+8/-0)
bin/addons/sale/sale_view.xml (+10/-1)
bin/addons/sales_followup/report/ir_follow_up_location_report.py (+22/-7)
bin/addons/sales_followup/report/ir_follow_up_location_report.rml (+22/-2)
bin/addons/sales_followup/report/ir_follow_up_location_report_xls.mako (+11/-1)
bin/addons/sales_followup/report/sale_follow_up_multi_report.rml (+16/-2)
bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako (+11/-1)
bin/addons/sales_followup/report/sale_follow_up_report_multi.py (+19/-5)
bin/addons/sales_followup/wizard/ir_followup_location_wizard.py (+137/-2)
bin/addons/sales_followup/wizard/ir_followup_location_wizard_view.xml (+2/-0)
bin/addons/sales_followup/wizard/sale_followup_multi_wizard.py (+151/-8)
bin/addons/sales_followup/wizard/sale_followup_multi_wizard_view.xml (+2/-0)
bin/addons/specific_rules/report/report_stock_inventory.py (+55/-20)
bin/addons/specific_rules/report/report_stock_inventory_view.xml (+15/-7)
bin/addons/specific_rules/stock_view.xml (+2/-0)
bin/addons/spreadsheet_xml/xlsx_write.py (+3/-1)
bin/addons/stock/physical_inventory.py (+10/-1)
bin/addons/stock/physical_inventory_view.xml (+4/-0)
bin/addons/stock/stock.py (+94/-0)
bin/addons/stock/stock_move.py (+8/-0)
bin/addons/stock_override/report/delivery_order.rml (+28/-5)
bin/addons/stock_override/report/internal_move.rml (+13/-1)
bin/addons/stock_override/stock.py (+1/-1)
bin/addons/stock_override/stock_view.xml (+28/-3)
bin/addons/supplier_catalogue/report/report_supplier_catalogue_lines_xls.mako (+6/-0)
bin/addons/supplier_catalogue/supplier_catalogue.py (+5/-1)
bin/addons/supplier_catalogue/supplier_catalogue_view.xml (+4/-0)
bin/addons/sync_common/common.py (+1/-0)
bin/osv/orm.py (+3/-3)
bin/tools/misc.py (+262/-0)