Merge lp://staging/~dorian-kemps/unifield-server/US-2269 into lp://staging/~jfb-tempo-consulting/unifield-server/trunk

bin/addons/msf_doc_import/__init__.py (+7/-0)
bin/addons/msf_doc_import/__openerp__.py (+1/-0)
bin/addons/msf_doc_import/stock_picking.py (+41/-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 (+585/-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 (+1/-1)
bin/addons/msf_outgoing/msf_outgoing.py (+6/-1)
bin/addons/msf_outgoing/msf_outgoing_report.xml (+9/-0)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+3/-0)
bin/addons/msf_outgoing/report/__init__.py (+1/-0)
bin/addons/msf_outgoing/report/picking_ticket.py (+52/-6)
bin/addons/msf_outgoing/report/pre_packing_excel_report.py (+143/-0)
bin/addons/msf_outgoing/report/pre_packing_excel_report_xls.mako (+325/-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_profile/i18n/en_MF.po (+96/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+698/-3)
bin/addons/msf_profile/msf_profile.py (+1/-2)
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+1/-0)
bin/addons/stock_override/stock.py (+1/-1)
bin/unifield-version.txt (+1/-1)