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

Proposed by jftempo
Status: Merged
Merged at revision: 5425
Proposed branch: lp:~dorian-kemps/unifield-server/US-5753
Merge into: lp:unifield-server
Diff against target: 839 lines (+2/-412)
9 files modified
bin/addons/msf_profile/i18n/allmsf.pot (+1/-53)
bin/addons/msf_profile/i18n/en_MF.po (+0/-6)
bin/addons/msf_profile/i18n/es_MF.po (+1/-48)
bin/addons/msf_profile/i18n/fr_MF.po (+0/-47)
bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv (+0/-2)
bin/addons/procurement_request/__openerp__.py (+0/-1)
bin/addons/procurement_request/wizard/__init__.py (+0/-1)
bin/addons/procurement_request/wizard/wizard_import_list.py (+0/-204)
bin/addons/procurement_request/wizard/wizard_import_list_view.xml (+0/-50)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5753
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+368554@code.launchpad.net
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_profile/i18n/allmsf.pot'
2--- bin/addons/msf_profile/i18n/allmsf.pot 2017-09-28 14:05:02 +0000
3+++ bin/addons/msf_profile/i18n/allmsf.pot 2019-07-24 09:08:00 +0000
4@@ -5154,7 +5154,6 @@
5 #: field:wizard.export.rac,message:0
6 #: field:wizard.import.fmc,message:0
7 #: field:wizard.import.rac,message:0
8-#: field:procurement.request.import,message:0
9 #: view:product.list.export:0
10 #: field:product.list.export,message:0
11 #: view:product.list.import:0
12@@ -5338,7 +5337,6 @@
13 #: wizard_button:server.action.create,init,end:0
14 #: wizard_button:server.action.create,step_1,end:0
15 #: view:documents.done.wizard:0
16-#: view:procurement.request.import:0
17 #: view:product.price_list:0
18 #: view:sale.open.invoice:0
19 #: view:sale.order.followup:0
20@@ -6806,7 +6804,6 @@
21 #: view:procurement.orderpoint.compute:0
22 #: view:procurement.supply.compute.all:0
23 #: view:procurement.cycle.compute.all:0
24-#: view:procurement.request.import:0
25 #: view:sale.order:0
26 #: view:product.list.add.products:0
27 #: view:product.list.import:0
28@@ -8649,12 +8646,6 @@
29 msgid "Purchase Lead Time"
30 msgstr ""
31
32-#. module: procurement_request
33-#: code:addons/procurement_request/wizard/wizard_import_list.py:83
34-#, python-format
35-msgid "Please save the Internal Request before importing lines"
36-msgstr ""
37-
38 #. module: financing_contract
39 #: code:addons/financing_contract/analytic.py:58
40 #, python-format
41@@ -10681,8 +10672,6 @@
42 #: code:addons/msf_order_date/order_dates.py:219
43 #: code:addons/msf_order_date/order_dates.py:339
44 #: code:addons/order_types/stock.py:178
45-#: code:addons/procurement_request/wizard/wizard_import_list.py:83
46-#: code:addons/procurement_request/wizard/wizard_import_list.py:90
47 #: code:addons/purchase/purchase.py:711
48 #: code:addons/purchase/purchase.py:758
49 #: code:addons/purchase/wizard/purchase_order_group.py:47
50@@ -18491,12 +18480,6 @@
51 msgid "You can't re-post a hard posted entry !"
52 msgstr ""
53
54-#. module: procurement_request
55-#: code:addons/procurement_request/wizard/wizard_import_list.py:88
56-#, python-format
57-msgid "You cannot import lines in a Sale Order"
58-msgstr ""
59-
60 #. module: procurement
61 #: view:procurement.order:0
62 msgid "Late"
63@@ -20763,7 +20746,6 @@
64 #: field:ir.model,info:0
65 #: view:wizard.import.fmc:0
66 #: view:wizard.import.rac:0
67-#: view:procurement.request.import:0
68 #: view:product.product:0
69 #: view:product.template:0
70 #: view:product.product:0
71@@ -22565,12 +22547,6 @@
72 msgid "Purchase Lines"
73 msgstr ""
74
75-#. module: procurement_request
76-#: model:ir.actions.act_window,name:procurement_request.action_open_wizard_import
77-#: view:procurement.request.import:0
78-msgid "Import lines"
79-msgstr ""
80-
81 #. module: register_accounting
82 #: model:ir.actions.act_window,name:register_accounting.action_register_creation_form
83 #: model:ir.ui.menu,name:register_accounting.menu_register_creation
84@@ -22607,12 +22583,6 @@
85 msgid "Properties of base fields cannot be altered in this manner! Please modify them through Python code, preferably through a custom addon!"
86 msgstr ""
87
88-#. module: procurement_request
89-#: code:addons/procurement_request/wizard/wizard_import_list.py:90
90-#, python-format
91-msgid "You cannot import lines in a confirmed Internal Request"
92-msgstr ""
93-
94 #. module: sale
95 #: help:sale.order,invoice_quantity:0
96 msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
97@@ -31333,11 +31303,6 @@
98 msgid "Latest Inventory Date"
99 msgstr ""
100
101-#. module: procurement_request
102-#: model:ir.model,name:procurement_request.model_procurement_request_import
103-msgid "Import of Internal Request"
104-msgstr ""
105-
106 #. module: msf_outgoing
107 #: selection:stock.picking,flow_type:0
108 msgid "Quick"
109@@ -32380,12 +32345,6 @@
110 msgid "Pending"
111 msgstr ""
112
113-#. module: procurement_request
114-#: code:addons/procurement_request/wizard/wizard_import_list.py:109
115-#, python-format
116-msgid "The system hasn't found a Internal Request to import lines"
117-msgstr ""
118-
119 #. module: product
120 #: help:product.packaging,weight_ul:0
121 msgid "The weight of the empty UL"
122@@ -33908,11 +33867,6 @@
123 msgid "You can not add/modify entries in a closed journal."
124 msgstr ""
125
126-#. module: procurement_request
127-#: view:procurement.request.import:0
128-msgid "Result of importation"
129-msgstr ""
130-
131 #. module: resource
132 #: code:addons/resource/faces/resource.py:340
133 #, python-format
134@@ -34108,7 +34062,6 @@
135 #: field:wizard.import.fmc,file:0
136 #: view:wizard.import.rac:0
137 #: field:wizard.import.rac,file:0
138-#: view:procurement.request.import:0
139 #: field:product.list.export,file:0
140 #: view:product.list.import:0
141 #: field:product.list.import,file_to_import:0
142@@ -34765,7 +34718,6 @@
143 #. modules: product_list, consumption_calculation, procurement_request
144 #: view:wizard.import.fmc:0
145 #: view:wizard.import.rac:0
146-#: view:procurement.request.import:0
147 #: view:product.list.import:0
148 msgid "Import file"
149 msgstr ""
150@@ -35098,8 +35050,7 @@
151 msgid "Quarantine View"
152 msgstr ""
153
154-#. modules: specific_rules, procurement_request
155-#: field:procurement.request.import,info:0
156+#. modules: specific_rules
157 #: code:addons/specific_rules/specific_rules.py:480
158 #: code:addons/specific_rules/specific_rules.py:485
159 #: code:addons/specific_rules/specific_rules.py:1103
160@@ -39205,8 +39156,6 @@
161 #: code:addons/order_nomenclature/wizard/order_nomenclature_select_product.py:100
162 #: code:addons/procurement_cycle/procurement.py:37
163 #: code:addons/procurement_cycle/procurement.py:48
164-#: code:addons/procurement_request/wizard/wizard_import_list.py:88
165-#: code:addons/procurement_request/wizard/wizard_import_list.py:109
166 #: code:addons/product_list/wizard/add_products.py:47
167 #: code:addons/product_list/wizard/list_export.py:47
168 #: code:addons/product_list/wizard/list_export.py:49
169@@ -43649,7 +43598,6 @@
170 #: field:monthly.review.consumption.line,mrc_creation_date:0
171 #: field:product.likely.expire.report.item.line,item_id:0
172 #: field:hr.employee,partner_id:0
173-#: field:procurement.request.import,file:0
174 #: field:purchase.order.line,order_type:0
175 #: field:purchase.order.line,po_state:0
176 #: field:sourcing.line,sale_order_line_state:0
177
178=== modified file 'bin/addons/msf_profile/i18n/en_MF.po'
179--- bin/addons/msf_profile/i18n/en_MF.po 2018-05-28 12:55:30 +0000
180+++ bin/addons/msf_profile/i18n/en_MF.po 2019-07-24 09:08:00 +0000
181@@ -295,12 +295,6 @@
182 msgid "Sales By Month"
183 msgstr "Field Orders By Month"
184
185-#. module: procurement_request
186-#: code:addons/procurement_request/wizard/wizard_import_list.py:88
187-#, python-format
188-msgid "You cannot import lines in a Sale Order"
189-msgstr "You cannot import lines in a Field Order"
190-
191 #. module: msf_outgoing
192 #: field:stock.move,sale_order_line_number:0
193 msgid "Sale Order Line Number"
194
195=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
196--- bin/addons/msf_profile/i18n/es_MF.po 2019-04-08 15:13:52 +0000
197+++ bin/addons/msf_profile/i18n/es_MF.po 2019-07-24 09:08:00 +0000
198@@ -603,7 +603,6 @@
199 #: field:wizard.import.po.line,message:0
200 #: field:wizard.import.tender.line,message:0
201 #: field:hr.payroll.employee.import.errors,msg:0
202-#: field:procurement.request.import,message:0
203 #: view:wizard.down.payment:0
204 #: field:initial.stock.inventory.line,err_msg:0
205 #: view:stock.forecast.export:0
206@@ -6193,7 +6192,6 @@
207 #: field:product.likely.expire.report.item.line,item_id:0
208 #: field:real.average.consumption.line,ref:0
209 #: field:hr.employee,partner_id:0
210-#: field:procurement.request.import,file:0
211 #: field:purchase.order.followup,line_ids:0
212 #: field:sale.order,split_type_sale_order:0
213 #: field:purchase.order.line,order_type:0
214@@ -7475,7 +7473,6 @@
215 #: view:documents.done.wizard:0
216 #: view:composition.kit:0
217 #: view:user.access.results:0
218-#: view:procurement.request.import:0
219 #: view:product.price_list:0
220 #: view:purchase.order.followup:0
221 #: view:purchase.order.change.currency:0
222@@ -12604,7 +12601,6 @@
223 #: view:wizard.import.po:0
224 #: view:wizard.import.po.line:0
225 #: view:wizard.import.tender.line:0
226-#: view:procurement.request.import:0
227 #: view:product.product:0
228 #: view:product.template:0
229 #: view:product.product:0
230@@ -21514,7 +21510,6 @@
231 #: view:stock.cost.reevaluation:0
232 #: view:tender:0
233 #: model:ir.actions.act_window,name:procurement_request.action_open_wizard_import
234-#: view:procurement.request.import:0
235 #: view:catalogue.import.lines:0
236 #: view:supplier.catalogue:0
237 msgid "Import lines"
238@@ -37528,12 +37523,6 @@
239 msgid "Asia/Dushanbe"
240 msgstr "Asia / Dushanbe"
241
242-#. module: procurement_request
243-#: code:addons/procurement_request/wizard/wizard_import_list.py:92
244-#, python-format
245-msgid "You cannot import lines in a Sale Order"
246-msgstr "No puede importar líneas en una orden de venta"
247-
248 #. module: sale
249 #: report:msf.report_reception_in:0
250 msgid "Expected Receipt Date :"
251@@ -37926,12 +37915,6 @@
252 msgid "Payroll entries"
253 msgstr "Asientos de nómina"
254
255-#. module: procurement_request
256-#: code:addons/procurement_request/wizard/wizard_import_list.py:114
257-#, python-format
258-msgid "The system hasn't found a Internal Request to import lines"
259-msgstr "El sistema no ha encontrado una solicitud interna para importar líneas"
260-
261 #. module: purchase_compare_rfq
262 #: view:wizard.choose.supplier:0
263 msgid "Prices"
264@@ -38328,11 +38311,10 @@
265 msgid "Progress"
266 msgstr "Anticipo"
267
268-#. modules: return_claim, procurement_request, account_hq_entries, kit
269+#. modules: return_claim, account_hq_entries, kit
270 #: field:hq.entries.split.lines,state_info:0
271 #: code:addons/kit/wizard/substitute.py:681
272 #: code:addons/kit/wizard/substitute.py:1018
273-#: field:procurement.request.import,info:0
274 #: code:addons/return_claim/return_claim.py:1136
275 #, python-format
276 msgid "Info"
277@@ -39803,11 +39785,6 @@
278 msgid "Let this field empty if this location is shared between all companies"
279 msgstr "Deje este campo vacío si esta ubicación se comparte entre todas las empresas"
280
281-#. module: procurement_request
282-#: view:procurement.request.import:0
283-msgid "Result of importation"
284-msgstr "Resultado de la importación"
285-
286 #. module: sync_remote_warehouse
287 #: field:sync.monitor,usb:0
288 msgid "USB Sync"
289@@ -40418,7 +40395,6 @@
290 #: view:procurement.cycle.compute.all:0
291 #: view:procurement.min.max.compute.all:0
292 #: view:procurement.purchase.compute.all:0
293-#: view:procurement.request.import:0
294 #: view:sale.order:0
295 #: view:product.list.add.products:0
296 #: view:product.to.list:0
297@@ -42772,7 +42748,6 @@
298 #: view:wizard.import.tender.line:0
299 #: field:wizard.import.tender.line,file:0
300 #: field:user.access.configurator,file_to_import_uac:0
301-#: view:procurement.request.import:0
302 #: field:supplier.catalogue,file_to_import:0
303 msgid "File to import"
304 msgstr "Archivo para importar"
305@@ -43350,8 +43325,6 @@
306 #: code:addons/procurement_request/procurement_request.py:327
307 #: code:addons/procurement_request/procurement_request.py:343
308 #: code:addons/procurement_request/procurement_request.py:350
309-#: code:addons/procurement_request/wizard/wizard_import_list.py:92
310-#: code:addons/procurement_request/wizard/wizard_import_list.py:114
311 #: code:addons/product_attributes/product_attributes.py:61
312 #: code:addons/product_attributes/product_attributes.py:85
313 #: code:addons/product_attributes/product_attributes.py:94
314@@ -58255,8 +58228,6 @@
315 #: view:stock.picking.not.available:0
316 #: code:addons/procurement_request/procurement_request.py:353
317 #: code:addons/procurement_request/procurement_request.py:563
318-#: code:addons/procurement_request/wizard/wizard_import_list.py:87
319-#: code:addons/procurement_request/wizard/wizard_import_list.py:94
320 #: code:addons/product_attributes/product_attributes.py:602
321 #: code:addons/product_attributes/product_attributes.py:973
322 #: code:addons/purchase/purchase.py:730
323@@ -59840,12 +59811,6 @@
324 msgid "Proprietary instance"
325 msgstr "Instancia propietaria"
326
327-#. module: procurement_request
328-#: code:addons/procurement_request/wizard/wizard_import_list.py:94
329-#, python-format
330-msgid "You cannot import lines in a confirmed Internal Request"
331-msgstr "No puede importar líneas en una solicitud interna confirmada"
332-
333 #. module: base
334 #: selection:res.config.users,context_tz:0
335 #: selection:res.users,context_tz:0
336@@ -61168,12 +61133,6 @@
337 msgid "Reporting Configuration"
338 msgstr "Configuración de informes"
339
340-#. module: procurement_request
341-#: code:addons/procurement_request/wizard/wizard_import_list.py:87
342-#, python-format
343-msgid "Please save the Internal Request before importing lines"
344-msgstr "Guarde la solicitud interna antes de importar las líneas"
345-
346 #. module: consumption_calculation
347 #: code:addons/consumption_calculation/history_consumption.py:107
348 #, python-format
349@@ -69898,7 +69857,6 @@
350 #: view:wizard.import.po:0
351 #: view:wizard.import.po.line:0
352 #: view:wizard.import.tender.line:0
353-#: view:procurement.request.import:0
354 msgid "Import file"
355 msgstr "Importar archivo"
356
357@@ -71159,11 +71117,6 @@
358 msgid "You cannot have two Field Access Rule Lines for the same Field in the same Rule"
359 msgstr "No puede tener dos líneas de reglas de acceso a campo para el mismo campo en la misma regla"
360
361-#. module: procurement_request
362-#: model:ir.model,name:procurement_request.model_procurement_request_import
363-msgid "Import of Internal Request"
364-msgstr "Importación de solicitud interna"
365-
366 #. module: base
367 #: help:ir.actions.wizard,multi:0
368 msgid "If set to true, the wizard will not be displayed on the right toolbar of a form view."
369
370=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
371--- bin/addons/msf_profile/i18n/fr_MF.po 2019-06-20 14:24:33 +0000
372+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-24 09:08:00 +0000
373@@ -1299,7 +1299,6 @@
374 #: code:addons/msf_tools/automated_export.py:225
375 #: code:addons/msf_tools/automated_import.py:207
376 #: code:addons/msf_tools/automated_import.py:230
377-#: field:procurement.request.import,info:0
378 #: code:addons/register_accounting/account_bank_statement.py:2035
379 #: code:addons/return_claim/return_claim.py:2256
380 #: code:addons/specific_rules/specific_rules.py:784
381@@ -3040,12 +3039,6 @@
382 msgid "Payment term"
383 msgstr "Délai de Paiement"
384
385-#. module: procurement_request
386-#: code:addons/procurement_request/wizard/wizard_import_list.py:94
387-#, python-format
388-msgid "You cannot import lines in a confirmed Internal Request"
389-msgstr "Vous ne pouvez pas importer de lignes dans une Demande Interne confirmée"
390-
391 #. module: base
392 #: selection:res.config.users,context_tz:0
393 #: selection:res.users,context_tz:0
394@@ -21838,12 +21831,6 @@
395 msgid "Search Chart of Account Templates"
396 msgstr "Rechercher des Modèles de Plan Comptable"
397
398-#. module: procurement_request
399-#: code:addons/procurement_request/wizard/wizard_import_list.py:92
400-#, python-format
401-msgid "You cannot import lines in a Sale Order"
402-msgstr "Vous ne pouvez pas importer de lignes dans une Commande Client"
403-
404 #. module: register_accounting
405 #: code:addons/register_accounting/wizard/register_creation.py:194
406 #, python-format
407@@ -22572,7 +22559,6 @@
408 #: view:supplier.catalogue:0
409 #: view:tender:0
410 #: view:threshold.value:0
411-#: view:procurement.request.import:0
412 #: view:purchase.order:0
413 #: view:account.invoice:0
414 #: view:sale.order:0
415@@ -22900,7 +22886,6 @@
416 #: view:wizard.import.tender.line:0
417 #: view:wizard.import.threshold.value.line:0
418 #: view:automated.import.job:0
419-#: view:procurement.request.import:0
420 #: view:wizard.import.ppl.to.create.ship:0
421 #: view:wizard.import.product.line:0
422 msgid "Import file"
423@@ -30648,7 +30633,6 @@
424 #: field:hr.payroll.employee.import.errors,msg:0
425 #: field:hr.payroll.import,msg:0
426 #: field:hr.payroll.validation,message:0
427-#: field:procurement.request.import,message:0
428 #: view:wizard.down.payment:0
429 #: field:wizard.register.import,message:0
430 #: field:initial.stock.inventory.line,err_msg:0
431@@ -31379,11 +31363,6 @@
432 msgid "Year :"
433 msgstr "Année :"
434
435-#. module: procurement_request
436-#: view:procurement.request.import:0
437-msgid "Result of importation"
438-msgstr "Résultat de l'importation"
439-
440 #. module: register_accounting
441 #: field:wizard.register.opening.confirmation,opening_period:0
442 msgid "Opening Period"
443@@ -59220,8 +59199,6 @@
444 #: code:addons/procurement_request/procurement_request.py:497
445 #: code:addons/procurement_request/procurement_request.py:773
446 #: code:addons/procurement_request/procurement_request.py:797
447-#: code:addons/procurement_request/wizard/wizard_import_list.py:87
448-#: code:addons/procurement_request/wizard/wizard_import_list.py:94
449 #: code:addons/product_attributes/product_attributes.py:1145
450 #: code:addons/product_attributes/product_attributes.py:1168
451 #: code:addons/product_attributes/product_attributes.py:1764
452@@ -61257,7 +61234,6 @@
453 #: field:product.likely.expire.report.item.line,item_id:0
454 #: field:real.average.consumption.line,ref:0
455 #: field:hr.employee,partner_id:0
456-#: field:procurement.request.import,file:0
457 #: field:purchase.order.followup,line_ids:0
458 #: field:sale.order,split_type_sale_order:0
459 #: field:purchase.order.line,order_type:0
460@@ -72214,7 +72190,6 @@
461 #: view:documents.done.wizard:0
462 #: view:composition.kit:0
463 #: view:user.access.results:0
464-#: view:procurement.request.import:0
465 #: view:product.price_list:0
466 #: view:purchase.order.followup:0
467 #: view:purchase.order.change.currency:0
468@@ -74305,8 +74280,6 @@
469 #: code:addons/procurement_request/procurement_request.py:472
470 #: code:addons/procurement_request/procurement_request.py:486
471 #: code:addons/procurement_request/procurement_request.py:501
472-#: code:addons/procurement_request/wizard/wizard_import_list.py:92
473-#: code:addons/procurement_request/wizard/wizard_import_list.py:114
474 #: code:addons/product_attributes/product_attributes.py:60
475 #: code:addons/product_attributes/product_attributes.py:86
476 #: code:addons/product_attributes/product_attributes.py:95
477@@ -84627,7 +84600,6 @@
478 #: view:wizard.import.tender.line:0
479 #: view:wizard.import.threshold.value.line:0
480 #: code:addons/msf_outgoing/wizard/picking_processor.py:983
481-#: view:procurement.request.import:0
482 #: view:product.product:0
483 #: view:product.template:0
484 #: view:product.product:0
485@@ -87179,12 +87151,6 @@
486 msgid "Full View"
487 msgstr "Full View"
488
489-#. module: procurement_request
490-#: code:addons/procurement_request/wizard/wizard_import_list.py:87
491-#, python-format
492-msgid "Please save the Internal Request before importing lines"
493-msgstr "Veuillez sauvegarder la Demande Interne avant d'importer des lignes"
494-
495 #. module: product_asset
496 #: view:product.asset.event:0
497 msgid "Event Information"
498@@ -88770,7 +88736,6 @@
499 #: field:wizard.import.threshold.value.line,file:0
500 #: field:user.access.configurator,file_to_import_uac:0
501 #: field:automated.import.job,file_to_import:0
502-#: view:procurement.request.import:0
503 #: field:physical.inventory,file_to_import:0
504 #: field:physical.inventory,file_to_import2:0
505 #: field:supplier.catalogue,file_to_import:0
506@@ -89592,11 +89557,6 @@
507 msgid "To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount."
508 msgstr "Pour imprimer un journal analytique (ou coûts) pour une période donnée. Le rapport donne le code, le nom de la transaction, le numéro de compte, le montant global et le montant analytique."
509
510-#. module: procurement_request
511-#: model:ir.model,name:procurement_request.model_procurement_request_import
512-msgid "Import of Internal Request"
513-msgstr "Importation d'un Demande Interne"
514-
515 #. module: base
516 #: view:res.widget.user:0
517 msgid "User Widgets"
518@@ -90497,12 +90457,6 @@
519 msgid "base.language.export"
520 msgstr "base.language.export"
521
522-#. module: procurement_request
523-#: code:addons/procurement_request/wizard/wizard_import_list.py:114
524-#, python-format
525-msgid "The system hasn't found a Internal Request to import lines"
526-msgstr "Le système n'a pas trouvé de Demande Interne pour importer les lignes"
527-
528 #. module: kit
529 #: code:addons/kit/kit.py:188
530 #, python-format
531@@ -98274,7 +98228,6 @@
532 #: view:procurement.cycle.compute.all:0
533 #: view:procurement.min.max.compute.all:0
534 #: view:procurement.purchase.compute.all:0
535-#: view:procurement.request.import:0
536 #: view:sale.order:0
537 #: view:product.where.used:0
538 #: view:product.list.add.products:0
539
540=== modified file 'bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv'
541--- bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv 2019-03-27 11:23:15 +0000
542+++ bin/addons/msf_profile/user_rights/msf_button_access_rights.button_access_rule.csv 2019-07-24 09:08:00 +0000
543@@ -259,8 +259,6 @@
544 TRUE,,sd.BAR_procurement_requestprocurement_request_form_view_open_split_wizard,"Sup_Demand_Manager,Sup_Supply_System_Administrator"
545 TRUE,,sd.BAR_procurement_requestprocurement_request_form_view_ask_resource_lines,"Sup_Supply_System_Administrator,Sup_Demand_Manager,Sup_Requester,Sup_Request_Validator"
546 TRUE,,sd.BAR_procurement_requestprocurement_request_form_view_validate_ir_lines,"Sup_Supply_System_Administrator,Sup_Demand_Manager,Sup_Request_Validator"
547-TRUE,,sd.BAR_procurement_requestwizard_import_list_init_import_file,"Sup_Demand_Manager,Sup_Supply_System_Administrator"
548-TRUE,,sd.BAR_procurement_requestwizard_import_list_done_close_window,"Sup_Demand_Manager,Sup_Supply_System_Administrator"
549 TRUE,,sd.BAR_specific_rulesview_production_lot_tree_unlink,Administration / Access Rights
550 TRUE,,sd.BAR_specific_rulesstock_initial_inventory_form_view_action_cancel_inventary,"Sup_Warehouse_Manager,Sup_Supply_System_Administrator"
551 TRUE,,sd.BAR_specific_rulesstock_initial_inventory_form_view_action_confirm,Sup_Supply_System_Administrator
552
553=== modified file 'bin/addons/procurement_request/__openerp__.py'
554--- bin/addons/procurement_request/__openerp__.py 2018-10-30 15:38:19 +0000
555+++ bin/addons/procurement_request/__openerp__.py 2019-07-24 09:08:00 +0000
556@@ -46,7 +46,6 @@
557 'procurement_request_wizard.xml',
558 'procurement_request_report.xml',
559 'procurement_request_line_wizard.xml',
560- 'wizard/wizard_import_list_view.xml',
561 'report/internal_request_import_overview_export_view.xml',
562 'wizard/internal_request_import.xml',
563 ],
564
565=== modified file 'bin/addons/procurement_request/wizard/__init__.py'
566--- bin/addons/procurement_request/wizard/__init__.py 2017-10-06 08:29:23 +0000
567+++ bin/addons/procurement_request/wizard/__init__.py 2019-07-24 09:08:00 +0000
568@@ -22,7 +22,6 @@
569
570 import wizard_list_to_order
571 import wizard_list_to_rfq
572-import wizard_import_list
573 import procurement_request_line_wizard
574
575 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
576
577=== removed file 'bin/addons/procurement_request/wizard/wizard_import_list.py'
578--- bin/addons/procurement_request/wizard/wizard_import_list.py 2012-08-28 09:00:55 +0000
579+++ bin/addons/procurement_request/wizard/wizard_import_list.py 1970-01-01 00:00:00 +0000
580@@ -1,204 +0,0 @@
581-#!/usr/bin/env python
582-# -*- encoding: utf-8 -*-
583-##############################################################################
584-#
585-# OpenERP, Open Source Management Solution
586-# Copyright (C) 2011 TeMPO Consulting, MSF
587-#
588-# This program is free software: you can redistribute it and/or modify
589-# it under the terms of the GNU Affero General Public License as
590-# published by the Free Software Foundation, either version 3 of the
591-# License, or (at your option) any later version.
592-#
593-# This program is distributed in the hope that it will be useful,
594-# but WITHOUT ANY WARRANTY; without even the implied warranty of
595-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
596-# GNU Affero General Public License for more details.
597-#
598-# You should have received a copy of the GNU Affero General Public License
599-# along with this program. If not, see <http://www.gnu.org/licenses/>.
600-#
601-##############################################################################
602-
603-from osv import osv
604-from osv import fields
605-
606-from tools.translate import _
607-
608-from tempfile import TemporaryFile
609-
610-import base64
611-import csv
612-
613-
614-
615-class wizard_import_list(osv.osv_memory):
616- _name = 'procurement.request.import'
617- _description = 'Import of Internal Request'
618-
619- _columns = {
620- 'file': fields.binary(strign='File to import', required=True),
621- 'message': fields.text(string='Message', readonly=True),
622- 'info': fields.text(string='Info', readonly=True),
623- }
624-
625- _defaults = {
626- 'info': lambda *a : """
627- The file should be in CSV format (with ';' character as delimiter).
628- The columns should be in this order :
629- * Product Code
630- * Product Description
631- * UoM
632- * Quantity
633- * Comment
634- * From stock ? (Write True if you want that the product will be supply from stock, leave blank if not)
635- """
636- }
637-
638- def close_window(self, cr, uid, ids, context=None):
639- '''
640- Simply close the wizard
641- '''
642- if context is None:
643- context = {}
644- return {'type': 'ir.actions.act_window',
645- 'res_model': 'sale.order',
646- 'view_type': 'form',
647- 'view_mode': 'form,tree',
648- 'res_id': context.get('list_id'),
649- 'target': 'crush'}
650-
651- def default_get(self, cr, uid, fields, context=None):
652- '''
653- Check if the Procurement List is saved and
654- set the error message
655- '''
656- if context is None:
657- context = {}
658- res = super(wizard_import_list, self).default_get(cr, uid, fields, context=context)
659-
660- # If we are after the importation
661- if context.get('step', False) and context.get('step', False) == 'import':
662- res['message'] = context.get('message', '')
663-
664- return res
665- else:
666- if not context.get('active_id', False):
667- raise osv.except_osv(_('Warning'), _('Please save the Internal Request before importing lines'))
668-
669- # We check if the Procurement List is in 'Draft' state
670- list_id = self.pool.get('sale.order').browse(cr, uid, context.get('active_id', []))
671- if not list_id.procurement_request:
672- raise osv.except_osv(_('Error'), _('You cannot import lines in a Sale Order'))
673- elif not list_id or list_id.state != 'draft':
674- raise osv.except_osv(_('Warning'), _('You cannot import lines in a confirmed Internal Request'))
675-
676- return res
677-
678-
679- def import_file(self, cr, uid, ids, context=None):
680- '''
681- Import the file passed on the wizard in the
682- Procurement List
683- '''
684- if context is None:
685- context = {}
686- list_line_obj = self.pool.get('sale.order.line')
687- product_obj = self.pool.get('product.product')
688- uom_obj = self.pool.get('product.uom')
689- model_data_obj = self.pool.get('ir.model.data')
690-
691- list_id = context.get('active_id', False)
692-
693- if not list_id:
694- raise osv.except_osv(_('Error'), _('The system hasn\'t found a Internal Request to import lines'))
695-
696- import_list = self.browse(cr, uid, ids[0], context)
697-
698- fileobj = TemporaryFile('w+')
699- fileobj.write(base64.decodestring(import_list.file))
700-
701- # now we determine the file format
702- fileobj.seek(0)
703-
704- reader = csv.reader(fileobj, quotechar='\'', delimiter=';')
705-
706- error = ''
707-
708- line_num = 0
709-
710- for line in reader:
711- line_num += 1
712- if len(line) < 6:
713- error += 'Line %s is not valid !' % (line_num)
714- error += '\n'
715- continue
716- # Get the product
717- product_ids = product_obj.search(cr, uid, [('default_code', '=', line[0])], context=context)
718- if not product_ids:
719- product_ids = product_obj.search(cr, uid, [('name', '=', line[1])], context=context)
720-
721- if not product_ids:
722- error += 'Product [%s] %s not found !' % (line[0], line[1])
723- error += '\n'
724- continue
725-
726- product_id = product_ids[0]
727-
728- # Get the UoM
729- uom_ids = uom_obj.search(cr, uid, [('name', '=', line[2])])
730- if not uom_ids:
731- error += 'Uom %s not found !' % line[2]
732- error += '\n'
733- continue
734-
735- uom_id = uom_ids[0]
736-
737- # Get the quantity
738- product_qty = float(line[3].replace(',', '.'))
739-
740- # Get the comment
741- comment = line[4]
742-
743- # Get the method
744- from_stock = 'make_to_stock'
745- if line[5] == 'True':
746- from_stock = 'make_to_order'
747-
748-
749- list_line_obj.create(cr, uid, {'product_id': product_id,
750- 'product_uom': uom_id,
751- 'product_uom_qty': product_qty,
752- 'notes': comment,
753- 'type': from_stock,
754- 'procurement_request': True,
755- 'order_id': list_id})
756-
757- view_ids = model_data_obj.search(cr, uid,
758- [('module', '=', 'procurement_request'),
759- ('name', '=', 'wizard_import_list_done')],
760- offset=0, limit=1)[0]
761- view_id = model_data_obj.browse(cr, uid, view_ids).res_id
762-
763- if error and error != '':
764- context['message'] = error
765- else:
766- context['message'] = 'All lines have been succesfully imported !'
767-
768- context['step'] = 'import'
769- context['list_id'] = list_id
770-
771- return {'type': 'ir.actions.act_window',
772- 'res_model': 'procurement.request.import',
773- 'view_type': 'form',
774- 'view_mode': 'form',
775- 'target': 'new',
776- 'view_id': [view_id],
777- 'context': context,
778- }
779-
780-wizard_import_list()
781-
782-
783-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
784-
785
786=== removed file 'bin/addons/procurement_request/wizard/wizard_import_list_view.xml'
787--- bin/addons/procurement_request/wizard/wizard_import_list_view.xml 2017-05-10 12:47:14 +0000
788+++ bin/addons/procurement_request/wizard/wizard_import_list_view.xml 1970-01-01 00:00:00 +0000
789@@ -1,50 +0,0 @@
790-<?xml version="1.0" encoding="utf-8" ?>
791-<openerp>
792- <data>
793-
794-
795- <record id="wizard_import_list_init" model="ir.ui.view">
796- <field name="name">wizard.import.list.init</field>
797- <field name="model">procurement.request.import</field>
798- <field name="type">form</field>
799- <field name="priority">18</field>
800- <field name="arch" type="xml">
801- <form string="Import lines">
802- <separator string="Information" colspan="4" />
803- <field name="info" colspan="4" nolabel="1" />
804- <separator string="File to import" colspan="4" />
805- <field name="file" nolabel="1" colspan="4" />
806- <button special="cancel" string="Cancel" icon="gtk-cancel" />
807- <button name="import_file" string="Import file" type="object" icon="gtk-convert" />
808- </form>
809- </field>
810- </record>
811-
812- <record id="wizard_import_list_done" model="ir.ui.view">
813- <field name="name">wizard.import.list.done</field>
814- <field name="model">procurement.request.import</field>
815- <field name="type">form</field>
816- <field name="priority">17</field>
817- <field name="arch" type="xml">
818- <form string="Result of importation">
819- <separator colspan="4" string="Result of importation" />
820- <field name="message" colspan="4" nolabel="1" />
821- <button name="close_window" string="Close" icon="gtk-close" type="object" />
822- </form>
823- </field>
824- </record>
825-
826- <act_window
827- name="Import lines"
828- res_model="procurement.request.import"
829- src_model="sale.order"
830- view_mode="form"
831- view_type="form"
832- view_id="wizard_import_list_init"
833- target="new"
834- key2="client_action_multi"
835- id="action_open_wizard_import" />
836-
837- </data>
838-</openerp>
839-

Subscribers

People subscribed via source and target branches