Merge lp://staging/~unifield-team/unifield-server/us-5199 into lp://staging/~jfb-tempo-consulting/unifield-server/trunk

bin/addons/account/account.py (+27/-16)
bin/addons/account/account_view.xml (+1/-0)
bin/addons/account/report/account_liquidity_balance.mako (+2/-2)
bin/addons/account/report/account_liquidity_balance.py (+76/-34)
bin/addons/account/report/free_allocation_report.mako (+0/-29)
bin/addons/account/report/free_allocation_report.py (+0/-31)
bin/addons/account/wizard/account_report_liquidity_balance.py (+62/-12)
bin/addons/account/wizard/account_report_liquidity_balance_view.xml (+7/-1)
bin/addons/account_corrections/account_move_line.py (+4/-19)
bin/addons/account_corrections/account_wizard_view.xml (+1/-1)
bin/addons/account_corrections/wizard/journal_items_corrections.py (+31/-4)
bin/addons/account_hq_entries/account_view.xml (+23/-7)
bin/addons/account_hq_entries/hq_entries.py (+48/-11)
bin/addons/account_hq_entries/wizard/hq_entries_import.py (+45/-35)
bin/addons/account_hq_entries/wizard/hq_entries_validation.py (+22/-3)
bin/addons/account_hq_entries/wizard/hq_reallocation.py (+8/-7)
bin/addons/account_hq_entries/wizard/wizard_view.xml (+2/-1)
bin/addons/account_mcdb/account_move_line.py (+11/-3)
bin/addons/account_mcdb/report/combined_journals_report.mako (+30/-2)
bin/addons/account_mcdb/report/combined_journals_report.py (+9/-2)
bin/addons/account_mcdb/report/combined_journals_report.rml (+20/-2)
bin/addons/account_override/__init__.py (+14/-3)
bin/addons/account_override/account.py (+44/-9)
bin/addons/account_override/res_company.py (+7/-30)
bin/addons/account_period_closing_level/account_period.py (+18/-5)
bin/addons/account_period_closing_level/wizard/account_period_create.py (+12/-4)
bin/addons/analytic/analytic.py (+0/-7)
bin/addons/analytic_override/analytic_account.py (+61/-55)
bin/addons/base/base_update.xml (+1/-1)
bin/addons/base/ir/ir_model.py (+13/-2)
bin/addons/base/ir/ir_translation.py (+17/-12)
bin/addons/base/res/partner/partner.py (+1/-15)
bin/addons/base/res/partner/partner_view.xml (+3/-3)
bin/addons/base/res/res_request.py (+2/-1)
bin/addons/base/res/res_request_view.xml (+2/-0)
bin/addons/base/res/res_user.py (+8/-14)
bin/addons/base/rng/view.rng (+1/-0)
bin/addons/consumption_calculation/consumption_calculation.py (+5/-2)
bin/addons/consumption_calculation/history_consumption.py (+24/-8)
bin/addons/consumption_calculation/history_consumption_view.xml (+2/-0)
bin/addons/delivery_mechanism/delivery_mechanism.py (+4/-2)
bin/addons/finance/cash_request_view.xml (+12/-12)
bin/addons/import_data/import_data.py (+13/-6)
bin/addons/import_data/import_data_view.xml (+2/-0)
bin/addons/msf_audittrail/audittrail.py (+8/-3)
bin/addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py (+4/-5)
bin/addons/msf_doc_import/__init__.py (+7/-0)
bin/addons/msf_doc_import/__openerp__.py (+1/-0)
bin/addons/msf_doc_import/account.py (+7/-6)
bin/addons/msf_doc_import/report/import_generic_template.py (+13/-3)
bin/addons/msf_doc_import/stock_picking.py (+40/-1)
bin/addons/msf_doc_import/wizard/__init__.py (+11/-0)
bin/addons/msf_doc_import/wizard/wiz_common_import.py (+3/-3)
bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py (+584/-0)
bin/addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.xml (+37/-0)
bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py (+61/-117)
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+12/-9)
bin/addons/msf_field_access_rights/osv_override.py (+15/-121)
bin/addons/msf_homere_interface/hr.py (+3/-13)
bin/addons/msf_homere_interface/hr_payroll_wizard.xml (+4/-3)
bin/addons/msf_homere_interface/wizard/hr_nat_staff_import.py (+4/-20)
bin/addons/msf_homere_interface/wizard/hr_payroll_employee_import.py (+86/-17)
bin/addons/msf_homere_interface/wizard/hr_payroll_import.py (+31/-23)
bin/addons/msf_instance/add_instance.py (+0/-30)
bin/addons/msf_order_date/order_dates.py (+3/-3)
bin/addons/msf_order_date/wizard/update_lines.py (+65/-18)
bin/addons/msf_outgoing/msf_outgoing.py (+12/-7)
bin/addons/msf_outgoing/msf_outgoing_report.xml (+9/-0)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+15/-8)
bin/addons/msf_outgoing/report/__init__.py (+1/-0)
bin/addons/msf_outgoing/report/empty_picking_ticket.rml (+82/-1)
bin/addons/msf_outgoing/report/picking_ticket.py (+51/-6)
bin/addons/msf_outgoing/report/picking_ticket.rml (+84/-3)
bin/addons/msf_outgoing/report/pre_packing_excel_report.py (+140/-0)
bin/addons/msf_outgoing/report/pre_packing_excel_report_xls.mako (+325/-0)
bin/addons/msf_outgoing/wizard/create_picking_processor.py (+26/-0)
bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py (+1/-1)
bin/addons/msf_outgoing/wizard/ppl_processor.py (+26/-7)
bin/addons/msf_outgoing/wizard/validate_picking_processor.py (+27/-3)
bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml (+1/-0)
bin/addons/msf_partner/partner.py (+6/-6)
bin/addons/msf_partner/partner_view.xml (+1/-1)
bin/addons/msf_printed_documents/report/freight_manifest.py (+4/-0)
bin/addons/msf_printed_documents/report/freight_manifest.rml (+8/-2)
bin/addons/msf_printed_documents/report/sale_order.py (+9/-4)
bin/addons/msf_printed_documents/report/sale_order.rml (+1/-1)
bin/addons/msf_profile/data/patches.xml (+19/-4)
bin/addons/msf_profile/i18n/en_MF.po (+96/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+1702/-275)
bin/addons/msf_profile/msf_profile.py (+84/-31)
bin/addons/msf_profile/user_rights/ir.model.access.csv (+0/-1)
bin/addons/msf_supply_doc_export/__openerp__.py (+1/-0)
bin/addons/msf_supply_doc_export/msf_export_report.xml (+12/-0)
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+95/-1)
bin/addons/msf_supply_doc_export/report/report_pick_export_xls.mako (+198/-0)
bin/addons/msf_supply_doc_export/wizard/__init__.py (+1/-0)
bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py (+404/-0)
bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.xml (+18/-0)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+8/-8)
bin/addons/msf_tools/automated_import.py (+1/-1)
bin/addons/msf_tools/automated_import_job.py (+81/-46)
bin/addons/msf_tools/msf_tools.py (+1/-0)
bin/addons/msf_tools/views/automated_import_job_view.xml (+2/-2)
bin/addons/procurement_request/procurement_request.py (+1/-189)
bin/addons/procurement_request/procurement_request_view.xml (+20/-12)
bin/addons/product/product.py (+35/-0)
bin/addons/product/product_view.xml (+1/-0)
bin/addons/product_attributes/product_attributes.py (+1/-24)
bin/addons/product_attributes/product_attributes_view.xml (+12/-12)
bin/addons/product_nomenclature/product_nomenclature.py (+5/-0)
bin/addons/product_nomenclature/product_nomenclature_view.xml (+2/-0)
bin/addons/purchase/__init__.py (+3/-2)
bin/addons/purchase/purchase_data.xml (+4/-0)
bin/addons/purchase/purchase_line_workflow.xml (+6/-0)
bin/addons/purchase/purchase_order.py (+80/-17)
bin/addons/purchase/purchase_order_line.py (+31/-4)
bin/addons/purchase/purchase_view.xml (+9/-9)
bin/addons/purchase/purchase_workflow.py (+16/-69)
bin/addons/purchase_override/wizard/split_order_line.py (+14/-0)
bin/addons/register_accounting/account_bank_statement.py (+9/-5)
bin/addons/register_accounting/account_view.xml (+3/-0)
bin/addons/register_accounting/report/fully_report_xls.mako (+81/-69)
bin/addons/register_accounting/report/liquidity_position_pdf.rml (+2/-2)
bin/addons/register_accounting/report/liquidity_position_xls.mako (+2/-3)
bin/addons/register_accounting/report/report_fully_report.py (+38/-0)
bin/addons/register_accounting/report/report_liquidity_position.py (+20/-9)
bin/addons/sale/report/sale_donation_stock_moves_report.py (+11/-3)
bin/addons/sale/report/sale_donation_stock_moves_report_xls.mako (+32/-7)
bin/addons/sale/sale_order.py (+33/-62)
bin/addons/sale/sale_order_line_workflow.xml (+6/-0)
bin/addons/sale/sale_view.xml (+14/-13)
bin/addons/sale/sale_workflow.py (+9/-1)
bin/addons/sale/wizard/sale_donation_stock_moves.py (+17/-1)
bin/addons/sale/wizard/sale_donation_stock_moves_view.xml (+1/-0)
bin/addons/sale/wizard/split_order_line.py (+2/-0)
bin/addons/sourcing/procurement_order.py (+0/-22)
bin/addons/sourcing/sale_order_line.py (+30/-0)
bin/addons/sourcing/sourcing_view.xml (+1/-1)
bin/addons/sourcing/wizard/multiple_sourcing.py (+21/-2)
bin/addons/sourcing/wizard/multiple_sourcing_view.xml (+2/-2)
bin/addons/specific_rules/report/report_stock_inventory.py (+179/-120)
bin/addons/specific_rules/report/report_stock_inventory_all_locations_xls.mako (+93/-12)
bin/addons/specific_rules/report/report_stock_inventory_view.xml (+15/-2)
bin/addons/specific_rules/report/report_stock_inventory_xls.mako (+104/-27)
bin/addons/specific_rules/specific_rules.py (+4/-0)
bin/addons/spreadsheet_xml/__init__.py (+2/-2)
bin/addons/spreadsheet_xml/spreadsheet_xml.py (+5/-5)
bin/addons/stock/__init__.py (+1/-1)
bin/addons/stock/__openerp__.py (+3/-0)
bin/addons/stock/physical_inventory.py (+12/-2)
bin/addons/stock/physical_inventory_view.xml (+1/-1)
bin/addons/stock/product.py (+3/-0)
bin/addons/stock/report/__init__.py (+2/-0)
bin/addons/stock/report/report_stock.py (+5/-3)
bin/addons/stock/report/stock_expired_damaged_report.py (+287/-0)
bin/addons/stock/report/stock_expired_damaged_report_view.xml (+136/-0)
bin/addons/stock/report/stock_expired_damaged_report_xls.mako (+275/-0)
bin/addons/stock/report/stock_reception_report.py (+68/-0)
bin/addons/stock/report/stock_reception_report_view.xml (+18/-0)
bin/addons/stock/report/stock_reception_report_xls.mako (+311/-0)
bin/addons/stock/stock.py (+5/-0)
bin/addons/stock/wizard/__init__.py (+1/-0)
bin/addons/stock/wizard/manage_expired_stock.py (+8/-1)
bin/addons/stock/wizard/stock_reception_wizard.py (+147/-0)
bin/addons/stock/wizard/stock_reception_wizard_view.xml (+43/-0)
bin/addons/stock_override/report/delivery_order.rml (+45/-8)
bin/addons/stock_override/stock.py (+16/-1)
bin/addons/stock_override/wizard/change_dest_location_view.xml (+1/-1)
bin/addons/supplier_catalogue/supplier_catalogue.py (+47/-7)
bin/addons/sync_client/message.py (+35/-8)
bin/addons/sync_client/message_view.xml (+11/-4)
bin/addons/sync_client/sync_client.py (+8/-8)
bin/addons/sync_client/update.py (+12/-0)
bin/addons/sync_client/update_view.xml (+8/-3)
bin/addons/sync_so/purchase.py (+51/-1)
bin/addons/tender_flow/tender_flow.py (+123/-17)
bin/addons/transport_mgmt/purchase.py (+18/-18)
bin/addons/unifield_tests/testfield/files/US4517_FOtoESC_PO_Import.xml (+387/-0)
bin/addons/unifield_tests/testfield/init_data/set_rb_partial_tf.py (+92/-27)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in CR.meta_feature (+0/-47)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in FO.meta_feature (+0/-173)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in IR.meta_feature (+0/-232)
bin/addons/unifield_tests/testfield/meta_features/SLL - State And Readonly in PO.meta_feature (+0/-243)
bin/addons/unifield_tests/testfield/meta_features/SLL Fin - Intermission - Partially confirmed FO-external PO-IN_OUT-IVI_IVO.meta_feature (+0/-308)
bin/addons/unifield_tests/testfield/meta_features/SLL Fin - Intersection - Partially confirmed FO-external PO-IN_OUT_STV-SI.meta_feature (+0/-308)
bin/addons/unifield_tests/testfield/meta_features/SLL Fin - Partially confirmed PO-Two CVs-Partial IN-SI merged lines.meta_feature (+0/-306)
bin/addons/unifield_tests/testfield/meta_features/SLL Fin - Partially confirmed PO-Two CVs-Partial IN-SI.meta_feature (+0/-300)
bin/addons/unifield_tests/testfield/meta_features/TC2.meta_feature (+1485/-0)
bin/addons/unifield_tests/testfield/meta_features/WIP_SSL US4517 TC_FO to ESC split TC3.meta_feature (+522/-0)
bin/addons/unifield_tests/testfield/meta_features/WIP_SSL US4517 TC_IR to PO split.meta_feature (+1305/-0)
bin/addons/unifield_tests/testfield/meta_features/intermission.meta_feature (+0/-994)
bin/addons/unifield_tests/testfield/meta_features/tc1.meta_feature (+0/-1659)
bin/addons/unifield_tests/testfield/meta_features/tc2-manual.meta_feature (+0/-923)
bin/addons/unifield_tests/testfield/meta_features/tc2.meta_feature (+0/-908)
bin/addons/unifield_tests/testfield/meta_features/tc3.meta_feature (+0/-1121)
bin/addons/unifield_tests/testfield/meta_features/tc4.meta_feature (+0/-605)
bin/addons/unifield_tests/testfield/meta_features/tc5.meta_feature (+0/-679)
bin/addons/unifield_tests/testfield/meta_features/tc6.meta_feature (+0/-723)
bin/addons/vertical_integration/report/hq_report_ocb.py (+3/-2)
bin/addons/vertical_integration/report/hq_report_ocg.py (+2/-2)
bin/addons/vertical_integration/report/hq_report_ocp.py (+2/-2)
bin/osv/orm.py (+25/-19)
bin/osv/query.py (+2/-1)
bin/release.py (+1/-1)
bin/service/security.py (+1/-1)
bin/unifield-version.txt (+2/-1)