Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-11739-11741-11827-11835 into lp:unifield-server

  1. US-11739-11741-11827-11835
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6587
Proposed branch: lp:~dorian-kemps/unifield-server/US-11739-11741-11827-11835
Merge into: lp:unifield-server
Diff against target: 855 lines (+185/-111)
23 files modified
bin/addons/delete_button/view/sale_view.xml (+2/-2)
bin/addons/msf_outgoing/msf_outgoing.py (+19/-4)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+8/-3)
bin/addons/msf_outgoing/report/empty_picking_ticket.rml (+3/-0)
bin/addons/msf_outgoing/report/freight_manifest.rml (+1/-1)
bin/addons/msf_outgoing/report/packing_list.py (+2/-1)
bin/addons/msf_outgoing/report/packing_list.rml (+28/-2)
bin/addons/msf_outgoing/report/picking_ticket.rml (+7/-5)
bin/addons/msf_printed_documents/report/report_reception.rml (+1/-0)
bin/addons/msf_printed_documents/report/sale_order.rml (+2/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+42/-10)
bin/addons/procurement_request/procurement_request_view.xml (+3/-0)
bin/addons/procurement_request/report/procurement_request_report.rml (+8/-8)
bin/addons/reason_types_moves/reason_type_view.xml (+0/-16)
bin/addons/reason_types_moves/stock_view.xml (+2/-0)
bin/addons/service_purchasing/service_purchasing_view.xml (+0/-33)
bin/addons/stock/stock.py (+1/-0)
bin/addons/stock/stock_move.py (+1/-0)
bin/addons/stock/stock_view.xml (+13/-2)
bin/addons/stock_override/report/delivery_order.rml (+20/-0)
bin/addons/stock_override/report/internal_move.rml (+2/-2)
bin/addons/stock_override/stock.py (+15/-8)
bin/addons/stock_override/stock_view.xml (+5/-14)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-11739-11741-11827-11835
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+454243@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/delete_button/view/sale_view.xml'
2--- bin/addons/delete_button/view/sale_view.xml 2018-12-03 11:35:29 +0000
3+++ bin/addons/delete_button/view/sale_view.xml 2023-10-23 07:51:06 +0000
4@@ -51,8 +51,8 @@
5 </data>
6 </field>
7 </record>
8-
9-
10+
11+
12 <record id="procurement_request_tree_view" model="ir.ui.view">
13 <field name="name">procurement.request.tree.view</field>
14 <field name="model">sale.order</field>
15
16=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
17--- bin/addons/msf_outgoing/msf_outgoing.py 2023-08-08 09:24:25 +0000
18+++ bin/addons/msf_outgoing/msf_outgoing.py 2023-10-23 07:51:06 +0000
19@@ -2523,7 +2523,7 @@
20 store={'stock.move': (_get_picking_ids, ['picking_id', 'state', 'product_qty'], 10),
21 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 10)}),
22 'pack_family_memory_ids': fields.one2many('pack.family.memory', 'ppl_id', string='Memory Families'),
23- 'description_ppl': fields.char('Description', size=256),
24+ 'description_ppl': fields.char('Details', size=256),
25 'already_shipped': fields.boolean(string='The shipment is done'), # UF-1617: only for indicating the PPL that the relevant Ship has been closed
26 'has_draft_moves': fields.function(_get_draft_moves, method=True, type='boolean', string='Has draft moves ?', store=False),
27 'has_to_be_resourced': fields.boolean(string='Picking has to be resourced'),
28@@ -3789,6 +3789,7 @@
29 'previous_step_id': picking.id,
30 'backorder_id': False,
31 'move_lines': [],
32+ 'description_ppl': picking.details,
33 }
34 context.update({
35 'keep_prodlot': True,
36@@ -4727,7 +4728,8 @@
37 bool_and(m.not_shipped) as not_shipped,
38 ''::varchar(1) as comment,
39 p.flow_type = 'quick' as quick_flow,
40- p.state as pack_state
41+ p.state as pack_state,
42+ min(m.parcel_comment) as parcel_comment
43 from stock_picking p
44 inner join stock_move m on m.picking_id = p.id and m.state != 'cancel' and m.product_qty > 0
45 left join sale_order so on so.id = p.sale_id
46@@ -4787,6 +4789,7 @@
47 'ppl_id': fields.many2one('stock.picking', string="PPL Ref"),
48 'from_pack': fields.integer(string='From p.'),
49 'to_pack': fields.integer(string='To p.'),
50+ 'parcel_comment': fields.char(string='Parcel Comment', size=256),
51 'pack_type': fields.many2one('pack.type', string='Pack Type'),
52 'length': fields.float(digits=(16, 2), string='Length [cm]'),
53 'width': fields.float(digits=(16, 2), string='Width [cm]'),
54@@ -4812,7 +4815,7 @@
55 'selected_number': fields.integer('Nb. Parcels to Ship'),
56 'total_weight': fields.function(_vals_get, method=True, type='float', string='Total Weight[kg]', multi='get_vals',),
57 'total_volume': fields.function(_vals_get, method=True, type='float', string=u'Total Volume[dm³]', multi='get_vals',),
58- 'description_ppl': fields.char('Description', size=256),
59+ 'description_ppl': fields.char('Details', size=256),
60 'not_shipped': fields.boolean(string='Not shipped'),
61 'comment': fields.char(string='Comment', size=1024),
62 'volume_set': fields.boolean('Volume set at PPL'),
63@@ -4845,12 +4848,24 @@
64 fields.append('selected_number=%(to_ship)s')
65
66 if 'total_weight' in vals:
67+ try:
68+ vals['total_weight'] = float(vals['total_weight'])
69+ except Exception, e:
70+ raise osv.except_osv(_('Error'), _('The Total Weight[kg] must be a number'))
71 sql_data['total_weight'] = vals['total_weight'] or 0
72 fields.append('weight=%%(total_weight)s/(%s-from_pack+1)' % to_pack_field)
73 if 'total_volume' in vals:
74+ try:
75+ vals['total_volume'] = float(vals['total_volume'])
76+ except Exception, e:
77+ raise osv.except_osv(_('Error'), _('The Total Volume[dm³] must be a number'))
78 sql_data['size'] = (vals['total_volume']**(1.0/3))*10. or 0
79 fields += ['length=%%(size)s/(%s-from_pack+1)' % to_pack_field, 'width=%(size)s', 'height=%(size)s']
80
81+ if 'parcel_comment' in vals:
82+ sql_data['parcel_comment'] = vals.get('parcel_comment', '')
83+ fields.append('parcel_comment=%(parcel_comment)s')
84+
85 if fields:
86 cr.execute('''
87 update stock_move
88@@ -4874,7 +4889,7 @@
89 for pack in pack_obj:
90 res_id = pack['draft_packing_id'][0]
91 return {
92- 'name': 'Change description',
93+ 'name': _('Change details'),
94 'view_type': 'form',
95 'view_mode': 'form',
96 'view_id': [res and res[1] or False],
97
98=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
99--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2023-08-08 09:24:25 +0000
100+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2023-10-23 07:51:06 +0000
101@@ -164,6 +164,7 @@
102 <field name="sale_id" invisible="True" />
103 <field name="reason_type_id" />
104 <field name="origin"/>
105+ <field name="details" truncate="15"/>
106 <field name="packing_list"/>
107 <field name="order_category" string="Order\nCategory"/>
108 <field name="incoming_id" />
109@@ -200,6 +201,7 @@
110 <field name="backorder_id" readonly="1" string="Original PICK" />
111 <field name="reason_type_id" widget="selection" readonly="1" />
112 <field name="order_category" />
113+ <field name="details" readonly="1" />
114 </group>
115
116 <group colspan="2" col="2">
117@@ -498,6 +500,7 @@
118 <field name="name"/>
119 <field name="partner_id2" />
120 <field name="origin"/>
121+ <field name="details"/>
122 <field name="packing_list" />
123 <field name="order_category" />
124 <newline />
125@@ -1285,9 +1288,9 @@
126 <field name="type">form</field>
127 <field name="priority">21</field>
128 <field name="arch" type="xml">
129- <form string="Change description shipment line">
130+ <form string="Change details shipment line">
131 <field name="description_ppl"/>
132- <button name="change_description_save" string="Save description" icon="gtk-save" type="object" />
133+ <button name="change_description_save" string="Save details" icon="gtk-save" type="object" />
134 </form>
135 </field>
136 </record>
137@@ -1355,9 +1358,10 @@
138 <field name="ppl_id" readonly="1"/>
139 <field name="packing_list" readonly="1" />
140 <field name="description_ppl" readonly="1" />
141- <button name="change_description" string="Change description" icon="gtk-edit" type="object" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'assigned'])]}" />
142+ <button name="change_description" string="Change details" icon="gtk-edit" type="object" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'assigned'])]}" />
143 <field name="from_pack" readonly="1" />
144 <field name="to_pack" attrs="{'readonly': ['|', '|', '|', ('quick_flow', '=', False), ('fake_state', 'not in', ['draft', 'assigned']), ('from_pack', '!=', 1), ('pack_state', '!=', 'draft')]}" readonly="0"/>
145+ <field name="parcel_comment" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}"/>
146 <field name="num_of_packs" readonly="1" />
147 <field name="selected_number" string="Nb Parcels\nTo Ship" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}" readonly="0" on_change="change_selected_number(selected_number)"/>
148 <field name="pack_type" readonly="1" />
149@@ -1381,6 +1385,7 @@
150 <newline />
151 <field name="from_pack" readonly="1" />
152 <field name="to_pack" attrs="{'readonly': ['|', '|', '|', ('quick_flow', '=', False), ('fake_state', 'not in', ['draft', 'assigned']), ('from_pack', '!=', 1), ('pack_state', '!=', 'draft')]}" />
153+ <field name="parcel_comment" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}"/>
154 <field name="num_of_packs" readonly="1"/>
155 <field name="selected_number" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}" on_change="change_selected_number(selected_number)" />
156 <field name="pack_type" readonly="1" />
157
158=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
159--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2023-07-27 15:06:19 +0000
160+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2023-10-23 07:51:06 +0000
161@@ -198,6 +198,9 @@
162 <tr>
163 <td><para style="HeaderInfosTitle">Transport mode:</para></td><td><para style="HeaderInfosTitle">[[ pt.sale_id and pt.sale_id.transport_type and getSel(pt.sale_id, 'transport_type') or '' ]]</para></td>
164 </tr>
165+ <tr>
166+ <td><para style="HeaderInfosTitle">Details:</para></td><td><para style="HeaderInfosTitle">[[ pt.description_ppl ]]</para></td>
167+ </tr>
168 </blockTable>
169 </td>
170 <td>
171
172=== modified file 'bin/addons/msf_outgoing/report/freight_manifest.rml'
173--- bin/addons/msf_outgoing/report/freight_manifest.rml 2020-11-30 15:46:46 +0000
174+++ bin/addons/msf_outgoing/report/freight_manifest.rml 2023-10-23 07:51:06 +0000
175@@ -496,7 +496,7 @@
176 <para style="TextInformation5" alignment="CENTER">Packing list</para>
177 </td>
178 <td>
179- <para style="TextInformation5" alignment="CENTER">Description</para>
180+ <para style="TextInformation5" alignment="CENTER">Details</para>
181 </td>
182 <td>
183 <para style="TextInformation5" alignment="CENTER">Parcels</para>
184
185=== modified file 'bin/addons/msf_outgoing/report/packing_list.py'
186--- bin/addons/msf_outgoing/report/packing_list.py 2018-07-17 13:18:35 +0000
187+++ bin/addons/msf_outgoing/report/packing_list.py 2023-10-23 07:51:06 +0000
188@@ -66,6 +66,7 @@
189 'total_volume': 0.00,
190 'total_weight': 0.00,
191 'nb_parcel': 0,
192+ 'pf_description_ppl': pf.description_ppl
193 })
194 if not pf.not_shipped:
195 res[pf.ppl_id.name]['pf'].append(pf)
196@@ -79,7 +80,7 @@
197 for key in sort_keys:
198 result.append(res.get(key))
199
200- filtered_result = [] # remove empty PPL
201+ filtered_result = [] # remove empty PPL
202 for data in result:
203 if data.get('pf'):
204 filtered_result.append(data)
205
206=== modified file 'bin/addons/msf_outgoing/report/packing_list.rml'
207--- bin/addons/msf_outgoing/report/packing_list.rml 2023-07-28 09:33:52 +0000
208+++ bin/addons/msf_outgoing/report/packing_list.rml 2023-10-23 07:51:06 +0000
209@@ -177,6 +177,14 @@
210 <para style="HeaderInfosValue">[[ getSel(objects[0], 'transport_type') ]]</para>
211 </td>
212 </tr>
213+ <tr>
214+ <td>
215+ <para style="HeaderInfosTitle">Details:</para>
216+ </td>
217+ <td>
218+ <para style="HeaderInfosValue">[[ p['pf_description_ppl'] or '' ]]</para>
219+ </td>
220+ </tr>
221 </blockTable>
222 </td>
223 <td>
224@@ -246,7 +254,7 @@
225 <para style="ParcelInfosRight" alignment="CENTER">Containing</para>
226 </td>
227 <td>
228- <para style="ParcelInfos">Description</para>
229+ <para style="ParcelInfos">Parcel Comment</para>
230 </td>
231 </tr>
232 </blockTable>
233@@ -292,7 +300,7 @@
234 <para style="ParcelLineTitle">MSL</para>
235 </td>
236 <td>
237- <para style="ParcelLineTitle">[[ pf.description_ppl or ' ' ]]</para>
238+ <para style="ParcelLineTitle">[[ pf.parcel_comment or ' ' ]]</para>
239 </td>
240 </tr>
241 <tr>
242@@ -351,6 +359,24 @@
243 <font color="white"> </font>
244 </para>
245
246+ <blockTable rowHeights="10.0" colWidths="10.0,45.0,755.0,10.0" style="HeaderInfos">
247+ <tr>
248+ <td></td>
249+ <td>
250+ <para style="HeaderInfosTitle">Notes :</para>
251+ </td>
252+ <td>
253+ <para style="HeaderInfosValue">[[ p['ppl'].note ]] total</para>
254+ </td>
255+ <td></td>
256+ </tr>
257+ </blockTable>
258+
259+ <!-- Empty line -->
260+ <para style="HeaderInfosTitle">
261+ <font color="white"> </font>
262+ </para>
263+
264 <blockTable rowHeights="10.0" colWidths="250.0,170.0,170.0,230.0" style="Totals">
265 <tr>
266 <td></td>
267
268=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
269--- bin/addons/msf_outgoing/report/picking_ticket.rml 2023-08-08 09:24:25 +0000
270+++ bin/addons/msf_outgoing/report/picking_ticket.rml 2023-10-23 07:51:06 +0000
271@@ -4,7 +4,7 @@
272 <!-- Templating -->
273 <template pageSize="(842.0,595.0)" title="Packing-List" author="Unifield,MSF" allowSplitting="20">
274 <pageTemplate id="first">
275- <frame id="first" x1="0.0" y1="0.0" width="842" height="520" />
276+ <frame id="first" x1="0.0" y1="0.0" width="842" height="505" />
277
278 <pageGraphics>
279 <setFont name="Helvetica-Bold" size="13.0"/>
280@@ -12,11 +12,13 @@
281 <fill color="blue"/>
282 <drawString x="20.0" y="541.0">[[ objects[0].name ]]</drawString>
283 <image x="705.0" y="525.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
284+ <setFont name="Helvetica" size="9" />
285+ <fill color="black" />
286+ <drawString x="20.0" y="525.0">Details : [[ objects[0].details ]]</drawString>
287 <setFont name="Helvetica" size="8" />
288- <fill color="black" />
289- <drawString x="20.0" y="525.0">Page : <pageNumber /> / </drawString>
290- <drawString x="62.0" y="525.0"><pageCount /></drawString>
291- <drawString x="20.0" y="510.0">Date [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</drawString>
292+ <drawString x="20.0" y="510.0">Page : <pageNumber /> / </drawString>
293+ <drawString x="62.0" y="510.0"><pageCount /></drawString>
294+ <drawString x="20.0" y="495.0">Date [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</drawString>
295 </pageGraphics>
296 </pageTemplate>
297
298
299=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
300--- bin/addons/msf_printed_documents/report/report_reception.rml 2023-08-08 09:24:25 +0000
301+++ bin/addons/msf_printed_documents/report/report_reception.rml 2023-10-23 07:51:06 +0000
302@@ -302,6 +302,7 @@
303 </para>
304
305 <blockTable colWidths="800.0" >
306+ <tr><td><para style="Standard">Details : [[ objects[0].details ]]</para></td></tr>
307 <tr><td><para style="Standard">Expected Receipt Date : [[ getERD(objects[0]) ]]</para></td></tr>
308 <tr><td><para style="Standard">Actual Receipt Date : [[ getActualReceiptDate(objects[0]) ]]</para></td></tr>
309 </blockTable>
310
311=== modified file 'bin/addons/msf_printed_documents/report/sale_order.rml'
312--- bin/addons/msf_printed_documents/report/sale_order.rml 2023-08-08 09:24:25 +0000
313+++ bin/addons/msf_printed_documents/report/sale_order.rml 2023-10-23 07:51:06 +0000
314@@ -8,6 +8,8 @@
315 <pageGraphics>
316 <drawString x="35" y="560.0">FIELD ORDER [[ '%s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
317 <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
318+ <setFont name="Helvetica" size="9"/>
319+ <drawString x="35" y="520.0">Details : [[ objects[0].details ]]</drawString>
320 <setFont name="Helvetica" size="8"/>
321 <fill color="black"/>
322 <drawString x="730" y="520.0">Page : <pageNumber /></drawString>
323
324=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
325--- bin/addons/msf_profile/i18n/fr_MF.po 2023-08-16 09:21:58 +0000
326+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-10-23 07:51:06 +0000
327@@ -5882,10 +5882,8 @@
328 #: field:hr.payroll.msf,name:0
329 #: report:empty.picking.ticket:0
330 #: report:invoice:0
331-#: field:pack.family.memory,description_ppl:0
332 #: report:packing.list:0
333 #: report:picking.ticket:0
334-#: field:stock.picking,description_ppl:0
335 #: report:po.follow.up_rml:0
336 #: report:addons/msf_tools/report/report_inconsistencies_xls.mako:81
337 #: field:process.transition,note:0
338@@ -8007,8 +8005,8 @@
339
340 #. module: msf_outgoing
341 #: view:stock.picking:0
342-msgid "Save description"
343-msgstr "Sauvegarder la description"
344+msgid "Save details"
345+msgstr "Sauvegarder les détails"
346
347 #. module: procurement
348 #: view:stock.warehouse.orderpoint:0
349@@ -41360,6 +41358,7 @@
350 #: report:purchase.order.merged:0
351 #: report:msf.sale.order:0
352 #: report:po.follow.up_rml:0
353+#: report:packing.list:0
354 msgid "Notes :"
355 msgstr "Notes :"
356
357@@ -44632,8 +44631,8 @@
358 #: view:shipment:0
359 #: code:addons/msf_outgoing/msf_outgoing.py:5347
360 #, python-format
361-msgid "Change description"
362-msgstr "Changer la description"
363+msgid "Change details"
364+msgstr "Changer les détails"
365
366 #. module: account
367 #: view:report.account.sales:0
368@@ -70067,8 +70066,8 @@
369
370 #. module: msf_outgoing
371 #: view:stock.picking:0
372-msgid "Change description shipment line"
373-msgstr "Changer la description de la ligne d'expédition"
374+msgid "Change details shipment line"
375+msgstr "Changer les détails de la ligne d'expédition"
376
377 #. module: msf_tools
378 #: code:addons/msf_tools/automated_import.py:163
379@@ -90631,7 +90630,7 @@
380 msgid "%sDestination %s is not active at this date: %s"
381 msgstr "%sLa Destination %s n'est pas active à cette date: %s"
382
383-#. modules: purchase, tender_flow, purchase_allocation_report, sale, procurement, msf_supply_doc_export, msf_doc_import, purchase_compare_rfq, stock, consumption_calculation
384+#. modules: purchase, tender_flow, purchase_allocation_report, sale, procurement, msf_supply_doc_export, msf_doc_import, purchase_compare_rfq, stock, consumption_calculation, msf_outgoing
385 #: view:wizard.import.in.simulation.screen:0
386 #: view:wizard.import.po:0
387 #: view:wizard.import.po.simulation.screen:0
388@@ -90649,9 +90648,19 @@
389 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:549
390 #: field:tender,details:0
391 #: field:real.average.consumption,details:0
392+#: field:stock.picking,details:0
393+#: report:freight_manifest:0
394+#: field:pack.family.memory,description_ppl:0
395+#: field:stock.picking,description_ppl:0
396 msgid "Details"
397 msgstr "Détails"
398
399+#. module: msf_outgoing
400+#: report:empty.picking.ticket:0
401+#: report:packing.list:0
402+msgid "Details:"
403+msgstr "Détails:"
404+
405 #. module: account_hq_entries
406 #: model:ir.model,name:account_hq_entries.model_hq_reallocation
407 msgid "HQ reallocation wizard"
408@@ -92332,8 +92341,13 @@
409 msgid "You have to enter the quantities you want to process before processing the move."
410 msgstr "Vous devez saisir les quantités avant de traiter le mouvement"
411
412-#. module: sale
413+#. module: msf_outgoing, sale, stock_override, procurement_request
414 #: report:msf.report_reception_in:0
415+#: report:picking.ticket:0
416+#: report:procurement.request.report:0
417+#: report:msf.sale.order:0
418+#: report:delivery.order:0
419+#: report:internal.move:0
420 msgid "Details :"
421 msgstr "Détails :"
422
423@@ -121450,3 +121464,21 @@
424 msgid "In-Pipe Quantity included"
425 msgstr "Quantité en attente incluse"
426
427+#. modules: msf_outgoing, stock
428+#: field:pack.family.memory,parcel_comment:0
429+#: report:packing.list:0
430+#: field:stock.move,parcel_comment:0
431+msgid "Parcel Comment"
432+msgstr "Commentaire de Colis"
433+
434+#. module: msf_outgoing
435+#: code:addons/msf_outgoing/msf_outgoing.py:4853
436+#, python-format
437+msgid "The Total Weight[kg] must be a number"
438+msgstr "Le Poids Total[kg] doit être un nombre"
439+
440+#. module: msf_outgoing
441+#: code:addons/msf_outgoing/msf_outgoing.py:4860
442+#, python-format
443+msgid "The Total Volume[dm³] must be a number"
444+msgstr "Le Volume Total[dm³] doit être un nombre"
445
446=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
447--- bin/addons/procurement_request/procurement_request_view.xml 2023-07-24 13:26:27 +0000
448+++ bin/addons/procurement_request/procurement_request_view.xml 2023-10-23 07:51:06 +0000
449@@ -52,6 +52,7 @@
450 <button colspan="1" name="update_date" string="Apply to lines" type="object" context="{'field_name': 'stock_take', 'type': 'sale.order'}" icon="gtk-indent"
451 attrs="{'invisible': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
452 </group>
453+ <field name="details" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
454 <field name="fo_to_resource" invisible="1" />
455 <field name="parent_order_name" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
456 </group>
457@@ -175,6 +176,7 @@
458 <field name="origin" />
459 <field name="requestor" />
460 <field name="location_requestor_id" />
461+ <field name="details" truncate="15"/>
462 <field name="ir_total_amount" string="Indicative Total Value"/>
463 <field name="functional_currency_id" />
464 <field name="line_count"/>
465@@ -202,6 +204,7 @@
466 <field name="origin" />
467 <field name="requestor" />
468 <field name="location_requestor_id" />
469+ <field name="details" />
470 <field name="product_id" />
471 <newline />
472 <group string="Group By...">
473
474=== modified file 'bin/addons/procurement_request/report/procurement_request_report.rml'
475--- bin/addons/procurement_request/report/procurement_request_report.rml 2023-08-08 09:24:25 +0000
476+++ bin/addons/procurement_request/report/procurement_request_report.rml 2023-10-23 07:51:06 +0000
477@@ -138,19 +138,25 @@
478 <para style="Header">[[ req.origin ]]</para>
479 </td>
480 <td>
481+ <para style="HeaderRight">Details :</para>
482+ </td>
483+ <td>
484+ <para style="Header">[[ req.details ]]</para>
485+ </td>
486+ <td>
487 <para style="HeaderRight">Functional Currency :</para>
488 </td>
489 <td>
490 <para style="Header">[[ req.functional_currency_id and get_name('res.currency', req.functional_currency_id.id) or '' ]]</para>
491 </td>
492+ </tr>
493+ <tr>
494 <td>
495 <para style="HeaderRight">Warehouse :</para>
496 </td>
497 <td>
498 <para style="Header">[[ req.warehouse_id and get_name('stock.warehouse', req.warehouse_id.id) or '' ]]</para>
499 </td>
500- </tr>
501- <tr>
502 <td>
503 <para style="HeaderRight">Order category :</para>
504 </td>
505@@ -163,12 +169,6 @@
506 <td>
507 <para style="Header"></para>
508 </td>
509- <td>
510- <para style="HeaderRight"></para>
511- </td>
512- <td>
513- <para style="Header"></para>
514- </td>
515 </tr>
516 </blockTable>
517
518
519=== modified file 'bin/addons/reason_types_moves/reason_type_view.xml'
520--- bin/addons/reason_types_moves/reason_type_view.xml 2022-06-13 15:38:44 +0000
521+++ bin/addons/reason_types_moves/reason_type_view.xml 2023-10-23 07:51:06 +0000
522@@ -118,9 +118,6 @@
523 <field name="inherit_id" ref="stock.vpicktree" />
524 <field name="arch" type="xml">
525 <data>
526- <xpath expr="/tree/field[@name='origin']" position="after">
527- <field name="reason_type_id" />
528- </xpath>
529 <xpath expr="/tree/field[@name='stock_journal_id']" position="replace" />
530 <xpath expr="/tree/field[@name='invoice_state']" position="replace" />
531 </data>
532@@ -139,9 +136,6 @@
533 <xpath expr="/tree//field[@name='origin']" position="before">
534 <field name="backorder_id" />
535 </xpath>
536- <xpath expr="/tree/field[@name='origin']" position="after">
537- <field name="reason_type_id" />
538- </xpath>
539 <xpath expr="/tree//field[@name='invoice_state']" position="replace" />
540 <xpath expr="/tree//field[@name='stock_journal_id']" position="replace" />
541 </data>
542@@ -239,16 +233,6 @@
543 <field name="inherit_id" ref="stock.view_picking_internal_search" />
544 <field name="arch" type="xml">
545 <data>
546- <xpath expr="/search/group/field[@name='origin']" position="after">
547- <field name="reason_type_id" widget="selection" />
548- </xpath>
549- <xpath expr="/search//field[@name='stock_journal_id']" position="replace">
550- <field name="date" />
551- </xpath>
552- <xpath expr="/search//field[@name='company_id']" position="replace">
553- <field name="min_date" string="Expected Move Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'import'])]}"
554- on_change="change_min_date()" required="1"/>
555- </xpath>
556 <xpath expr="/search/group[@string='Group By...']/filter[@string='Journal']" position="replace">
557 <filter string="Reason type" icon="terp-purchase" domain="[]" context="{'group_by': 'reason_type_id'}" />
558 </xpath>
559
560=== modified file 'bin/addons/reason_types_moves/stock_view.xml'
561--- bin/addons/reason_types_moves/stock_view.xml 2022-06-13 15:38:44 +0000
562+++ bin/addons/reason_types_moves/stock_view.xml 2023-10-23 07:51:06 +0000
563@@ -152,6 +152,7 @@
564 <field name="origin"/>
565 <field name="customers" />
566 <field name="order_category" />
567+ <field name="details" />
568 <field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
569 <newline />
570 <field name="date" string="Creation date" />
571@@ -190,6 +191,7 @@
572 <field name="customer_ref" />
573 <field name="customers" />
574 <field name="order_category" />
575+ <field name="details" truncate="15" />
576 <field name="shipment_ref" />
577 <field name="reason_type_id" domain="[('incoming_ok', '=', True)]" />
578 <field name="date" string="Creation Date" />
579
580=== modified file 'bin/addons/service_purchasing/service_purchasing_view.xml'
581--- bin/addons/service_purchasing/service_purchasing_view.xml 2023-02-08 13:27:53 +0000
582+++ bin/addons/service_purchasing/service_purchasing_view.xml 2023-10-23 07:51:06 +0000
583@@ -17,21 +17,6 @@
584 </record>
585
586 <!-- OUT -->
587- <record id="view_picking_out_tree" model="ir.ui.view">
588- <field name="name">stock.picking.out.tree</field>
589- <field name="model">stock.picking</field>
590- <field name="type">tree</field>
591- <field name="priority">25</field>
592- <field name="inherit_id" ref="stock.view_picking_out_tree" />
593- <field name="arch" type="xml">
594- <data>
595- <xpath expr="//field[@name='origin']" position="after">
596- <field name="order_category" />
597- </xpath>
598- </data>
599- </field>
600- </record>
601-
602 <record id="view_picking_out_search" model="ir.ui.view">
603 <field name="name">stock.picking.out.search</field>
604 <field name="model">stock.picking</field>
605@@ -40,9 +25,6 @@
606 <field name="inherit_id" ref="stock.view_picking_out_search" />
607 <field name="arch" type="xml">
608 <data>
609- <field name="origin" position="after">
610- <field name="order_category" />
611- </field>
612 <filter string="Partner" position="after">
613 <separator orientation="vertical" />
614 <filter string="Order Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'order_category'}" />
615@@ -59,21 +41,6 @@
616
617 <!-- id: view_picking_form, name: stock.picking.form, inherit_id:stock.view_picking_form was here -->
618
619- <record id="view_picking_internal_search" model="ir.ui.view">
620- <field name="name">stock.picking.internal.search</field>
621- <field name="model">stock.picking</field>
622- <field name="type">search</field>
623- <field name="priority">20</field>
624- <field name="inherit_id" ref="stock.view_picking_internal_search" />
625- <field name="arch" type="xml">
626- <data>
627- <field name="origin" position="after">
628- <field name="order_category" />
629- </field>
630- </data>
631- </field>
632- </record>
633-
634 <record id="view_stock_picking_filter" model="ir.ui.view">
635 <field name="name">stock.picking.list.select</field>
636 <field name="model">stock.picking</field>
637
638=== modified file 'bin/addons/stock/stock.py'
639--- bin/addons/stock/stock.py 2023-08-08 09:24:25 +0000
640+++ bin/addons/stock/stock.py 2023-10-23 07:51:06 +0000
641@@ -1116,6 +1116,7 @@
642 'total_qty_process_str': fields.function(_get_total_qty_str, method=1, string='Qties to Process', type='char', multi='total_qty'),
643 'product_id': fields.function(_get_fake, method=True, type='many2one', relation='product.product', string='Product', help='Product to find in the lines', store=False, readonly=True),
644 'alert_msl_mml': fields.function(_get_alert_msl_mml, method=True, type='char', string="Contains non-conform MML/MSL"),
645+ 'details': fields.char(size=86, string='Details', readonly=True),
646 }
647
648 _defaults = {
649
650=== modified file 'bin/addons/stock/stock_move.py'
651--- bin/addons/stock/stock_move.py 2023-08-02 12:18:23 +0000
652+++ bin/addons/stock/stock_move.py 2023-10-23 07:51:06 +0000
653@@ -583,6 +583,7 @@
654 # msf_outgoing
655 'from_pack': fields.integer(string='From p.'),
656 'to_pack': fields.integer(string='To p.'),
657+ 'parcel_comment': fields.char(string='Parcel Comment', size=256),
658 'ppl_returned_ok': fields.boolean(string='Has been returned ?', readonly=True, internal=True),
659 'integrity_error': fields.selection(INTEGRITY_STATUS_SELECTION, 'Error', readonly=True),
660 'pack_type': fields.many2one('pack.type', string='Pack Type'),
661
662=== modified file 'bin/addons/stock/stock_view.xml'
663--- bin/addons/stock/stock_view.xml 2023-01-31 15:24:11 +0000
664+++ bin/addons/stock/stock_view.xml 2023-10-23 07:51:06 +0000
665@@ -738,6 +738,8 @@
666 <field name="name"/>
667 <field name="backorder_id" groups="base.group_extended"/>
668 <field name="origin"/>
669+ <field name="details" truncate="15"/>
670+ <field name="reason_type_id" />
671 <field name="date"/>
672 <field name="min_date"/>
673 <field name="invoice_state"/>
674@@ -807,6 +809,9 @@
675 <field name="partner_id"/>
676 <field name="destinations_list"/>
677 <field name="origin"/>
678+ <field name="details" truncate="15"/>
679+ <field name="order_category" />
680+ <field name="reason_type_id" />
681 <field name="date"/>
682 <field name="min_date"/>
683 <field name="backorder_id" groups="base.group_extended"/>
684@@ -847,6 +852,8 @@
685 <field name="name"/>
686 <field name="partner_id" />
687 <field name="origin"/>
688+ <field name="details"/>
689+ <field name="order_category" />
690 <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
691 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
692 </group>
693@@ -1001,8 +1008,12 @@
694 <separator orientation="vertical"/>
695 <field name="name"/>
696 <field name="origin"/>
697- <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
698- <field name="company_id" widget="selection"/>
699+ <field name="details"/>
700+ <field name="reason_type_id" widget="selection" />
701+ <field name="order_category" />
702+ <field name="date" />
703+ <newline/>
704+ <field name="min_date" string="Expected Move Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'import'])]}" on_change="change_min_date()" required="1"/>
705 <field name="product_id"/>
706 </group>
707 <newline/>
708
709=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
710--- bin/addons/stock_override/report/delivery_order.rml 2023-08-10 11:18:31 +0000
711+++ bin/addons/stock_override/report/delivery_order.rml 2023-10-23 07:51:06 +0000
712@@ -186,6 +186,26 @@
713 <para style="Header">[[ picking.warehouse_id and picking.warehouse_id.name or '' ]]</para>
714 </td>
715 </tr>
716+ <tr>
717+ <td>
718+ <para style="HeaderRight">Details :</para>
719+ </td>
720+ <td>
721+ <para style="Header">[[ picking.details ]]</para>
722+ </td>
723+ <td>
724+ <para style="HeaderRight"></para>
725+ </td>
726+ <td>
727+ <para style="Header"></para>
728+ </td>
729+ <td>
730+ <para style="HeaderRight"></para>
731+ </td>
732+ <td>
733+ <para style="Header"></para>
734+ </td>
735+ </tr>
736 </blockTable>
737
738 <para style="Header">
739
740=== modified file 'bin/addons/stock_override/report/internal_move.rml'
741--- bin/addons/stock_override/report/internal_move.rml 2023-07-27 14:18:08 +0000
742+++ bin/addons/stock_override/report/internal_move.rml 2023-10-23 07:51:06 +0000
743@@ -152,10 +152,10 @@
744 <para style="Header">[[ get_selec(picking, 'state') ]]</para>
745 </td>
746 <td>
747- <para style="HeaderRight"> </para>
748+ <para style="HeaderRight">Details :</para>
749 </td>
750 <td>
751- <para style="Header"> </para>
752+ <para style="Header">[[ picking.details ]]</para>
753 </td>
754 <td>
755 <para style="HeaderRight"> </para>
756
757=== modified file 'bin/addons/stock_override/stock.py'
758--- bin/addons/stock_override/stock.py 2023-07-24 15:36:24 +0000
759+++ bin/addons/stock_override/stock.py 2023-10-23 07:51:06 +0000
760@@ -364,14 +364,20 @@
761 if context.get('not_workflow', False):
762 vals['from_wkf'] = False
763
764- if vals.get('from_wkf') and vals.get('purchase_id'):
765- po = self.pool.get('purchase.order').browse(cr, uid, vals.get('purchase_id'), fields_to_fetch=['dest_partner_names', 'short_customer_ref', 'linked_sol_id', 'order_line'], context=context)
766- vals['customers'] = po.dest_partner_names
767- vals['customer_ref'] = po.short_customer_ref
768- for line in po.order_line:
769- if line.linked_sol_id:
770- vals['from_wkf_sourcing'] = True
771- break
772+ if vals.get('from_wkf'):
773+ if vals.get('purchase_id'):
774+ ftf = ['dest_partner_names', 'short_customer_ref', 'linked_sol_id', 'order_line', 'details']
775+ po = self.pool.get('purchase.order').browse(cr, uid, vals['purchase_id'], fields_to_fetch=ftf, context=context)
776+ vals['customers'] = po.dest_partner_names
777+ vals['customer_ref'] = po.short_customer_ref
778+ if 'details' not in vals:
779+ vals['details'] = po.details
780+ for line in po.order_line:
781+ if line.linked_sol_id:
782+ vals['from_wkf_sourcing'] = True
783+ break
784+ elif vals.get('sale_id') and 'details' not in vals:
785+ vals['details'] = self.pool.get('sale.order').read(cr, uid, vals['sale_id'], ['details'], context=context)['details']
786
787 if not vals.get('partner_id2') and vals.get('address_id'):
788 addr = self.pool.get('res.partner.address').browse(cr, uid, vals.get('address_id'), context=context)
789@@ -1786,6 +1792,7 @@
790 'reason_type_id': reason_type_id,
791 'previous_chained_pick_id': picking.id,
792 'from_wkf': picking.from_wkf,
793+ 'details': picking.details,
794 }
795 return picking_obj.create(cr, uid, pick_values, context=context)
796
797
798=== modified file 'bin/addons/stock_override/stock_view.xml'
799--- bin/addons/stock_override/stock_view.xml 2023-08-08 09:24:25 +0000
800+++ bin/addons/stock_override/stock_view.xml 2023-10-23 07:51:06 +0000
801@@ -198,8 +198,9 @@
802 <group colspan="4" col="6">
803 <group colspan="4" col="4">
804 <field name="name" readonly="1"/>
805- <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
806+ <field name="origin" attrs="{'readonly': ['|', ('state', 'not in', ['auto', 'assigned', 'confirmed']), '&amp;', '&amp;', ('incoming_id', '=', False), ('sale_id', '=', False), ('from_pick_cancel_id', '=', False)]}"/>
807 <field name="backorder_id" readonly="1"/>
808+ <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
809 <field name="reason_type_id" widget="selection"
810 domain="[('internal_ok', '=', True)]"
811 attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
812@@ -391,18 +392,6 @@
813 </field>
814 </record>
815
816- <record id="sale.stock_picking_inherit_sale" model="ir.ui.view">
817- <field name="name">stock.picking.form</field>
818- <field name="model">stock.picking</field>
819- <field name="type">form</field>
820- <field name="inherit_id" ref="stock.view_picking_form"/>
821- <field name="arch" type="xml">
822- <field name="auto_picking" position="after">
823- <field name="sale_id" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
824- </field>
825- </field>
826- </record>
827-
828 <record id="stock.view_picking_in_form" model="ir.ui.view">
829 <field name="name">view.picking.in.form</field>
830 <field name="model">stock.picking</field>
831@@ -451,7 +440,7 @@
832 <group colspan="4" col="6">
833 <group colspan="4" col="4">
834 <field name="name" readonly="1"/>
835- <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
836+ <field name="origin" attrs="{'readonly': ['|', ('state', 'not in', ['auto', 'assigned', 'confirmed']), ('purchase_id', '=', False)]}"/>
837 <field name="partner_id2" on_change="on_change_partner(partner_id2, address_id)" required="0" attrs="{'readonly': ['|', '|', '|', '|', ('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned']), ('ext_cu', '!=', False), ('purchase_id', '!=', False), ('backorder_id', '!=', False), ('ret_from_unit_rt', '=', True)], 'required': [('ext_cu', '=', False)]}"/>
838 <field name="ext_cu" on_change="on_change_ext_cu(ext_cu)" attrs="{'readonly': ['|', '|', '|', ('partner_id2', '!=', False), ('sale_id', '!=', False), ('purchase_id', '!=', False), ('state', 'not in', ['draft', 'waiting', 'confirmed', 'assigned'])], 'required': ['|', ('purchase_id', '=', False), '&amp;', ('partner_id2', '=', False), ('ret_from_unit_rt', '=', True)]}" domain="[('location_category', '=', 'consumption_unit'), ('usage', 'in', ('customer', 'supplier'))]" />
839 <field name="address_id" invisible="1" />
840@@ -471,6 +460,7 @@
841 <field name="min_date_manually" invisible="1" />
842 <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
843 <field name="shipment_ref" />
844+ <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}" />
845 <field name="claim_name" readonly="1" attrs="{'invisible': [('claim', '=', False)]}"/>
846 </group>
847 </group>
848@@ -800,6 +790,7 @@
849 attrs="{'readonly': ['|', ('from_wkf', '=', True), ('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"
850 on_change="on_change_rt_out(partner_id2, reason_type_id)"
851 />
852+ <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}" />
853 </group>
854 <group colspan="2" col="2">
855 <field name="date" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>

Subscribers

People subscribed via source and target branches