Merge lp:~dorian-kemps/unifield-server/US-1023 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako	2018-07-18 09:51:56 +0000
+++ bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako	2019-07-15 07:19:17 +0000
@@ -137,11 +137,11 @@
 
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport mode')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'transport_mode') or '')|x}</Data></Cell>
-        % if o.imp_transport_mode != o.transport_mode:
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_mode') or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'transport_type') or '')|x}</Data></Cell>
+        % if o.imp_transport_type != o.transport_type:
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_type') or '')|x}</Data></Cell>
         % else:
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_mode') or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_type') or '')|x}</Data></Cell>
         % endif
     </Row>
 

=== modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_report.rml'
--- bin/addons/msf_doc_import/report/po_simulation_screen_report.rml	2014-01-15 10:47:43 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_report.rml	2019-07-15 07:19:17 +0000
@@ -99,10 +99,10 @@
                     <para style="HeaderDiffNameRight">Transport mode:</para>
                 </td>
                 <td>
-                    <para style="HeaderDiffValue">[[ getSel(o, 'in_transport_mode') ]]</para>
+                    <para style="HeaderDiffValue">[[ getSel(o, 'in_transport_type') ]]</para>
                 </td>
                 <td>
-                    <para style="HeaderDiffValue">[[ setTag('para', 'para', {'style': o.in_transport_mode != o.imp_transport_mode and 'HeaderDiffValueColor' or 'HeaderDiffValue'}) ]] [[ getSel(o, 'imp_transport_mode') ]]</para>
+                    <para style="HeaderDiffValue">[[ setTag('para', 'para', {'style': o.in_transport_type != o.imp_transport_type and 'HeaderDiffValueColor' or 'HeaderDiffValue'}) ]] [[ getSel(o, 'imp_transport_type') ]]</para>
                 </td>
             </tr>
             <tr>

=== modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2018-08-10 09:51:23 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2019-07-15 07:19:17 +0000
@@ -124,11 +124,11 @@
 
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport Mode')}</Data></Cell>
-        <Cell ss:StyleID="line" ><Data ss:Type="String">${getSel(o, 'in_transport_mode') or ''|x}</Data></Cell>
-        % if o.imp_transport_mode != o.in_transport_mode:
-        <Cell ss:StyleID="line_change" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_mode') or ''|x}</Data></Cell>
+        <Cell ss:StyleID="line" ><Data ss:Type="String">${getSel(o, 'in_transport_type') or ''|x}</Data></Cell>
+        % if o.imp_transport_type != o.in_transport_type:
+        <Cell ss:StyleID="line_change" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_type') or ''|x}</Data></Cell>
         % else:
-        <Cell ss:StyleID="line" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_mode')or ''|x}</Data></Cell>
+        <Cell ss:StyleID="line" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_type')or ''|x}</Data></Cell>
         % endif
     </Row>
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2019-04-25 15:25:38 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2019-07-15 07:19:17 +0000
@@ -102,7 +102,7 @@
                             'backorder_id': simu.picking_id.backorder_id and simu.picking_id.backorder_id.id or False,
                             'header_notes': simu.picking_id.note,
                             'freight_number': simu.picking_id.shipment_ref,
-                            'transport_mode': simu.picking_id and simu.picking_id.purchase_id and simu.picking_id.purchase_id.transport_type or False}
+                            'transport_type': simu.picking_id and simu.picking_id.purchase_id and simu.picking_id.purchase_id.transport_type or False}
 
         return res
 
@@ -147,14 +147,14 @@
                                         readonly=True, type='text', multi='related'),
         'freight_number': fields.function(_get_related_values, method=True, string='Freight number',
                                           readonly=True, type='char', size=128, multi='related'),
