Merge lp:~dorian-kemps/unifield-server/US-1023 into lp:unifield-server
- US-1023
- Merge into trunk
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 5428 |
Proposed branch: | lp:~dorian-kemps/unifield-server/US-1023 |
Merge into: | lp:unifield-server |
Diff against target: |
702 lines (+73/-159) 19 files modified
bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako (+4/-4) bin/addons/msf_doc_import/report/po_simulation_screen_report.rml (+2/-2) bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako (+4/-4) bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py (+5/-5) bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml (+2/-2) bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+10/-10) bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml (+2/-2) bin/addons/msf_order_date/__init__.py (+1/-1) bin/addons/msf_profile/i18n/allmsf.pot (+0/-30) bin/addons/msf_profile/i18n/es_MF.po (+0/-30) bin/addons/msf_profile/i18n/fr_MF.po (+24/-44) bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv (+0/-3) bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako (+1/-1) bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py (+1/-1) bin/addons/purchase/purchase_order.py (+1/-1) bin/addons/purchase/purchase_view.xml (+6/-6) bin/addons/transport_mgmt/purchase.py (+0/-3) bin/addons/transport_mgmt/report/intl_transport.py (+6/-6) bin/addons/transport_mgmt/report/intl_transport_view.xml (+4/-4) |
To merge this branch: | bzr merge lp:~dorian-kemps/unifield-server/US-1023 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Reviewer Team | Pending | ||
Review via email: mp+370108@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako' | |||
2 | --- bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako 2018-07-18 09:51:56 +0000 | |||
3 | +++ bin/addons/msf_doc_import/report/in_simulation_screen_xls_report.mako 2019-07-15 07:19:17 +0000 | |||
4 | @@ -137,11 +137,11 @@ | |||
5 | 137 | 137 | ||
6 | 138 | <Row> | 138 | <Row> |
7 | 139 | <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport mode')}</Data></Cell> | 139 | <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport mode')}</Data></Cell> |
11 | 140 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'transport_mode') or '')|x}</Data></Cell> | 140 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'transport_type') or '')|x}</Data></Cell> |
12 | 141 | % if o.imp_transport_mode != o.transport_mode: | 141 | % if o.imp_transport_type != o.transport_type: |
13 | 142 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_mode') or '')|x}</Data></Cell> | 142 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_type') or '')|x}</Data></Cell> |
14 | 143 | % else: | 143 | % else: |
16 | 144 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_mode') or '')|x}</Data></Cell> | 144 | <Cell ss:StyleID="line" ><Data ss:Type="String">${(getSel(o, 'imp_transport_type') or '')|x}</Data></Cell> |
17 | 145 | % endif | 145 | % endif |
18 | 146 | </Row> | 146 | </Row> |
19 | 147 | 147 | ||
20 | 148 | 148 | ||
21 | === modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_report.rml' | |||
22 | --- bin/addons/msf_doc_import/report/po_simulation_screen_report.rml 2014-01-15 10:47:43 +0000 | |||
23 | +++ bin/addons/msf_doc_import/report/po_simulation_screen_report.rml 2019-07-15 07:19:17 +0000 | |||
24 | @@ -99,10 +99,10 @@ | |||
25 | 99 | <para style="HeaderDiffNameRight">Transport mode:</para> | 99 | <para style="HeaderDiffNameRight">Transport mode:</para> |
26 | 100 | </td> | 100 | </td> |
27 | 101 | <td> | 101 | <td> |
29 | 102 | <para style="HeaderDiffValue">[[ getSel(o, 'in_transport_mode') ]]</para> | 102 | <para style="HeaderDiffValue">[[ getSel(o, 'in_transport_type') ]]</para> |
30 | 103 | </td> | 103 | </td> |
31 | 104 | <td> | 104 | <td> |
33 | 105 | <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> | 105 | <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> |
34 | 106 | </td> | 106 | </td> |
35 | 107 | </tr> | 107 | </tr> |
36 | 108 | <tr> | 108 | <tr> |
37 | 109 | 109 | ||
38 | === modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako' | |||
39 | --- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako 2018-08-10 09:51:23 +0000 | |||
40 | +++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako 2019-07-15 07:19:17 +0000 | |||
41 | @@ -124,11 +124,11 @@ | |||
42 | 124 | 124 | ||
43 | 125 | <Row> | 125 | <Row> |
44 | 126 | <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport Mode')}</Data></Cell> | 126 | <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Transport Mode')}</Data></Cell> |
48 | 127 | <Cell ss:StyleID="line" ><Data ss:Type="String">${getSel(o, 'in_transport_mode') or ''|x}</Data></Cell> | 127 | <Cell ss:StyleID="line" ><Data ss:Type="String">${getSel(o, 'in_transport_type') or ''|x}</Data></Cell> |
49 | 128 | % if o.imp_transport_mode != o.in_transport_mode: | 128 | % if o.imp_transport_type != o.in_transport_type: |
50 | 129 | <Cell ss:StyleID="line_change" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_mode') or ''|x}</Data></Cell> | 129 | <Cell ss:StyleID="line_change" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_type') or ''|x}</Data></Cell> |
51 | 130 | % else: | 130 | % else: |
53 | 131 | <Cell ss:StyleID="line" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_mode')or ''|x}</Data></Cell> | 131 | <Cell ss:StyleID="line" ss:MergeAcross="1" ><Data ss:Type="String">${getSel(o, 'imp_transport_type')or ''|x}</Data></Cell> |
54 | 132 | % endif | 132 | % endif |
55 | 133 | </Row> | 133 | </Row> |
56 | 134 | 134 | ||
57 | 135 | 135 | ||
58 | === modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py' | |||
59 | --- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-04-25 15:25:38 +0000 | |||
60 | +++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-07-15 07:19:17 +0000 | |||
61 | @@ -102,7 +102,7 @@ | |||
62 | 102 | 'backorder_id': simu.picking_id.backorder_id and simu.picking_id.backorder_id.id or False, | 102 | 'backorder_id': simu.picking_id.backorder_id and simu.picking_id.backorder_id.id or False, |
63 | 103 | 'header_notes': simu.picking_id.note, | 103 | 'header_notes': simu.picking_id.note, |
64 | 104 | 'freight_number': simu.picking_id.shipment_ref, | 104 | 'freight_number': simu.picking_id.shipment_ref, |
66 | 105 | 'transport_mode': simu.picking_id and simu.picking_id.purchase_id and simu.picking_id.purchase_id.transport_type or False} | 105 | 'transport_type': simu.picking_id and simu.picking_id.purchase_id and simu.picking_id.purchase_id.transport_type or False} |
67 | 106 | 106 | ||
68 | 107 | return res | 107 | return res |
69 | 108 | 108 | ||
70 | @@ -147,14 +147,14 @@ | |||
71 | 147 | readonly=True, type='text', multi='related'), | 147 | readonly=True, type='text', multi='related'), |
72 | 148 | 'freight_number': fields.function(_get_related_values, method=True, string='Freight number', | 148 | 'freight_number': fields.function(_get_related_values, method=True, string='Freight number', |
73 | 149 | readonly=True, type='char', size=128, multi='related'), | 149 | readonly=True, type='char', size=128, multi='related'), |
75 | 150 | 'transport_mode': fields.function(_get_related_values, method=True, string='Transport mode', | 150 | 'transport_type': fields.function(_get_related_values, method=True, string='Transport mode', |
76 | 151 | readonly=True, type='selection', selection=TRANSPORT_TYPE, multi='related'), | 151 | readonly=True, type='selection', selection=TRANSPORT_TYPE, multi='related'), |
77 | 152 | # Import fields | 152 | # Import fields |
78 | 153 | 'imp_notes': fields.text(string='Notes', readonly=True), | 153 | 'imp_notes': fields.text(string='Notes', readonly=True), |
79 | 154 | 'message_esc': fields.text(string='Message ESC', readonly=True), | 154 | 'message_esc': fields.text(string='Message ESC', readonly=True), |
80 | 155 | 'imp_origin': fields.char(size=128, string='Origin', readonly=True), | 155 | 'imp_origin': fields.char(size=128, string='Origin', readonly=True), |
81 | 156 | 'imp_freight_number': fields.char(size=128, string='Freight number', readonly=True), | 156 | 'imp_freight_number': fields.char(size=128, string='Freight number', readonly=True), |
83 | 157 | 'imp_transport_mode': fields.char(string='Transport mode', size=128, readonly=True), | 157 | 'imp_transport_type': fields.char(string='Transport mode', size=128, readonly=True), |
84 | 158 | # Lines | 158 | # Lines |
85 | 159 | 'line_ids': fields.one2many('wizard.import.in.line.simulation.screen', 'simu_id', string='Stock moves'), | 159 | 'line_ids': fields.one2many('wizard.import.in.line.simulation.screen', 'simu_id', string='Stock moves'), |
86 | 160 | 'with_pack': fields.boolean('With Pack Info'), | 160 | 'with_pack': fields.boolean('With Pack Info'), |
87 | @@ -664,8 +664,8 @@ | |||
88 | 664 | header_values['imp_origin'] = wiz.origin | 664 | header_values['imp_origin'] = wiz.origin |
89 | 665 | 665 | ||
90 | 666 | # Line 5: Transport mode | 666 | # Line 5: Transport mode |
93 | 667 | transport_mode = values.get(5, ['', ''])[1] | 667 | transport_type = values.get(5, ['', ''])[1] |
94 | 668 | header_values['imp_transport_mode'] = transport_mode | 668 | header_values['imp_transport_type'] = transport_type |
95 | 669 | 669 | ||
96 | 670 | # Line 6: Notes | 670 | # Line 6: Notes |
97 | 671 | imp_notes = values.get(6, ['', ''])[1] | 671 | imp_notes = values.get(6, ['', ''])[1] |
98 | 672 | 672 | ||
99 | === modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml' | |||
100 | --- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml 2018-10-02 14:02:43 +0000 | |||
101 | +++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml 2019-07-15 07:19:17 +0000 | |||
102 | @@ -49,8 +49,8 @@ | |||
103 | 49 | <separator colspan="2" string="Imported values"/> | 49 | <separator colspan="2" string="Imported values"/> |
104 | 50 | <field name="freight_number" /> | 50 | <field name="freight_number" /> |
105 | 51 | <field name="imp_freight_number" /> | 51 | <field name="imp_freight_number" /> |
108 | 52 | <field name="transport_mode" /> | 52 | <field name="transport_type" /> |
109 | 53 | <field name="imp_transport_mode" /> | 53 | <field name="imp_transport_type" /> |
110 | 54 | <separator colspan="2" string="Original notes" /> | 54 | <separator colspan="2" string="Original notes" /> |
111 | 55 | <separator colspan="2" string="Imported notes" /> | 55 | <separator colspan="2" string="Imported notes" /> |
112 | 56 | <field name="header_notes" colspan="2" nolabel="1" /> | 56 | <field name="header_notes" colspan="2" nolabel="1" /> |
113 | 57 | 57 | ||
114 | === modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py' | |||
115 | --- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2019-05-28 07:30:48 +0000 | |||
116 | +++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2019-07-15 07:19:17 +0000 | |||
117 | @@ -198,7 +198,7 @@ | |||
118 | 198 | relation='res.partner.address', | 198 | relation='res.partner.address', |
119 | 199 | string='Destination Address', | 199 | string='Destination Address', |
120 | 200 | readonly=True), | 200 | readonly=True), |
122 | 201 | 'in_transport_mode': fields.related('order_id', 'transport_type', | 201 | 'in_transport_type': fields.related('order_id', 'transport_type', |
123 | 202 | type='selection', | 202 | type='selection', |
124 | 203 | selection=TRANSPORT_TYPE, | 203 | selection=TRANSPORT_TYPE, |
125 | 204 | string='Transport mode', | 204 | string='Transport mode', |
126 | @@ -238,7 +238,7 @@ | |||
127 | 238 | # Import fiels | 238 | # Import fiels |
128 | 239 | 'imp_supplier_ref': fields.char(size=256, string='Supplier Ref', | 239 | 'imp_supplier_ref': fields.char(size=256, string='Supplier Ref', |
129 | 240 | readonly=True), | 240 | readonly=True), |
131 | 241 | 'imp_transport_mode': fields.selection(selection=TRANSPORT_TYPE, | 241 | 'imp_transport_type': fields.selection(selection=TRANSPORT_TYPE, |
132 | 242 | string='Transport mode', | 242 | string='Transport mode', |
133 | 243 | readonly=True), | 243 | readonly=True), |
134 | 244 | 'imp_ready_to_ship_date': fields.date(string='RTS Date', | 244 | 'imp_ready_to_ship_date': fields.date(string='RTS Date', |
135 | @@ -838,17 +838,17 @@ | |||
136 | 838 | # Nothing to do | 838 | # Nothing to do |
137 | 839 | 839 | ||
138 | 840 | # Line 9: Transport mode | 840 | # Line 9: Transport mode |
145 | 841 | transport_mode = values.get(9, [])[1] | 841 | transport_type = values.get(9, [])[1] |
146 | 842 | if transport_mode: | 842 | if transport_type: |
147 | 843 | transport_select = self.fields_get(cr, uid, ['imp_transport_mode'], context=context) | 843 | transport_select = self.fields_get(cr, uid, ['imp_transport_type'], context=context) |
148 | 844 | for x in transport_select['imp_transport_mode']['selection']: | 844 | for x in transport_select['imp_transport_type']['selection']: |
149 | 845 | if x[1] == transport_mode: | 845 | if x[1] == transport_type: |
150 | 846 | header_values['imp_transport_mode'] = x[0] | 846 | header_values['imp_transport_type'] = x[0] |
151 | 847 | break | 847 | break |
152 | 848 | else: | 848 | else: |
154 | 849 | possible_mode = ', '.join(x[1] for x in transport_select['imp_transport_mode']['selection'] if x[1]) | 849 | possible_type = ', '.join(x[1] for x in transport_select['imp_transport_type']['selection'] if x[1]) |
155 | 850 | err_msg = _('Line 9 of the file: The transport mode \'%s\' is not \ | 850 | err_msg = _('Line 9 of the file: The transport mode \'%s\' is not \ |
157 | 851 | a valid transport mode. Valid transport modes: %s') % (transport_mode, possible_mode) | 851 | a valid transport mode. Valid transport modes: %s') % (transport_type, possible_type) |
158 | 852 | values_header_errors.append(err_msg) | 852 | values_header_errors.append(err_msg) |
159 | 853 | 853 | ||
160 | 854 | 854 | ||
161 | 855 | 855 | ||
162 | === modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml' | |||
163 | --- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml 2019-03-29 17:02:16 +0000 | |||
164 | +++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml 2019-07-15 07:19:17 +0000 | |||
165 | @@ -45,8 +45,8 @@ | |||
166 | 45 | <field name="in_supplier_ref" /> | 45 | <field name="in_supplier_ref" /> |
167 | 46 | <field name="imp_supplier_ref" nolabel="1" /> | 46 | <field name="imp_supplier_ref" nolabel="1" /> |
168 | 47 | <label> </label> | 47 | <label> </label> |
171 | 48 | <field name="in_transport_mode" /> | 48 | <field name="in_transport_type" /> |
172 | 49 | <field name="imp_transport_mode" nolabel="1" /> | 49 | <field name="imp_transport_type" nolabel="1" /> |
173 | 50 | <label> </label> | 50 | <label> </label> |
174 | 51 | <field name="in_ready_to_ship_date" /> | 51 | <field name="in_ready_to_ship_date" /> |
175 | 52 | <field name="imp_ready_to_ship_date" nolabel="1" /> | 52 | <field name="imp_ready_to_ship_date" nolabel="1" /> |
176 | 53 | 53 | ||
177 | === modified file 'bin/addons/msf_order_date/__init__.py' | |||
178 | --- bin/addons/msf_order_date/__init__.py 2011-12-09 09:45:44 +0000 | |||
179 | +++ bin/addons/msf_order_date/__init__.py 2019-07-15 07:19:17 +0000 | |||
180 | @@ -19,7 +19,7 @@ | |||
181 | 19 | # | 19 | # |
182 | 20 | ############################################################################## | 20 | ############################################################################## |
183 | 21 | 21 | ||
185 | 22 | TRANSPORT_TYPE = [('',''), ('sea', 'Sea'), ('air', 'Air'), ('road', 'Road'),] #[('flight', 'By Flight'), ('road', 'By Road'), ('boat', 'By Boat')] | 22 | TRANSPORT_TYPE = [('',''), ('express','Express'), ('hand','Hand carry'), ('sea', 'Sea'), ('air', 'Air'), ('road', 'Road'),] #[('flight', 'By Flight'), ('road', 'By Road'), ('boat', 'By Boat')] |
186 | 23 | ZONE_SELECTION = [('national','National'),('international','International')] | 23 | ZONE_SELECTION = [('national','National'),('international','International')] |
187 | 24 | 24 | ||
188 | 25 | import order_dates | 25 | import order_dates |
189 | 26 | 26 | ||
190 | === modified file 'bin/addons/msf_profile/i18n/allmsf.pot' | |||
191 | --- bin/addons/msf_profile/i18n/allmsf.pot 2017-09-28 14:05:02 +0000 | |||
192 | +++ bin/addons/msf_profile/i18n/allmsf.pot 2019-07-15 07:19:17 +0000 | |||
193 | @@ -4535,12 +4535,6 @@ | |||
194 | 4535 | msgid "OpenERP Tweets" | 4535 | msgid "OpenERP Tweets" |
195 | 4536 | msgstr "" | 4536 | msgstr "" |
196 | 4537 | 4537 | ||
197 | 4538 | #. module: transport_mgmt | ||
198 | 4539 | #: selection:international.transport.cost.report,transport_mode:0 | ||
199 | 4540 | #: selection:purchase.order,transport_mode:0 | ||
200 | 4541 | msgid "Air regular" | ||
201 | 4542 | msgstr "" | ||
202 | 4543 | |||
203 | 4544 | #. module: analytic_distribution | 4538 | #. module: analytic_distribution |
204 | 4545 | #: field:mass.reallocation.verification.wizard,nb_error:0 | 4539 | #: field:mass.reallocation.verification.wizard,nb_error:0 |
205 | 4546 | msgid "Lines in error" | 4540 | msgid "Lines in error" |
206 | @@ -23335,12 +23329,6 @@ | |||
207 | 23335 | msgid "Module Upgrade" | 23329 | msgid "Module Upgrade" |
208 | 23336 | msgstr "" | 23330 | msgstr "" |
209 | 23337 | 23331 | ||
210 | 23338 | #. module: transport_mgmt | ||
211 | 23339 | #: selection:international.transport.cost.report,transport_mode:0 | ||
212 | 23340 | #: selection:purchase.order,transport_mode:0 | ||
213 | 23341 | msgid "Air express" | ||
214 | 23342 | msgstr "" | ||
215 | 23343 | |||
216 | 23344 | #. module: msf_outgoing | 23332 | #. module: msf_outgoing |
217 | 23345 | #: model:ir.actions.report.xml,name:msf_outgoing.report_cargo_manifest | 23333 | #: model:ir.actions.report.xml,name:msf_outgoing.report_cargo_manifest |
218 | 23346 | msgid "Cargo Manifest" | 23334 | msgid "Cargo Manifest" |
219 | @@ -24784,9 +24772,7 @@ | |||
220 | 24784 | msgstr "" | 24772 | msgstr "" |
221 | 24785 | 24773 | ||
222 | 24786 | #. module: transport_mgmt | 24774 | #. module: transport_mgmt |
223 | 24787 | #: field:international.transport.cost.report,transport_mode:0 | ||
224 | 24788 | #: field:local.transport.cost.report,transport_mode:0 | 24775 | #: field:local.transport.cost.report,transport_mode:0 |
225 | 24789 | #: field:purchase.order,transport_mode:0 | ||
226 | 24790 | msgid "Transport mode" | 24776 | msgid "Transport mode" |
227 | 24791 | msgstr "" | 24777 | msgstr "" |
228 | 24792 | 24778 | ||
229 | @@ -29573,8 +29559,6 @@ | |||
230 | 29573 | #: selection:res.partner,transport_0:0 | 29559 | #: selection:res.partner,transport_0:0 |
231 | 29574 | #: selection:res.partner,transport_1:0 | 29560 | #: selection:res.partner,transport_1:0 |
232 | 29575 | #: selection:res.partner,transport_2:0 | 29561 | #: selection:res.partner,transport_2:0 |
233 | 29576 | #: selection:international.transport.cost.report,transport_mode:0 | ||
234 | 29577 | #: selection:purchase.order,transport_mode:0 | ||
235 | 29578 | msgid "Sea" | 29562 | msgid "Sea" |
236 | 29579 | msgstr "" | 29563 | msgstr "" |
237 | 29580 | 29564 | ||
238 | @@ -32211,12 +32195,6 @@ | |||
239 | 32211 | "A group_by specification must be a list of valid fields." | 32195 | "A group_by specification must be a list of valid fields." |
240 | 32212 | msgstr "" | 32196 | msgstr "" |
241 | 32213 | 32197 | ||
242 | 32214 | #. module: transport_mgmt | ||
243 | 32215 | #: selection:international.transport.cost.report,transport_mode:0 | ||
244 | 32216 | #: selection:purchase.order,transport_mode:0 | ||
245 | 32217 | msgid "Air FFC" | ||
246 | 32218 | msgstr "" | ||
247 | 32219 | |||
248 | 32220 | #. module: msf_outgoing | 32198 | #. module: msf_outgoing |
249 | 32221 | #: field:stock.picking,previous_step_id:0 | 32199 | #: field:stock.picking,previous_step_id:0 |
250 | 32222 | msgid "Previous step" | 32200 | msgid "Previous step" |
251 | @@ -40793,8 +40771,6 @@ | |||
252 | 40793 | #: selection:res.partner,transport_0:0 | 40771 | #: selection:res.partner,transport_0:0 |
253 | 40794 | #: selection:res.partner,transport_1:0 | 40772 | #: selection:res.partner,transport_1:0 |
254 | 40795 | #: selection:res.partner,transport_2:0 | 40773 | #: selection:res.partner,transport_2:0 |
255 | 40796 | #: selection:international.transport.cost.report,transport_mode:0 | ||
256 | 40797 | #: selection:purchase.order,transport_mode:0 | ||
257 | 40798 | msgid "Road" | 40774 | msgid "Road" |
258 | 40799 | msgstr "" | 40775 | msgstr "" |
259 | 40800 | 40776 | ||
260 | @@ -41086,12 +41062,6 @@ | |||
261 | 41086 | msgid "Free 2" | 41062 | msgid "Free 2" |
262 | 41087 | msgstr "" | 41063 | msgstr "" |
263 | 41088 | 41064 | ||
264 | 41089 | #. module: transport_mgmt | ||
265 | 41090 | #: selection:international.transport.cost.report,transport_mode:0 | ||
266 | 41091 | #: selection:purchase.order,transport_mode:0 | ||
267 | 41092 | msgid "Hand carry" | ||
268 | 41093 | msgstr "" | ||
269 | 41094 | |||
270 | 41095 | #. modules: delivery_mechanism, purchase, stock_override, product_asset, specific_rules, stock | 41065 | #. modules: delivery_mechanism, purchase, stock_override, product_asset, specific_rules, stock |
271 | 41096 | #: model:ir.model,name:delivery_mechanism.model_stock_partial_picking | 41066 | #: model:ir.model,name:delivery_mechanism.model_stock_partial_picking |
272 | 41097 | #: model:ir.model,name:product_asset.model_stock_partial_picking | 41067 | #: model:ir.model,name:product_asset.model_stock_partial_picking |
273 | 41098 | 41068 | ||
274 | === modified file 'bin/addons/msf_profile/i18n/es_MF.po' | |||
275 | --- bin/addons/msf_profile/i18n/es_MF.po 2019-04-08 15:13:52 +0000 | |||
276 | +++ bin/addons/msf_profile/i18n/es_MF.po 2019-07-15 07:19:17 +0000 | |||
277 | @@ -13969,9 +13969,7 @@ | |||
278 | 13969 | msgstr "Códigos de impuestos" | 13969 | msgstr "Códigos de impuestos" |
279 | 13970 | 13970 | ||
280 | 13971 | #. module: transport_mgmt | 13971 | #. module: transport_mgmt |
281 | 13972 | #: field:international.transport.cost.report,transport_mode:0 | ||
282 | 13973 | #: field:local.transport.cost.report,transport_mode:0 | 13972 | #: field:local.transport.cost.report,transport_mode:0 |
283 | 13974 | #: field:purchase.order,transport_mode:0 | ||
284 | 13975 | msgid "Transport mode" | 13973 | msgid "Transport mode" |
285 | 13976 | msgstr "Modo de transporte" | 13974 | msgstr "Modo de transporte" |
286 | 13977 | 13975 | ||
287 | @@ -15780,12 +15778,6 @@ | |||
288 | 15780 | msgid "You try to assign a lot which is not from the same product" | 15778 | msgid "You try to assign a lot which is not from the same product" |
289 | 15781 | msgstr "Está intentando asignar un lote que no es del mismo producto" | 15779 | msgstr "Está intentando asignar un lote que no es del mismo producto" |
290 | 15782 | 15780 | ||
291 | 15783 | #. module: transport_mgmt | ||
292 | 15784 | #: selection:international.transport.cost.report,transport_mode:0 | ||
293 | 15785 | #: selection:purchase.order,transport_mode:0 | ||
294 | 15786 | msgid "Air regular" | ||
295 | 15787 | msgstr "Aéreo regular" | ||
296 | 15788 | |||
297 | 15789 | #. module: account_voucher | 15781 | #. module: account_voucher |
298 | 15790 | #: view:account.voucher:0 | 15782 | #: view:account.voucher:0 |
299 | 15791 | msgid "Supplier Voucher" | 15783 | msgid "Supplier Voucher" |
300 | @@ -29552,12 +29544,6 @@ | |||
301 | 29552 | msgid "New Jersey" | 29544 | msgid "New Jersey" |
302 | 29553 | msgstr "Nueva Jersey" | 29545 | msgstr "Nueva Jersey" |
303 | 29554 | 29546 | ||
304 | 29555 | #. module: transport_mgmt | ||
305 | 29556 | #: selection:international.transport.cost.report,transport_mode:0 | ||
306 | 29557 | #: selection:purchase.order,transport_mode:0 | ||
307 | 29558 | msgid "Air express" | ||
308 | 29559 | msgstr "Air express" | ||
309 | 29560 | |||
310 | 29561 | #. module: product_attributes | 29547 | #. module: product_attributes |
311 | 29562 | #: code:addons/product_attributes/product_attributes.py:446 | 29548 | #: code:addons/product_attributes/product_attributes.py:446 |
312 | 29563 | #, python-format | 29549 | #, python-format |
313 | @@ -36530,12 +36516,6 @@ | |||
314 | 36530 | msgid "Owner" | 36516 | msgid "Owner" |
315 | 36531 | msgstr "Propietario" | 36517 | msgstr "Propietario" |
316 | 36532 | 36518 | ||
317 | 36533 | #. module: transport_mgmt | ||
318 | 36534 | #: selection:international.transport.cost.report,transport_mode:0 | ||
319 | 36535 | #: selection:purchase.order,transport_mode:0 | ||
320 | 36536 | msgid "Air FFC" | ||
321 | 36537 | msgstr "Aire FFC" | ||
322 | 36538 | |||
323 | 36539 | #. module: resource | 36519 | #. module: resource |
324 | 36540 | #: field:resource.calendar.attendance,hour_from:0 | 36520 | #: field:resource.calendar.attendance,hour_from:0 |
325 | 36541 | msgid "Work from" | 36521 | msgid "Work from" |
326 | @@ -41573,8 +41553,6 @@ | |||
327 | 41573 | #: selection:res.partner,transport_0:0 | 41553 | #: selection:res.partner,transport_0:0 |
328 | 41574 | #: selection:res.partner,transport_1:0 | 41554 | #: selection:res.partner,transport_1:0 |
329 | 41575 | #: selection:res.partner,transport_2:0 | 41555 | #: selection:res.partner,transport_2:0 |
330 | 41576 | #: selection:international.transport.cost.report,transport_mode:0 | ||
331 | 41577 | #: selection:purchase.order,transport_mode:0 | ||
332 | 41578 | msgid "Sea" | 41556 | msgid "Sea" |
333 | 41579 | msgstr "Mar" | 41557 | msgstr "Mar" |
334 | 41580 | 41558 | ||
335 | @@ -46484,12 +46462,6 @@ | |||
336 | 46484 | msgid "Nomenclature level" | 46462 | msgid "Nomenclature level" |
337 | 46485 | msgstr "Nivel de nomenclatura" | 46463 | msgstr "Nivel de nomenclatura" |
338 | 46486 | 46464 | ||
339 | 46487 | #. module: transport_mgmt | ||
340 | 46488 | #: selection:international.transport.cost.report,transport_mode:0 | ||
341 | 46489 | #: selection:purchase.order,transport_mode:0 | ||
342 | 46490 | msgid "Hand carry" | ||
343 | 46491 | msgstr "Transportado en mano" | ||
344 | 46492 | |||
345 | 46493 | #. module: account | 46465 | #. module: account |
346 | 46494 | #: model:process.transition,note:account.process_transition_invoiceimport0 | 46466 | #: model:process.transition,note:account.process_transition_invoiceimport0 |
347 | 46495 | msgid "Import of the statement in the system from a supplier or customer invoice" | 46467 | msgid "Import of the statement in the system from a supplier or customer invoice" |
348 | @@ -49784,8 +49756,6 @@ | |||
349 | 49784 | #: selection:res.partner,transport_0:0 | 49756 | #: selection:res.partner,transport_0:0 |
350 | 49785 | #: selection:res.partner,transport_1:0 | 49757 | #: selection:res.partner,transport_1:0 |
351 | 49786 | #: selection:res.partner,transport_2:0 | 49758 | #: selection:res.partner,transport_2:0 |
352 | 49787 | #: selection:international.transport.cost.report,transport_mode:0 | ||
353 | 49788 | #: selection:purchase.order,transport_mode:0 | ||
354 | 49789 | msgid "Road" | 49759 | msgid "Road" |
355 | 49790 | msgstr "Tierra" | 49760 | msgstr "Tierra" |
356 | 49791 | 49761 | ||
357 | 49792 | 49762 | ||
358 | === modified file 'bin/addons/msf_profile/i18n/fr_MF.po' | |||
359 | --- bin/addons/msf_profile/i18n/fr_MF.po 2019-06-20 14:24:33 +0000 | |||
360 | +++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-15 07:19:17 +0000 | |||
361 | @@ -39297,9 +39297,6 @@ | |||
362 | 39297 | 39297 | ||
363 | 39298 | #. modules: msf_order_date, purchase, msf_outgoing, partner_modification, transport_mgmt, msf_doc_import | 39298 | #. modules: msf_order_date, purchase, msf_outgoing, partner_modification, transport_mgmt, msf_doc_import |
364 | 39299 | #: selection:purchase.import.xml.line,transport_type:0 | 39299 | #: selection:purchase.import.xml.line,transport_type:0 |
365 | 39300 | #: selection:wizard.import.in.simulation.screen,transport_mode:0 | ||
366 | 39301 | #: selection:wizard.import.po.simulation.screen,imp_transport_mode:0 | ||
367 | 39302 | #: selection:wizard.import.po.simulation.screen,in_transport_mode:0 | ||
368 | 39303 | #: selection:sale.order,transport_type:0 | 39300 | #: selection:sale.order,transport_type:0 |
369 | 39304 | #: selection:return.pack.shipment.processor,transport_type:0 | 39301 | #: selection:return.pack.shipment.processor,transport_type:0 |
370 | 39305 | #: selection:return.shipment.processor,transport_type:0 | 39302 | #: selection:return.shipment.processor,transport_type:0 |
371 | @@ -39309,8 +39306,6 @@ | |||
372 | 39309 | #: selection:res.partner,transport_1:0 | 39306 | #: selection:res.partner,transport_1:0 |
373 | 39310 | #: selection:res.partner,transport_2:0 | 39307 | #: selection:res.partner,transport_2:0 |
374 | 39311 | #: selection:purchase.order,transport_type:0 | 39308 | #: selection:purchase.order,transport_type:0 |
375 | 39312 | #: selection:international.transport.cost.report,transport_mode:0 | ||
376 | 39313 | #: selection:purchase.order,transport_mode:0 | ||
377 | 39314 | msgid "Sea" | 39309 | msgid "Sea" |
378 | 39315 | msgstr "Mer" | 39310 | msgstr "Mer" |
379 | 39316 | 39311 | ||
380 | @@ -49883,9 +49878,6 @@ | |||
381 | 49883 | 49878 | ||
382 | 49884 | #. modules: msf_order_date, msf_doc_import, msf_outgoing, partner_modification, purchase | 49879 | #. modules: msf_order_date, msf_doc_import, msf_outgoing, partner_modification, purchase |
383 | 49885 | #: selection:purchase.import.xml.line,transport_type:0 | 49880 | #: selection:purchase.import.xml.line,transport_type:0 |
384 | 49886 | #: selection:wizard.import.in.simulation.screen,transport_mode:0 | ||
385 | 49887 | #: selection:wizard.import.po.simulation.screen,imp_transport_mode:0 | ||
386 | 49888 | #: selection:wizard.import.po.simulation.screen,in_transport_mode:0 | ||
387 | 49889 | #: selection:sale.order,transport_type:0 | 49881 | #: selection:sale.order,transport_type:0 |
388 | 49890 | #: selection:return.pack.shipment.processor,transport_type:0 | 49882 | #: selection:return.pack.shipment.processor,transport_type:0 |
389 | 49891 | #: selection:return.shipment.processor,transport_type:0 | 49883 | #: selection:return.shipment.processor,transport_type:0 |
390 | @@ -53896,12 +53888,6 @@ | |||
391 | 53896 | msgid "Problem in configuration `Record Id` in Server Action!" | 53888 | msgid "Problem in configuration `Record Id` in Server Action!" |
392 | 53897 | msgstr "Problème dans la configuration `Record Id` sous Action Server!" | 53889 | msgstr "Problème dans la configuration `Record Id` sous Action Server!" |
393 | 53898 | 53890 | ||
394 | 53899 | #. module: transport_mgmt | ||
395 | 53900 | #: selection:international.transport.cost.report,transport_mode:0 | ||
396 | 53901 | #: selection:purchase.order,transport_mode:0 | ||
397 | 53902 | msgid "Air regular" | ||
398 | 53903 | msgstr "Air - régulier " | ||
399 | 53904 | |||
400 | 53905 | #. module: account | 53891 | #. module: account |
401 | 53906 | #: field:account.move.line.reconcile,credit:0 | 53892 | #: field:account.move.line.reconcile,credit:0 |
402 | 53907 | msgid "Credit amount" | 53893 | msgid "Credit amount" |
403 | @@ -76232,12 +76218,6 @@ | |||
404 | 76232 | msgid "Price List Version" | 76218 | msgid "Price List Version" |
405 | 76233 | msgstr "Prix - Version de Liste" | 76219 | msgstr "Prix - Version de Liste" |
406 | 76234 | 76220 | ||
407 | 76235 | #. module: transport_mgmt | ||
408 | 76236 | #: selection:international.transport.cost.report,transport_mode:0 | ||
409 | 76237 | #: selection:purchase.order,transport_mode:0 | ||
410 | 76238 | msgid "Hand carry" | ||
411 | 76239 | msgstr "Transport en bagage à main" | ||
412 | 76240 | |||
413 | 76241 | #. module: account_corrections | 76221 | #. module: account_corrections |
414 | 76242 | #: view:wizard.journal.items.corrections:0 | 76222 | #: view:wizard.journal.items.corrections:0 |
415 | 76243 | #: view:analytic.distribution.wizard:0 | 76223 | #: view:analytic.distribution.wizard:0 |
416 | @@ -77421,16 +77401,16 @@ | |||
417 | 77421 | #. modules: msf_doc_import, transport_mgmt, msf_supply_doc_export | 77401 | #. modules: msf_doc_import, transport_mgmt, msf_supply_doc_export |
418 | 77422 | #: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:139 | 77402 | #: report:addons/msf_doc_import/report/in_simulation_screen_xls_report.mako:139 |
419 | 77423 | #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:60 | 77403 | #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:60 |
420 | 77424 | #: field:wizard.import.in.simulation.screen,imp_transport_mode:0 | ||
421 | 77425 | #: field:wizard.import.in.simulation.screen,transport_mode:0 | ||
422 | 77426 | #: field:wizard.import.po.simulation.screen,imp_transport_mode:0 | ||
423 | 77427 | #: field:wizard.import.po.simulation.screen,in_transport_mode:0 | ||
424 | 77428 | #: field:international.transport.cost.report,transport_mode:0 | ||
425 | 77429 | #: field:local.transport.cost.report,transport_mode:0 | 77404 | #: field:local.transport.cost.report,transport_mode:0 |
426 | 77430 | #: field:purchase.order,transport_mode:0 | ||
427 | 77431 | #: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:124 | 77405 | #: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:124 |
428 | 77432 | #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:118 | 77406 | #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:118 |
429 | 77433 | #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:136 | 77407 | #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:136 |
430 | 77408 | #: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:73 | ||
431 | 77409 | #: field:wizard.import.in.simulation.screen,imp_transport_type:0 | ||
432 | 77410 | #: field:wizard.import.in.simulation.screen,transport_type:0 | ||
433 | 77411 | #: field:wizard.import.po.simulation.screen,imp_transport_type:0 | ||
434 | 77412 | #: field:wizard.import.po.simulation.screen,in_transport_type:0 | ||
435 | 77413 | #: field:international.transport.cost.report,transport_type:0 | ||
436 | 77434 | #, python-format | 77414 | #, python-format |
437 | 77435 | msgid "Transport mode" | 77415 | msgid "Transport mode" |
438 | 77436 | msgstr "Mode de transport" | 77416 | msgstr "Mode de transport" |
439 | @@ -81745,12 +81725,6 @@ | |||
440 | 81745 | msgid "Validated by" | 81725 | msgid "Validated by" |
441 | 81746 | msgstr "Validé par" | 81726 | msgstr "Validé par" |
442 | 81747 | 81727 | ||
443 | 81748 | #. module: transport_mgmt | ||
444 | 81749 | #: selection:international.transport.cost.report,transport_mode:0 | ||
445 | 81750 | #: selection:purchase.order,transport_mode:0 | ||
446 | 81751 | msgid "Air FFC" | ||
447 | 81752 | msgstr "Air - FFC" | ||
448 | 81753 | |||
449 | 81754 | #. modules: base_setup, unifield_setup | 81728 | #. modules: base_setup, unifield_setup |
450 | 81755 | #: selection:base.setup.company,state_id:0 | 81729 | #: selection:base.setup.company,state_id:0 |
451 | 81756 | #: selection:base.setup.company,bill_state_id:0 | 81730 | #: selection:base.setup.company,bill_state_id:0 |
452 | @@ -83482,12 +83456,6 @@ | |||
453 | 83482 | #: selection:res.partner,transport_1:0 | 83456 | #: selection:res.partner,transport_1:0 |
454 | 83483 | #: selection:res.partner,transport_2:0 | 83457 | #: selection:res.partner,transport_2:0 |
455 | 83484 | #: selection:purchase.order,transport_type:0 | 83458 | #: selection:purchase.order,transport_type:0 |
456 | 83485 | #: selection:international.transport.cost.report,transport_mode:0 | ||
457 | 83486 | #: selection:purchase.order,transport_mode:0 | ||
458 | 83487 | #: selection:purchase.import.xml.line,transport_type:0 | ||
459 | 83488 | #: selection:wizard.import.in.simulation.screen,transport_mode:0 | ||
460 | 83489 | #: selection:wizard.import.po.simulation.screen,imp_transport_mode:0 | ||
461 | 83490 | #: selection:wizard.import.po.simulation.screen,in_transport_mode:0 | ||
462 | 83491 | #: selection:return.pack.shipment.processor,transport_type:0 | 83459 | #: selection:return.pack.shipment.processor,transport_type:0 |
463 | 83492 | #: selection:return.shipment.processor,transport_type:0 | 83460 | #: selection:return.shipment.processor,transport_type:0 |
464 | 83493 | #: selection:shipment,transport_type:0 | 83461 | #: selection:shipment,transport_type:0 |
465 | @@ -85934,12 +85902,6 @@ | |||
466 | 85934 | msgid "Load" | 85902 | msgid "Load" |
467 | 85935 | msgstr "Charger" | 85903 | msgstr "Charger" |
468 | 85936 | 85904 | ||
469 | 85937 | #. module: transport_mgmt | ||
470 | 85938 | #: selection:international.transport.cost.report,transport_mode:0 | ||
471 | 85939 | #: selection:purchase.order,transport_mode:0 | ||
472 | 85940 | msgid "Air express" | ||
473 | 85941 | msgstr "Air - express" | ||
474 | 85942 | |||
475 | 85943 | #. module: hr | 85905 | #. module: hr |
476 | 85944 | #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single | 85906 | #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single |
477 | 85945 | msgid "Single" | 85907 | msgid "Single" |
478 | @@ -106827,3 +106789,21 @@ | |||
479 | 106827 | msgid "Stop report" | 106789 | msgid "Stop report" |
480 | 106828 | msgstr "Arrêter le rapport" | 106790 | msgstr "Arrêter le rapport" |
481 | 106829 | 106791 | ||
482 | 106792 | #. module: purchase | ||
483 | 106793 | #: view:purchase.order:0 | ||
484 | 106794 | msgid "Estimated transport costs : " | ||
485 | 106795 | msgstr "Estimation des coûts du transport : " | ||
486 | 106796 | |||
487 | 106797 | #. modules: msf_order_date, purchase, msf_outgoing, partner_modification, transport_mgmt, msf_doc_import | ||
488 | 106798 | #: selection:sale.order,transport_type:0 | ||
489 | 106799 | #: selection:return.pack.shipment.processor,transport_type:0 | ||
490 | 106800 | #: selection:return.shipment.processor,transport_type:0 | ||
491 | 106801 | #: selection:shipment,transport_type:0 | ||
492 | 106802 | #: selection:shipment.processor,transport_type:0 | ||
493 | 106803 | #: selection:res.partner,transport_0:0 | ||
494 | 106804 | #: selection:res.partner,transport_1:0 | ||
495 | 106805 | #: selection:res.partner,transport_2:0 | ||
496 | 106806 | #: selection:purchase.order,transport_type:0 | ||
497 | 106807 | #: selection:international.transport.cost.report,transport_type:0 | ||
498 | 106808 | msgid "Hand carry" | ||
499 | 106809 | msgstr "Transport en bagage à main" | ||
500 | 106830 | 106810 | ||
501 | === modified file 'bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv' | |||
502 | --- bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv 2019-03-27 11:23:15 +0000 | |||
503 | +++ bin/addons/msf_profile/user_rights/msf_field_access_rights.field_access_rule_line.csv 2019-07-15 07:19:17 +0000 | |||
504 | @@ -82,7 +82,6 @@ | |||
505 | 82 | PO Coordo,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/82 | 82 | PO Coordo,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/82 |
506 | 83 | PO Coordo,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/83 | 83 | PO Coordo,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/83 |
507 | 84 | PO Coordo,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/84 | 84 | PO Coordo,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/84 |
508 | 85 | PO Coordo,transport_mgmt.field_purchase_order_transport_mode,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/85 | ||
509 | 86 | PO Coordo,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/86 | 85 | PO Coordo,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/86 |
510 | 87 | PO Coordo,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/87 | 86 | PO Coordo,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/87 |
511 | 88 | PO Coordo,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/88 | 87 | PO Coordo,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/88 |
512 | @@ -173,7 +172,6 @@ | |||
513 | 173 | PO Project,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/174 | 172 | PO Project,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/174 |
514 | 174 | PO Project,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/175 | 173 | PO Project,transport_mgmt.field_purchase_order_transport_cost,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/175 |
515 | 175 | PO Project,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/176 | 174 | PO Project,transport_mgmt.field_purchase_order_transport_currency_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/176 |
516 | 176 | PO Project,transport_mgmt.field_purchase_order_transport_mode,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/177 | ||
517 | 177 | PO Project,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/178 | 175 | PO Project,transport_mgmt.field_purchase_order_transport_order_id,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/178 |
518 | 178 | PO Project,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/179 | 176 | PO Project,msf_order_date.field_sale_order_transport_type,TRUE,FALSE,FALSE,msf_profile/field_access_rule_line/179 |
519 | 179 | PO Project,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/180 | 177 | PO Project,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/180 |
520 | @@ -264,7 +262,6 @@ | |||
521 | 264 | PO HQ,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/266 | 262 | PO HQ,transport_mgmt.field_purchase_order_total_price_include_transport,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/266 |
522 | 265 | PO HQ,transport_mgmt.field_purchase_order_transport_cost,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/267 | 263 | PO HQ,transport_mgmt.field_purchase_order_transport_cost,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/267 |
523 | 266 | PO HQ,transport_mgmt.field_purchase_order_transport_currency_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/268 | 264 | PO HQ,transport_mgmt.field_purchase_order_transport_currency_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/268 |
524 | 267 | PO HQ,transport_mgmt.field_purchase_order_transport_mode,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/269 | ||
525 | 268 | PO HQ,transport_mgmt.field_purchase_order_transport_order_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/270 | 265 | PO HQ,transport_mgmt.field_purchase_order_transport_order_id,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/270 |
526 | 269 | PO HQ,msf_order_date.field_sale_order_transport_type,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/271 | 266 | PO HQ,msf_order_date.field_sale_order_transport_type,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/271 |
527 | 270 | PO HQ,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/272 | 267 | PO HQ,purchase.field_purchase_order_unallocation_ok,FALSE,FALSE,FALSE,msf_profile/field_access_rule_line/272 |
528 | 271 | 268 | ||
529 | === modified file 'bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako' | |||
530 | --- bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako 2018-11-28 09:12:03 +0000 | |||
531 | +++ bin/addons/msf_supply_doc_export/report/report_incoming_shipment_xml.mako 2019-07-15 07:19:17 +0000 | |||
532 | @@ -8,7 +8,7 @@ | |||
533 | 8 | <field name="partner_id" key="name"> | 8 | <field name="partner_id" key="name"> |
534 | 9 | <field name="name">${o.partner_id and o.partner_id.name or ''}</field> | 9 | <field name="name">${o.partner_id and o.partner_id.name or ''}</field> |
535 | 10 | </field> | 10 | </field> |
537 | 11 | <field name="transport_mode">${(o.purchase_id and getSel(o.purchase_id, 'transport_type') or '')|x}</field> | 11 | <field name="transport_type">${(o.purchase_id and getSel(o.purchase_id, 'transport_type') or '')|x}</field> |
538 | 12 | <field name="note">${o.note or ''}</field> | 12 | <field name="note">${o.note or ''}</field> |
539 | 13 | <field name="message_esc"></field> | 13 | <field name="message_esc"></field> |
540 | 14 | <field name="move_lines"> | 14 | <field name="move_lines"> |
541 | 15 | 15 | ||
542 | === modified file 'bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py' | |||
543 | --- bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py 2019-02-25 14:54:54 +0000 | |||
544 | +++ bin/addons/msf_supply_doc_export/wizard/wizard_pick_import.py 2019-07-15 07:19:17 +0000 | |||
545 | @@ -39,7 +39,7 @@ | |||
546 | 39 | 7: 'packing_date', | 39 | 7: 'packing_date', |
547 | 40 | 8: 'total_items', | 40 | 8: 'total_items', |
548 | 41 | 9: 'content', | 41 | 9: 'content', |
550 | 42 | 10: 'transport_mode', | 42 | 10: 'transport_type', |
551 | 43 | 11: 'priority', | 43 | 11: 'priority', |
552 | 44 | 12: 'rts_date', | 44 | 12: 'rts_date', |
553 | 45 | } | 45 | } |
554 | 46 | 46 | ||
555 | === modified file 'bin/addons/purchase/purchase_order.py' | |||
556 | --- bin/addons/purchase/purchase_order.py 2019-05-28 14:47:52 +0000 | |||
557 | +++ bin/addons/purchase/purchase_order.py 2019-07-15 07:19:17 +0000 | |||
558 | @@ -1510,7 +1510,7 @@ | |||
559 | 1510 | 'categ', 'priority', 'internal_type', 'arrival_date', | 1510 | 'categ', 'priority', 'internal_type', 'arrival_date', |
560 | 1511 | 'transport_type', 'shipment_date', 'ready_to_ship_date', | 1511 | 'transport_type', 'shipment_date', 'ready_to_ship_date', |
561 | 1512 | 'cross_docking_ok', 'delivery_confirmed_date', | 1512 | 'cross_docking_ok', 'delivery_confirmed_date', |
563 | 1513 | 'est_transport_lead_time', 'transport_mode', 'location_id', | 1513 | 'est_transport_lead_time', 'location_id', |
564 | 1514 | 'dest_address_id', 'incoterm_id'] | 1514 | 'dest_address_id', 'incoterm_id'] |
565 | 1515 | 1515 | ||
566 | 1516 | 1516 | ||
567 | 1517 | 1517 | ||
568 | === modified file 'bin/addons/purchase/purchase_view.xml' | |||
569 | --- bin/addons/purchase/purchase_view.xml 2019-05-27 14:37:03 +0000 | |||
570 | +++ bin/addons/purchase/purchase_view.xml 2019-07-15 07:19:17 +0000 | |||
571 | @@ -162,7 +162,7 @@ | |||
572 | 162 | <field name="partner_ref" invisible="1"/> | 162 | <field name="partner_ref" invisible="1"/> |
573 | 163 | <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'])]}"/> | 163 | <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'])]}"/> |
574 | 164 | <field name="shipped" attrs="{'invisible':[('state', 'in', ('draft', 'draft_p', 'validated', 'validated_p'))]}" readonly="1"/> | 164 | <field name="shipped" attrs="{'invisible':[('state', 'in', ('draft', 'draft_p', 'validated', 'validated_p'))]}" readonly="1"/> |
576 | 165 | <field name="shipped_rate" invisible="True"/> | 165 | <field name="shipped_rate" invisible="True" widget="boolean"/> <!-- Put to boolean for the conditions below --> |
577 | 166 | <field name="push_fo" invisible="1"/> | 166 | <field name="push_fo" invisible="1"/> |
578 | 167 | <field name="is_a_counterpart" invisible="1"/> | 167 | <field name="is_a_counterpart" invisible="1"/> |
579 | 168 | <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')]}"/> | 168 | <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')]}"/> |
580 | @@ -325,7 +325,7 @@ | |||
581 | 325 | <field name="est_transport_lead_time" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/> | 325 | <field name="est_transport_lead_time" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/> |
582 | 326 | <field name="ready_to_ship_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/> | 326 | <field name="ready_to_ship_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/> |
583 | 327 | <field name="shipment_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/> | 327 | <field name="shipment_date" attrs="{'readonly': ['|', ('shipped', '=', True), ('state', 'not in', ['draft', 'draft_p', 'validated'])], 'invisible': [('partner_type', '=', 'external')]}"/> |
585 | 328 | <field name="arrival_date" attrs="{'readonly': ['|', ('shipped_rate', '!=', 0.0), ('state', '=', 'done')], 'invisible': [('internal_type', '!=', 'international')]}"/> | 328 | <field name="arrival_date" attrs="{'readonly': ['|', ('shipped_rate', '=', True), ('state', '=', 'done')], 'invisible': [('internal_type', '!=', 'international')]}"/> |
586 | 329 | </group> | 329 | </group> |
587 | 330 | <group colspan="2" col="2"> | 330 | <group colspan="2" col="2"> |
588 | 331 | <separator string="Delivery" colspan="2"/> | 331 | <separator string="Delivery" colspan="2"/> |
589 | @@ -393,10 +393,10 @@ | |||
590 | 393 | <group colspan="12" col="19" attrs="{'invisible': ['|', ('categ', '=', 'transport'), ('display_intl_transport_ok', '=', False)]}"> | 393 | <group colspan="12" col="19" attrs="{'invisible': ['|', ('categ', '=', 'transport'), ('display_intl_transport_ok', '=', False)]}"> |
591 | 394 | <field name="display_intl_transport_ok" invisible="1"/> | 394 | <field name="display_intl_transport_ok" invisible="1"/> |
592 | 395 | <field name="intl_supplier_ok" invisible="1"/> | 395 | <field name="intl_supplier_ok" invisible="1"/> |
597 | 396 | <field name="transport_mode" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'readonly': [('shipped_rate', '!=', 0.00)]}"/> | 396 | <label align="1.0" string="Estimated transport costs : " colspan="3"/> |
598 | 397 | <label colspan="15"/> | 397 | <field name="transport_cost" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)], 'readonly': [('shipped_rate', '=', True)]}" nolabel="1"/> |
599 | 398 | <field name="transport_cost" attrs="{'invisible': [('display_intl_transport_ok', '=', False)], 'required': [('intl_supplier_ok', '=', True)], 'readonly': [('shipped_rate', '!=', 0.00)]}" nolabel="1"/> | 398 | <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"/> |
600 | 399 | <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"/> | 399 | <label colspan="13"/> |
601 | 400 | <separator colspan="19" attrs="{'invisible': [('display_intl_transport_ok', '=', False)]}"/> | 400 | <separator colspan="19" attrs="{'invisible': [('display_intl_transport_ok', '=', False)]}"/> |
602 | 401 | </group> | 401 | </group> |
603 | 402 | <field name="currency_id" readonly="1"/> | 402 | <field name="currency_id" readonly="1"/> |
604 | 403 | 403 | ||
605 | === modified file 'bin/addons/transport_mgmt/purchase.py' | |||
606 | --- bin/addons/transport_mgmt/purchase.py 2019-02-11 10:13:34 +0000 | |||
607 | +++ bin/addons/transport_mgmt/purchase.py 2019-07-15 07:19:17 +0000 | |||
608 | @@ -101,9 +101,6 @@ | |||
609 | 101 | _columns = { | 101 | _columns = { |
610 | 102 | 'display_intl_transport_ok': fields.boolean(string='Displayed intl transport'), | 102 | 'display_intl_transport_ok': fields.boolean(string='Displayed intl transport'), |
611 | 103 | 'intl_supplier_ok': fields.boolean(string='International Supplier'), | 103 | 'intl_supplier_ok': fields.boolean(string='International Supplier'), |
612 | 104 | 'transport_mode': fields.selection([('regular_air', 'Air regular'), ('express_air', 'Air express'), | ||
613 | 105 | ('ffc_air', 'Air FFC'), ('sea', 'Sea'), | ||
614 | 106 | ('road', 'Road'), ('hand', 'Hand carry'),], string='Transport mode'), | ||
615 | 107 | 'transport_cost': fields.float(string='Transport cost', digits_compute=dp.get_precision('Purchase Price')), | 104 | 'transport_cost': fields.float(string='Transport cost', digits_compute=dp.get_precision('Purchase Price')), |
616 | 108 | 'transport_currency_id': fields.many2one('res.currency', string='Currency'), | 105 | 'transport_currency_id': fields.many2one('res.currency', string='Currency'), |
617 | 109 | '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'), | 106 | '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'), |
618 | 110 | 107 | ||
619 | === modified file 'bin/addons/transport_mgmt/report/intl_transport.py' | |||
620 | --- bin/addons/transport_mgmt/report/intl_transport.py 2015-05-26 14:25:23 +0000 | |||
621 | +++ bin/addons/transport_mgmt/report/intl_transport.py 2019-07-15 07:19:17 +0000 | |||
622 | @@ -23,18 +23,18 @@ | |||
623 | 23 | from osv import fields | 23 | from osv import fields |
624 | 24 | 24 | ||
625 | 25 | import tools | 25 | import tools |
626 | 26 | from msf_order_date import TRANSPORT_TYPE | ||
627 | 27 | |||
628 | 26 | 28 | ||
629 | 27 | class international_transport_cost_report(osv.osv): | 29 | class international_transport_cost_report(osv.osv): |
630 | 28 | _name = 'international.transport.cost.report' | 30 | _name = 'international.transport.cost.report' |
631 | 29 | _rec_name = 'order_id' | 31 | _rec_name = 'order_id' |
632 | 30 | _description = 'International Transport Costs' | 32 | _description = 'International Transport Costs' |
633 | 31 | _auto = False | 33 | _auto = False |
635 | 32 | _order = 'date_order desc, delivery_confirmed_date desc, partner_id, transport_mode' | 34 | _order = 'date_order desc, delivery_confirmed_date desc, partner_id, transport_type' |
636 | 33 | 35 | ||
637 | 34 | _columns = { | 36 | _columns = { |
641 | 35 | 'transport_mode': fields.selection([('regular_air', 'Air regular'), ('express_air', 'Air express'), | 37 | 'transport_type': fields.selection(selection=TRANSPORT_TYPE, string='Transport mode'), |
639 | 36 | ('ffc_air', 'Air FFC'), ('sea', 'Sea'), | ||
640 | 37 | ('road', 'Road'), ('hand', 'Hand carry'),], string='Transport mode'), | ||
642 | 38 | 'func_transport_cost': fields.float(digits=(16,2), string='Func. Transport cost'), | 38 | 'func_transport_cost': fields.float(digits=(16,2), string='Func. Transport cost'), |
643 | 39 | 'func_currency_id': fields.many2one('res.currency', string='Func. Currency'), | 39 | 'func_currency_id': fields.many2one('res.currency', string='Func. Currency'), |
644 | 40 | 'transport_cost': fields.float(digits=(16,2), string='Transport cost'), | 40 | 'transport_cost': fields.float(digits=(16,2), string='Transport cost'), |
645 | @@ -55,7 +55,7 @@ | |||
646 | 55 | min(po.id) as id, | 55 | min(po.id) as id, |
647 | 56 | po.id as order_id, | 56 | po.id as order_id, |
648 | 57 | count(po.id) as nb_order, | 57 | count(po.id) as nb_order, |
650 | 58 | po.transport_mode as transport_mode, | 58 | po.transport_type as transport_type, |
651 | 59 | sum(round((po.transport_cost*(to_rate.rate/fr_rate.rate)/to_cur.rounding))*to_cur.rounding) as func_transport_cost, | 59 | sum(round((po.transport_cost*(to_rate.rate/fr_rate.rate)/to_cur.rounding))*to_cur.rounding) as func_transport_cost, |
652 | 60 | po.transport_cost as transport_cost, | 60 | po.transport_cost as transport_cost, |
653 | 61 | po.transport_currency_id as transport_currency_id, | 61 | po.transport_currency_id as transport_currency_id, |
654 | @@ -93,7 +93,7 @@ | |||
655 | 93 | po.transport_cost > 0.00 | 93 | po.transport_cost > 0.00 |
656 | 94 | GROUP BY | 94 | GROUP BY |
657 | 95 | po.id, | 95 | po.id, |
659 | 96 | po.transport_mode, | 96 | po.transport_type, |
660 | 97 | po.transport_cost, | 97 | po.transport_cost, |
661 | 98 | po.transport_currency_id, | 98 | po.transport_currency_id, |
662 | 99 | po.date_order, | 99 | po.date_order, |
663 | 100 | 100 | ||
664 | === modified file 'bin/addons/transport_mgmt/report/intl_transport_view.xml' | |||
665 | --- bin/addons/transport_mgmt/report/intl_transport_view.xml 2012-01-20 10:38:08 +0000 | |||
666 | +++ bin/addons/transport_mgmt/report/intl_transport_view.xml 2019-07-15 07:19:17 +0000 | |||
667 | @@ -14,7 +14,7 @@ | |||
668 | 14 | <field name="date_order" /> | 14 | <field name="date_order" /> |
669 | 15 | <field name="delivery_confirmed_date" /> | 15 | <field name="delivery_confirmed_date" /> |
670 | 16 | <field name="partner_id" /> | 16 | <field name="partner_id" /> |
672 | 17 | <field name="transport_mode" /> | 17 | <field name="transport_type" /> |
673 | 18 | <field name="func_transport_cost" sum="Transport cost" /> | 18 | <field name="func_transport_cost" sum="Transport cost" /> |
674 | 19 | <field name="func_currency_id" /> | 19 | <field name="func_currency_id" /> |
675 | 20 | <field name="transport_cost" /> | 20 | <field name="transport_cost" /> |
676 | @@ -33,7 +33,7 @@ | |||
677 | 33 | <filter icon="terp-check" name="approved" string="Confirmed" domain="[('order_state','=','approved')]" separator="1" /> | 33 | <filter icon="terp-check" name="approved" string="Confirmed" domain="[('order_state','=','approved')]" separator="1" /> |
678 | 34 | <filter icon="gtk-yes" name="done" string="Closed" domain="[('order_state','=','done')]" separator="1" /> | 34 | <filter icon="gtk-yes" name="done" string="Closed" domain="[('order_state','=','done')]" separator="1" /> |
679 | 35 | <separator orientation="vertical" /> | 35 | <separator orientation="vertical" /> |
681 | 36 | <field name="transport_mode" /> | 36 | <field name="transport_type" /> |
682 | 37 | <field name="transport_cost" /> | 37 | <field name="transport_cost" /> |
683 | 38 | <field name="order_id" /> | 38 | <field name="order_id" /> |
684 | 39 | <field name="date_order" /> | 39 | <field name="date_order" /> |
685 | @@ -42,7 +42,7 @@ | |||
686 | 42 | </group> | 42 | </group> |
687 | 43 | <newline /> | 43 | <newline /> |
688 | 44 | <group expand="1" string="Group By..." colspan="10" col="12"> | 44 | <group expand="1" string="Group By..." colspan="10" col="12"> |
690 | 45 | <filter string="Transport Mode" name="group_transport_mode" icon="terp-accessories-archiver" context="{'group_by': 'transport_mode'}" /> | 45 | <filter string="Transport Mode" name="group_transport_type" icon="terp-accessories-archiver" context="{'group_by': 'transport_type'}" /> |
691 | 46 | <separator orientation="vertical" /> | 46 | <separator orientation="vertical" /> |
692 | 47 | <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/> | 47 | <filter string="Supplier" name="group_partner_id" icon="terp-personal" context="{'group_by':'partner_id'}"/> |
693 | 48 | </group> | 48 | </group> |
694 | @@ -55,7 +55,7 @@ | |||
695 | 55 | <field name="res_model">international.transport.cost.report</field> | 55 | <field name="res_model">international.transport.cost.report</field> |
696 | 56 | <field name="view_type">form</field> | 56 | <field name="view_type">form</field> |
697 | 57 | <field name="view_mode">tree</field> | 57 | <field name="view_mode">tree</field> |
699 | 58 | <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> | 58 | <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> |
700 | 59 | </record> | 59 | </record> |
701 | 60 | 60 | ||
702 | 61 | <menuitem action="action_intl_transport_cost_action" id="menu_intl_transport_cost_report" parent="menu_transport_cost_reports"/> | 61 | <menuitem action="action_intl_transport_cost_action" id="menu_intl_transport_cost_report" parent="menu_transport_cost_reports"/> |