-        'transport_mode': fields.function(_get_related_values, method=True, string='Transport mode',
+        'transport_type': fields.function(_get_related_values, method=True, string='Transport mode',
                                           readonly=True, type='selection', selection=TRANSPORT_TYPE, multi='related'),
         # Import fields
         'imp_notes': fields.text(string='Notes', readonly=True),
         'message_esc': fields.text(string='Message ESC', readonly=True),
         'imp_origin': fields.char(size=128, string='Origin', readonly=True),
         'imp_freight_number': fields.char(size=128, string='Freight number', readonly=True),
-        'imp_transport_mode': fields.char(string='Transport mode', size=128, readonly=True),
+        'imp_transport_type': fields.char(string='Transport mode', size=128, readonly=True),
         # Lines
         'line_ids': fields.one2many('wizard.import.in.line.simulation.screen', 'simu_id', string='Stock moves'),
         'with_pack': fields.boolean('With Pack Info'),
@@ -664,8 +664,8 @@
                 header_values['imp_origin'] = wiz.origin
 
                 # Line 5: Transport mode
-                transport_mode = values.get(5, ['', ''])[1]
-                header_values['imp_transport_mode'] = transport_mode
+                transport_type = values.get(5, ['', ''])[1]
+                header_values['imp_transport_type'] = transport_type
 
                 # Line 6: Notes
                 imp_notes = values.get(6, ['', ''])[1]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2018-10-02 14:02:43 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2019-07-15 07:19:17 +0000
@@ -49,8 +49,8 @@
                             <separator colspan="2" string="Imported values"/>
                             <field name="freight_number" />
                             <field name="imp_freight_number" />
-                            <field name="transport_mode" />
-                            <field name="imp_transport_mode" />
+                            <field name="transport_type" />
+                            <field name="imp_transport_type" />
                             <separator colspan="2" string="Original notes" />
                             <separator colspan="2" string="Imported notes" />
                             <field name="header_notes" colspan="2" nolabel="1" />

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-05-28 07:30:48 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-07-15 07:19:17 +0000
@@ -198,7 +198,7 @@
                                        relation='res.partner.address',
                                        string='Destination Address',
                                        readonly=True),
-        'in_transport_mode': fields.related('order_id', 'transport_type',
+        'in_transport_type': fields.related('order_id', 'transport_type',
                                             type='selection',
                                             selection=TRANSPORT_TYPE,
                                             string='Transport mode',
@@ -238,7 +238,7 @@
         # Import fiels
         'imp_supplier_ref': fields.char(size=256, string='Supplier Ref',
                                         readonly=True),
-        'imp_transport_mode': fields.selection(selection=TRANSPORT_TYPE,
+        'imp_transport_type': fields.selection(selection=TRANSPORT_TYPE,
                                                string='Transport mode',
                                                readonly=True),
         'imp_ready_to_ship_date': fields.date(string='RTS Date',
@@ -838,17 +838,17 @@
                 # Nothing to do
 
                 # Line 9: Transport mode
-                transport_mode = values.get(9, [])[1]
-                if transport_mode:
-                    transport_select = self.fields_get(cr, uid, ['imp_transport_mode'], context=context)
-                    for x in transport_select['imp_transport_mode']['selection']:
-                        if x[1] == transport_mode:
-                            header_values['imp_transport_mode'] = x[0]
+                transport_type = values.get(9, [])[1]
+                if transport_type:
+                    transport_select = self.fields_get(cr, uid, ['imp_transport_type'], context=context)
+                    for x in transport_select['imp_transport_type']['selection']:
+                        if x[1] == transport_type:
+                            header_values['imp_transport_type'] = x[0]
                             break
                     else:
-                        possible_mode = ', '.join(x[1] for x in transport_select['imp_transport_mode']['selection'] if x[1])
+                        possible_type = ', '.join(x[1] for x in transport_select['imp_transport_type']['selection'] if x[1])
                         err_msg = _('Line 9 of the file: The transport mode \'%s\' is not \
-a valid transport mode. Valid transport modes: %s') % (transport_mode, possible_mode)
+a valid transport mode. Valid transport modes: %s') % (transport_type, possible_type)
                         values_header_errors.append(err_msg)
 
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2019-03-29 17:02:16 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2019-07-15 07:19:17 +0000
@@ -45,8 +45,8 @@
                             <field name="in_supplier_ref" />
                             <field name="imp_supplier_ref" nolabel="1" />
                             <label> </label>
-                            <field name="in_transport_mode" />
-                            <field name="imp_transport_mode" nolabel="1" />
+                            <field name="in_transport_type" />
+                            <field name="imp_transport_type" nolabel="1" />
                             <label> </label>
                             <field name="in_ready_to_ship_date" />
                             <field name="imp_ready_to_ship_date" nolabel="1" />

=== modified file 'bin/addons/msf_order_date/__init__.py'
--- bin/addons/msf_order_date/__init__.py	2011-12-09 09:45:44 +0000
+++ bin/addons/msf_order_date/__init__.py	2019-07-15 07:19:17 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-TRANSPORT_TYPE = [('',''), ('sea', 'Sea'), ('air', 'Air'), ('road', 'Road'),] #[('flight', 'By Flight'), ('road', 'By Road'), ('boat', 'By Boat')]
+TRANSPORT_TYPE = [('',''), ('express','Express'), ('hand','Hand carry'), ('sea', 'Sea'), ('air', 'Air'), ('road', 'Road'),] #[('flight', 'By Flight'), ('road', 'By Road'), ('boat', 'By Boat')]
 ZONE_SELECTION = [('national','National'),('international','International')]
 
 import order_dates

=== modified file 'bin/addons/msf_profile/i18n/allmsf.pot'
--- bin/addons/msf_profile/i18n/allmsf.pot	2017-09-28 14:05:02 +0000
+++ bin/addons/msf_profile/i18n/allmsf.pot	2019-07-15 07:19:17 +0000
@@ -4535,12 +4535,6 @@
 msgid "OpenERP Tweets"
 msgstr ""
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air regular"
-msgstr ""
-
 #. module: analytic_distribution
 #: field:mass.reallocation.verification.wizard,nb_error:0
 msgid "Lines in error"
@@ -23335,12 +23329,6 @@
 msgid "Module Upgrade"
 msgstr ""
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air express"
-msgstr ""
-
 #. module: msf_outgoing
 #: model:ir.actions.report.xml,name:msf_outgoing.report_cargo_manifest
 msgid "Cargo Manifest"
@@ -24784,9 +24772,7 @@
 msgstr ""
 
 #. module: transport_mgmt
-#: field:international.transport.cost.report,transport_mode:0
 #: field:local.transport.cost.report,transport_mode:0
-#: field:purchase.order,transport_mode:0
 msgid "Transport mode"
 msgstr ""
 
@@ -29573,8 +29559,6 @@
 #: selection:res.partner,transport_0:0
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
 msgid "Sea"
 msgstr ""
 
@@ -32211,12 +32195,6 @@
 "A group_by specification must be a list of valid fields."
 msgstr ""
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air FFC"
-msgstr ""
-
 #. module: msf_outgoing
 #: field:stock.picking,previous_step_id:0
 msgid "Previous step"
@@ -40793,8 +40771,6 @@
 #: selection:res.partner,transport_0:0
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
 msgid "Road"
 msgstr ""
 
@@ -41086,12 +41062,6 @@
 msgid "Free 2"
 msgstr ""
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Hand carry"
-msgstr ""
-
 #. modules: delivery_mechanism, purchase, stock_override, product_asset, specific_rules, stock
 #: model:ir.model,name:delivery_mechanism.model_stock_partial_picking
 #: model:ir.model,name:product_asset.model_stock_partial_picking

=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2019-04-08 15:13:52 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2019-07-15 07:19:17 +0000
@@ -13969,9 +13969,7 @@
 msgstr "Códigos de impuestos"
 
 #. module: transport_mgmt
-#: field:international.transport.cost.report,transport_mode:0
 #: field:local.transport.cost.report,transport_mode:0
-#: field:purchase.order,transport_mode:0
 msgid "Transport mode"
 msgstr "Modo de transporte"
 
@@ -15780,12 +15778,6 @@
 msgid "You try to assign a lot which is not from the same product"
 msgstr "Está intentando asignar un lote que no es del mismo producto"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air regular"
-msgstr "Aéreo regular"
-
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Voucher"
@@ -29552,12 +29544,6 @@
 msgid "New Jersey"
 msgstr "Nueva Jersey"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air express"
-msgstr "Air express"
-
 #. module: product_attributes
 #: code:addons/product_attributes/product_attributes.py:446
 #, python-format
@@ -36530,12 +36516,6 @@
 msgid "Owner"
 msgstr "Propietario"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air FFC"
-msgstr "Aire FFC"
-
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
@@ -41573,8 +41553,6 @@
 #: selection:res.partner,transport_0:0
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
 msgid "Sea"
 msgstr "Mar"
 
@@ -46484,12 +46462,6 @@
 msgid "Nomenclature level"
 msgstr "Nivel de nomenclatura"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Hand carry"
-msgstr "Transportado en mano"
-
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid "Import of the statement in the system from a supplier or customer invoice"
@@ -49784,8 +49756,6 @@
 #: selection:res.partner,transport_0:0
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
 msgid "Road"
 msgstr "Tierra"
 

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-06-20 14:24:33 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-07-15 07:19:17 +0000
@@ -39297,9 +39297,6 @@
 
 #. modules: msf_order_date, purchase, msf_outgoing, partner_modification, transport_mgmt, msf_doc_import
 #: selection:purchase.import.xml.line,transport_type:0
-#: selection:wizard.import.in.simulation.screen,transport_mode:0
-#: selection:wizard.import.po.simulation.screen,imp_transport_mode:0
-#: selection:wizard.import.po.simulation.screen,in_transport_mode:0
 #: selection:sale.order,transport_type:0
 #: selection:return.pack.shipment.processor,transport_type:0
 #: selection:return.shipment.processor,transport_type:0
@@ -39309,8 +39306,6 @@
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
 #: selection:purchase.order,transport_type:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
 msgid "Sea"
 msgstr "Mer"
 
@@ -49883,9 +49878,6 @@
 
 #. modules: msf_order_date, msf_doc_import, msf_outgoing, partner_modification, purchase
 #: selection:purchase.import.xml.line,transport_type:0
-#: selection:wizard.import.in.simulation.screen,transport_mode:0
-#: selection:wizard.import.po.simulation.screen,imp_transport_mode:0
-#: selection:wizard.import.po.simulation.screen,in_transport_mode:0
 #: selection:sale.order,transport_type:0
 #: selection:return.pack.shipment.processor,transport_type:0
 #: selection:return.shipment.processor,transport_type:0
@@ -53896,12 +53888,6 @@
 msgid "Problem in configuration `Record Id` in Server Action!"
 msgstr "Problème dans la configuration `Record Id` sous Action Server!"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air regular"
-msgstr "Air - régulier "
-
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
@@ -76232,12 +76218,6 @@
 msgid "Price List Version"
 msgstr "Prix - Version  de Liste"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Hand carry"
-msgstr "Transport en bagage à main"
-
 #. module: account_corrections
 #: view:wizard.journal.items.corrections:0
 #: view:analytic.distribution.wizard:0
@@ -77421,16 +77401,16 @@
 #. modules: msf_doc_import, transport_mgmt, msf_supply_doc_export
 #: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:139
 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:60
-#: field:wizard.import.in.simulation.screen,imp_transport_mode:0
-#: field:wizard.import.in.simulation.screen,transport_mode:0
-#: field:wizard.import.po.simulation.screen,imp_transport_mode:0
-#: field:wizard.import.po.simulation.screen,in_transport_mode:0
-#: field:international.transport.cost.report,transport_mode:0
 #: field:local.transport.cost.report,transport_mode:0
-#: field:purchase.order,transport_mode:0
 #: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:124
 #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:118
 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:136
+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:73
+#: field:wizard.import.in.simulation.screen,imp_transport_type:0
+#: field:wizard.import.in.simulation.screen,transport_type:0
+#: field:wizard.import.po.simulation.screen,imp_transport_type:0
+#: field:wizard.import.po.simulation.screen,in_transport_type:0
+#: field:international.transport.cost.report,transport_type:0
 #, python-format
 msgid "Transport mode"
 msgstr "Mode de transport"
@@ -81745,12 +81725,6 @@
 msgid "Validated by"
 msgstr "Validé par"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air FFC"
-msgstr "Air - FFC"
-
 #. modules: base_setup, unifield_setup
 #: selection:base.setup.company,state_id:0
 #: selection:base.setup.company,bill_state_id:0
@@ -83482,12 +83456,6 @@
 #: selection:res.partner,transport_1:0
 #: selection:res.partner,transport_2:0
 #: selection:purchase.order,transport_type:0
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-#: selection:purchase.import.xml.line,transport_type:0
-#: selection:wizard.import.in.simulation.screen,transport_mode:0
-#: selection:wizard.import.po.simulation.screen,imp_transport_mode:0
-#: selection:wizard.import.po.simulation.screen,in_transport_mode:0
 #: selection:return.pack.shipment.processor,transport_type:0
 #: selection:return.shipment.processor,transport_type:0
 #: selection:shipment,transport_type:0
@@ -85934,12 +85902,6 @@
 msgid "Load"
 msgstr "Charger"
 
-#. module: transport_mgmt
-#: selection:international.transport.cost.report,transport_mode:0
-#: selection:purchase.order,transport_mode:0
-msgid "Air express"
-msgstr "Air - express"
-
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
@@ -106827,3 +106789,21 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Estimated transport costs : "
+msgstr "Estimation des coûts du transport : "
+
+#. modules: msf_order_date, purchase, msf_outgoing, partner_modification, transport_mgmt, msf_doc_import
+#: selection:sale.order,transport_type:0
+#: selection:return.pack.shipment.processor,transport_type:0
+#: selection:return.shipment.processor,transport_type:0
+#: selection:shipment,transport_type:0
+#: selection:shipment.processor,transport_type:0
+#: selection:res.partner,transport_0:0
+#: selection:res.partner,transport_1:0
+#: selection:res.partner,transport_2:0
+#: selection:purchase.order,transport_type:0
+#: selection:international.transport.cost.report,transport_type:0
+msgid "Hand carry"
+msgstr "Transport en bagage à main"

=== modified file 'bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv'
--- bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv	2019-03-27 11:23:15 +0000
+++ bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv	2019-07-15 07:19:17 +0000
@@ -82,7 +82,6 @@
 PO Coordo,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/82
 PO Coordo,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/83
 PO Coordo,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/84
-PO Coordo,transport_mgmt.field_purchase_order_transport_mode,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/85
 PO Coordo,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/86
 PO Coordo,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/87
 PO Coordo,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/88
@@ -173,7 +172,6 @@
 PO Project,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/174
 PO Project,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/175
 PO Project,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/176
-PO Project,transport_mgmt.field_purchase_order_transport_mode,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/177
 PO Project,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/178
 PO Project,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/179
 PO Project,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/180
@@ -264,7 +262,6 @@
 PO HQ,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/266
 PO HQ,transport_mgmt.field_purchase_order_transport_cost,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/267
 PO HQ,transport_mgmt.field_purchase_order_transport_currency_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/268
-PO HQ,transport_mgmt.field_purchase_order_transport_mode,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/269
 PO HQ,transport_mgmt.field_purchase_order_transport_order_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/270
 PO HQ,msf_order_date.field_sale_order_transport_type,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/271
 PO HQ,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/272

=== modified file 'bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako	2018-11-28 09:12:03 +0000
+++ bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako	2019-07-15 07:19:17 +0000
@@ -8,7 +8,7 @@
         <field name="partner_id" key="name">
             <field name="name">${o.partner_id and o.partner_id.name or ''}</field>
         </field>
-        <field name="transport_mode">${(o.purchase_id and getSel(o.purchase_id, 'transport_type') or '')|x}</field>
+        <field name="transport_type">${(o.purchase_id and getSel(o.purchase_id, 'transport_type') or '')|x}</field>
         <field name="note">${o.note or ''}</field>
         <field name="message_esc"></field>
         <field name="move_lines">

=== modified file 'bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py'
--- bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2019-02-25 14:54:54 +0000
+++ bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py	2019-07-15 07:19:17 +0000
@@ -39,7 +39,7 @@
     7: 'packing_date',
     8: 'total_items',
     9: 'content',
-    10: 'transport_mode',
+    10: 'transport_type',
     11: 'priority',
     12: 'rts_date',
 }

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2019-05-28 14:47:52 +0000
+++ bin/addons/purchase/purchase_order.py	2019-07-15 07:19:17 +0000
@@ -1510,7 +1510,7 @@
                   'categ', 'priority', 'internal_type', 'arrival_date',
                   'transport_type', 'shipment_date', 'ready_to_ship_date',
                   'cross_docking_ok', 'delivery_confirmed_date',
-                  'est_transport_lead_time', 'transport_mode', 'location_id',
+                  'est_transport_lead_time', 'location_id',
                   'dest_address_id', 'incoterm_id']
 
 

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2019-05-27 14:37:03 +0000
+++ bin/addons/purchase/purchase_view.xml	2019-07-15 07:19:17 +0000
@@ -162,7 +162,7 @@
                         <field name="partner_ref" invisible="1"/>
                         <field name="short_partner_ref" on_change="onchange_short_partner_ref(short_partner_ref)" attrs="{'readonly': ['|', ('partner_type', 'not in', ['external', 'esc']), ('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                         <field name="shipped" attrs="{'invisible':[('state', 'in', ('draft', 'draft_p', 'validated', 'validated_p'))]}" readonly="1"/>
-                        <field name="shipped_rate" invisible="True"/>
+                        <field name="shipped_rate" invisible="True" widget="boolean"/> <!-- Put to boolean for the conditions below -->
                         <field name="push_fo" invisible="1"/>
                         <field name="is_a_counterpart" invisible="1"/>
                         <field name="order_type" on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
@@ -325,7 +325,7 @@
                                 <field name="est_transport_lead_time" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                                 <field name="ready_to_ship_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/>
                                 <field name="shipment_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/>
-                                <field name="arrival_date" attrs="{'readonly': ['|', ('shipped_rate', '!=', 0.0), ('state', '=', 'done')], 'invisible': [('internal_type', '!=', 'international')]}"/>
+                                <field name="arrival_date" attrs="{'readonly': ['|', ('shipped_rate', '=', True), ('state', '=', 'done')], 'invisible': [('internal_type', '!=', 'international')]}"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Delivery" colspan="2"/>
@@ -393,10 +393,10 @@
                         <group colspan="12" col="19" attrs="{'invisible': ['|', ('categ', '=', 'transport'), ('display_intl_transport_ok', '=', False)]}">
                             <field name="display_intl_transport_ok" invisible="1"/>
                             <field name="intl_supplier_ok" invisible="1"/>
-                            <field name="transport_mode" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'readonly': [('shipped_rate', '!=', 0.00)]}"/>
-                            <label colspan="15"/>
-                            <field name="transport_cost" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)], 'readonly': [('shipped_rate', '!=', 0.00)]}" nolabel="1"/>
-                            <field name="transport_currency_id" domain="[('is_po_functional', '=', pricelist_id)]" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)],'readonly': [('shipped_rate', '!=', 0.00)]}" nolabel="1"/>
+                            <label align="1.0" string="Estimated transport costs : " colspan="3"/>
+                            <field name="transport_cost" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)], 'readonly': [('shipped_rate', '=', True)]}" nolabel="1"/>
+                            <field name="transport_currency_id" domain="[('is_po_functional', '=', pricelist_id)]" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)],'readonly': [('shipped_rate', '=', True)]}" nolabel="1"/>
+                            <label colspan="13"/>
                             <separator colspan="19" attrs="{'invisible': [('display_intl_transport_ok', '=', False)]}"/>
                         </group>
                         <field name="currency_id" readonly="1"/>

=== modified file 'bin/addons/transport_mgmt/purchase.py'
--- bin/addons/transport_mgmt/purchase.py	2019-02-11 10:13:34 +0000
+++ bin/addons/transport_mgmt/purchase.py	2019-07-15 07:19:17 +0000
@@ -101,9 +101,6 @@
     _columns = {
         'display_intl_transport_ok': fields.boolean(string='Displayed intl transport'),
         'intl_supplier_ok': fields.boolean(string='International Supplier'),
-        'transport_mode': fields.selection([('regular_air', 'Air regular'), ('express_air', 'Air express'),
-                                            ('ffc_air', 'Air FFC'), ('sea', 'Sea'),
-                                            ('road', 'Road'), ('hand', 'Hand carry'),], string='Transport mode'),
         'transport_cost': fields.float(string='Transport cost', digits_compute=dp.get_precision('Purchase Price')),
         'transport_currency_id': fields.many2one('res.currency', string='Currency'),
         'total_price_include_transport': fields.function(_get_include_transport, method=True, string="Total incl. transport", type='float', digits_compute=dp.get_precision('Purchase Price'), readonly=True, multi='cost'),

=== modified file 'bin/addons/transport_mgmt/report/intl_transport.py'
--- bin/addons/transport_mgmt/report/intl_transport.py	2015-05-26 14:25:23 +0000
+++ bin/addons/transport_mgmt/report/intl_transport.py	2019-07-15 07:19:17 +0000
@@ -23,18 +23,18 @@
 from osv import fields
 
 import tools
+from msf_order_date import TRANSPORT_TYPE
+
 
 class international_transport_cost_report(osv.osv):
     _name = 'international.transport.cost.report'
     _rec_name = 'order_id'
     _description = 'International Transport Costs'
     _auto = False
-    _order = 'date_order desc, delivery_confirmed_date desc, partner_id, transport_mode'
+    _order = 'date_order desc, delivery_confirmed_date desc, partner_id, transport_type'
 
     _columns = {
-        'transport_mode': fields.selection([('regular_air', 'Air regular'), ('express_air', 'Air express'),
-                                            ('ffc_air', 'Air FFC'), ('sea', 'Sea'),
-                                            ('road', 'Road'), ('hand', 'Hand carry'),], string='Transport mode'),
+        'transport_type': fields.selection(selection=TRANSPORT_TYPE, string='Transport mode'),
         'func_transport_cost': fields.float(digits=(16,2), string='Func. Transport cost'),
         'func_currency_id': fields.many2one('res.currency', string='Func. Currency'),
         'transport_cost': fields.float(digits=(16,2), string='Transport cost'),
@@ -55,7 +55,7 @@
                         min(po.id) as id,
                         po.id as order_id,
                         count(po.id) as nb_order,
-                        po.transport_mode as transport_mode,
+                        po.transport_type as transport_type,
                         sum(round((po.transport_cost*(to_rate.rate/fr_rate.rate)/to_cur.rounding))*to_cur.rounding) as func_transport_cost,
                         po.transport_cost as transport_cost,
                         po.transport_currency_id as transport_currency_id,
@@ -93,7 +93,7 @@
                         po.transport_cost > 0.00
                     GROUP BY
                         po.id,
-                        po.transport_mode,
+                        po.transport_type,
                         po.transport_cost,
                         po.transport_currency_id,
                         po.date_order,

=== modified file 'bin/addons/transport_mgmt/report/intl_transport_view.xml'
--- bin/addons/transport_mgmt/report/intl_transport_view.xml	2012-01-20 10:38:08 +0000
+++ bin/addons/transport_mgmt/report/intl_transport_view.xml	2019-07-15 07:19:17 +0000
@@ -14,7 +14,7 @@
                     <field name="date_order" />
                     <field name="delivery_confirmed_date" />
                     <field name="partner_id" />
-                    <field name="transport_mode" />
+                    <field name="transport_type" />
                     <field name="func_transport_cost" sum="Transport cost" />
                     <field name="func_currency_id" />
                     <field name="transport_cost" />
@@ -33,7 +33,7 @@
                         <filter icon="terp-check" name="approved" string="Confirmed" domain="[('order_state','=','approved')]" separator="1" />
                         <filter icon="gtk-yes" name="done" string="Closed" domain="[('order_state','=','done')]" separator="1" />
                         <separator orientation="vertical" />
-                        <field name="transport_mode" />
+                        <field name="transport_type" />
                         <field name="transport_cost" />
                         <field name="order_id" />
                         <field name="date_order" />
@@ -42,7 +42,7 @@
                     </group>
                     <newline />
                     <group expand="1" string="Group By..." colspan="10" col="12">
-                        <filter string="Transport Mode" name="group_transport_mode" icon="terp-accessories-archiver" context="{'group_by': 'transport_mode'}" />
+                        <filter string="Transport Mode" name="group_transport_type" icon="terp-accessories-archiver" context="{'group_by': 'transport_type'}" />
                         <separator orientation="vertical" />
                         <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/>
                     </group>
@@ -55,7 +55,7 @@
             <field name="res_model">international.transport.cost.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{'search_default_group_transport_mode':1, 'search_default_group_partner_id':1, 'search_default_group_transport_currency_id':1, 'group_by':[], 'group_by_no_leaf':0}</field>
+            <field name="context">{'search_default_group_transport_type':1, 'search_default_group_partner_id':1, 'search_default_group_transport_currency_id':1, 'group_by':[], 'group_by_no_leaf':0}</field>
         </record>
 
         <menuitem action="action_intl_transport_cost_action" id="menu_intl_transport_cost_report" parent="menu_transport_cost_reports"/>