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

[jftempo]

=== modified file 'bin/addons/delete_button/view/sale_view.xml'
--- bin/addons/delete_button/view/sale_view.xml	2018-12-03 11:35:29 +0000
+++ bin/addons/delete_button/view/sale_view.xml	2023-10-23 07:51:06 +0000
@@ -51,8 +51,8 @@
                 </data>
             </field>
         </record>
-        
-        
+
+
         <record id="procurement_request_tree_view" model="ir.ui.view">
             <field name="name">procurement.request.tree.view</field>
             <field name="model">sale.order</field>
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2023-08-08 09:24:25 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2023-10-23 07:51:06 +0000
@@ -2523,7 +2523,7 @@
                                       store={'stock.move': (_get_picking_ids, ['picking_id', 'state', 'product_qty'], 10),
                                              'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 10)}),
         'pack_family_memory_ids': fields.one2many('pack.family.memory', 'ppl_id', string='Memory Families'),
-        'description_ppl': fields.char('Description', size=256),
+        'description_ppl': fields.char('Details', size=256),
         'already_shipped': fields.boolean(string='The shipment is done'),  # UF-1617: only for indicating the PPL that the relevant Ship has been closed
         'has_draft_moves': fields.function(_get_draft_moves, method=True, type='boolean', string='Has draft moves ?', store=False),
         'has_to_be_resourced': fields.boolean(string='Picking has to be resourced'),
@@ -3789,6 +3789,7 @@
                 'previous_step_id': picking.id,
                 'backorder_id': False,
                 'move_lines': [],
+                'description_ppl': picking.details,
             }
             context.update({
                 'keep_prodlot': True,
@@ -4727,7 +4728,8 @@
                 bool_and(m.not_shipped) as not_shipped,
                 ''::varchar(1) as comment,
                 p.flow_type = 'quick' as quick_flow,
-                p.state as pack_state
+                p.state as pack_state,
+                min(m.parcel_comment) as parcel_comment
             from stock_picking p
             inner join stock_move m on m.picking_id = p.id and m.state != 'cancel' and m.product_qty > 0
             left join sale_order so on so.id = p.sale_id
@@ -4787,6 +4789,7 @@
         'ppl_id': fields.many2one('stock.picking', string="PPL Ref"),
         'from_pack': fields.integer(string='From p.'),
         'to_pack': fields.integer(string='To p.'),
+        'parcel_comment': fields.char(string='Parcel Comment', size=256),
         'pack_type': fields.many2one('pack.type', string='Pack Type'),
         'length': fields.float(digits=(16, 2), string='Length [cm]'),
         'width': fields.float(digits=(16, 2), string='Width [cm]'),
@@ -4812,7 +4815,7 @@
         'selected_number': fields.integer('Nb. Parcels to Ship'),
         'total_weight': fields.function(_vals_get, method=True, type='float', string='Total Weight[kg]', multi='get_vals',),
         'total_volume': fields.function(_vals_get, method=True, type='float', string=u'Total Volume[dm³]', multi='get_vals',),
-        'description_ppl': fields.char('Description', size=256),
+        'description_ppl': fields.char('Details', size=256),
         'not_shipped': fields.boolean(string='Not shipped'),
         'comment': fields.char(string='Comment', size=1024),
         'volume_set': fields.boolean('Volume set at PPL'),
@@ -4845,12 +4848,24 @@
             fields.append('selected_number=%(to_ship)s')
 
         if 'total_weight' in vals:
+            try:
+                vals['total_weight'] = float(vals['total_weight'])
+            except Exception, e:
+                raise osv.except_osv(_('Error'), _('The Total Weight[kg] must be a number'))
             sql_data['total_weight'] = vals['total_weight'] or 0
             fields.append('weight=%%(total_weight)s/(%s-from_pack+1)' % to_pack_field)
         if 'total_volume' in vals:
+            try:
+                vals['total_volume'] = float(vals['total_volume'])
+            except Exception, e:
+                raise osv.except_osv(_('Error'), _('The Total Volume[dm³] must be a number'))
             sql_data['size'] = (vals['total_volume']**(1.0/3))*10. or 0
             fields += ['length=%%(size)s/(%s-from_pack+1)' % to_pack_field, 'width=%(size)s', 'height=%(size)s']
 
+        if 'parcel_comment' in vals:
+            sql_data['parcel_comment'] = vals.get('parcel_comment', '')
+            fields.append('parcel_comment=%(parcel_comment)s')
+
         if fields:
             cr.execute('''
                 update stock_move
@@ -4874,7 +4889,7 @@
         for pack in pack_obj:
             res_id = pack['draft_packing_id'][0]
             return {
-                'name': 'Change description',
+                'name': _('Change details'),
                 'view_type': 'form',
                 'view_mode': 'form',
                 'view_id': [res and res[1] or False],
 
=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
--- bin/addons/msf_outgoing/msf_outgoing_view.xml	2023-08-08 09:24:25 +0000
+++ bin/addons/msf_outgoing/msf_outgoing_view.xml	2023-10-23 07:51:06 +0000
@@ -164,6 +164,7 @@
                     <field name="sale_id" invisible="True" />
                     <field name="reason_type_id" />
                     <field name="origin"/>
+                    <field name="details" truncate="15"/>
                     <field name="packing_list"/>
                     <field name="order_category" string="Order\nCategory"/>
                     <field name="incoming_id" />
@@ -200,6 +201,7 @@
                             <field name="backorder_id" readonly="1" string="Original PICK" />
                             <field name="reason_type_id" widget="selection" readonly="1" />
                             <field name="order_category" />
+                            <field name="details" readonly="1" />
                         </group>
 
                         <group colspan="2" col="2">
@@ -498,6 +500,7 @@
 						<field name="name"/>
 						<field name="partner_id2" />
 						<field name="origin"/>
+						<field name="details"/>
                         <field name="packing_list" />
                         <field name="order_category" />
                         <newline />
@@ -1285,9 +1288,9 @@
 			<field name="type">form</field>
             <field name="priority">21</field>
 			<field name="arch" type="xml">
-                <form string="Change description shipment line">
+                <form string="Change details shipment line">
 					<field name="description_ppl"/>
-					<button name="change_description_save" string="Save description" icon="gtk-save" type="object" />
+					<button name="change_description_save" string="Save details" icon="gtk-save" type="object" />
 				</form>
 			</field>
 		</record>
@@ -1355,9 +1358,10 @@
                                     <field name="ppl_id" readonly="1"/>
                                     <field name="packing_list" readonly="1" />
                                     <field name="description_ppl" readonly="1" />
-                                    <button name="change_description" string="Change description" icon="gtk-edit" type="object" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'assigned'])]}" />
+                                    <button name="change_description" string="Change details" icon="gtk-edit" type="object" attrs="{'invisible': [('fake_state', 'not in', ['draft', 'assigned'])]}" />
                                     <field name="from_pack" readonly="1" />
                                     <field name="to_pack" attrs="{'readonly': ['|', '|', '|', ('quick_flow', '=', False), ('fake_state', 'not in', ['draft', 'assigned']), ('from_pack', '!=', 1), ('pack_state', '!=', 'draft')]}" readonly="0"/>
+                                    <field name="parcel_comment" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}"/>
                                     <field name="num_of_packs" readonly="1" />
                                     <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)"/>
                                     <field name="pack_type" readonly="1" />
@@ -1381,6 +1385,7 @@
                                     <newline />
                                     <field name="from_pack" readonly="1" />
                                     <field name="to_pack" attrs="{'readonly': ['|', '|', '|', ('quick_flow', '=', False), ('fake_state', 'not in', ['draft', 'assigned']), ('from_pack', '!=', 1), ('pack_state', '!=', 'draft')]}" />
+                                    <field name="parcel_comment" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}"/>
                                     <field name="num_of_packs" readonly="1"/>
                                     <field name="selected_number" attrs="{'readonly': ['|', ('pack_state', '!=', 'draft'), ('fake_state', '!=', 'assigned')]}" on_change="change_selected_number(selected_number)" />
                                     <field name="pack_type" readonly="1" />
 
=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2023-07-27 15:06:19 +0000
+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2023-10-23 07:51:06 +0000
@@ -198,6 +198,9 @@
                     <tr>
                     <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>
                     </tr>
+                    <tr>
+                    <td><para style="HeaderInfosTitle">Details:</para></td><td><para style="HeaderInfosTitle">[[ pt.description_ppl ]]</para></td>
+                    </tr>
                     </blockTable>
                 </td>
                 <td>
 
=== modified file 'bin/addons/msf_outgoing/report/freight_manifest.rml'
--- bin/addons/msf_outgoing/report/freight_manifest.rml	2020-11-30 15:46:46 +0000
+++ bin/addons/msf_outgoing/report/freight_manifest.rml	2023-10-23 07:51:06 +0000
@@ -496,7 +496,7 @@
                         <para style="TextInformation5" alignment="CENTER">Packing list</para>
                     </td>
                     <td>
-                        <para style="TextInformation5" alignment="CENTER">Description</para>
+                        <para style="TextInformation5" alignment="CENTER">Details</para>
                     </td>
                     <td>
                         <para style="TextInformation5" alignment="CENTER">Parcels</para>
 
=== modified file 'bin/addons/msf_outgoing/report/packing_list.py'
--- bin/addons/msf_outgoing/report/packing_list.py	2018-07-17 13:18:35 +0000
+++ bin/addons/msf_outgoing/report/packing_list.py	2023-10-23 07:51:06 +0000
@@ -66,6 +66,7 @@
                 'total_volume': 0.00,
                 'total_weight': 0.00,
                 'nb_parcel': 0,
+                'pf_description_ppl': pf.description_ppl
             })
             if not pf.not_shipped:
                 res[pf.ppl_id.name]['pf'].append(pf)
@@ -79,7 +80,7 @@
         for key in sort_keys:
             result.append(res.get(key))
 
-        filtered_result = [] # remove empty PPL
+        filtered_result = []  # remove empty PPL
         for data in result:
             if data.get('pf'):
                 filtered_result.append(data)
 
=== modified file 'bin/addons/msf_outgoing/report/packing_list.rml'
--- bin/addons/msf_outgoing/report/packing_list.rml	2023-07-28 09:33:52 +0000
+++ bin/addons/msf_outgoing/report/packing_list.rml	2023-10-23 07:51:06 +0000
@@ -177,6 +177,14 @@
                             			<para style="HeaderInfosValue">[[ getSel(objects[0], 'transport_type') ]]</para>
 									</td>
 								</tr>
+								<tr>
+									<td>
+                            			<para style="HeaderInfosTitle">Details:</para>
+									</td>
+									<td>
+                            			<para style="HeaderInfosValue">[[ p['pf_description_ppl'] or '' ]]</para>
+									</td>
+								</tr>
 							</blockTable>
                         </td>
                         <td>
@@ -246,7 +254,7 @@
                                 <para style="ParcelInfosRight" alignment="CENTER">Containing</para>
                             </td>
                             <td>
-                                <para style="ParcelInfos">Description</para>
+                                <para style="ParcelInfos">Parcel Comment</para>
                             </td>
                         </tr>
                     </blockTable>
@@ -292,7 +300,7 @@
                                 <para style="ParcelLineTitle">MSL</para>
                             </td>
                             <td>
-                                <para style="ParcelLineTitle">[[ pf.description_ppl or ' ' ]]</para>
+                                <para style="ParcelLineTitle">[[ pf.parcel_comment or ' ' ]]</para>
                             </td>
                         </tr>
                         <tr>
@@ -351,6 +359,24 @@
                 <font color="white"> </font>
             </para>
 
+            <blockTable rowHeights="10.0" colWidths="10.0,45.0,755.0,10.0" style="HeaderInfos">
+                <tr>
+                    <td></td>
+                    <td>
+                        <para style="HeaderInfosTitle">Notes :</para>
+                    </td>
+                    <td>
+                        <para style="HeaderInfosValue">[[ p['ppl'].note ]] total</para>
+                    </td>
+                    <td></td>
+                </tr>
+            </blockTable>
+
+            <!-- Empty line -->
+            <para style="HeaderInfosTitle">
+                <font color="white"> </font>
+            </para>
+
             <blockTable rowHeights="10.0" colWidths="250.0,170.0,170.0,230.0" style="Totals">
                 <tr>
                     <td></td>
 
=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
--- bin/addons/msf_outgoing/report/picking_ticket.rml	2023-08-08 09:24:25 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.rml	2023-10-23 07:51:06 +0000
@@ -4,7 +4,7 @@
     <!-- Templating -->
     <template pageSize="(842.0,595.0)" title="Packing-List" author="Unifield,MSF" allowSplitting="20">
         <pageTemplate id="first">
-            <frame id="first" x1="0.0" y1="0.0" width="842" height="520" />
+            <frame id="first" x1="0.0" y1="0.0" width="842" height="505" />
 
             <pageGraphics>
                 <setFont name="Helvetica-Bold" size="13.0"/>
@@ -12,11 +12,13 @@
                 <fill color="blue"/>
                 <drawString x="20.0" y="541.0">[[ objects[0].name ]]</drawString>
                 <image x="705.0" y="525.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
+                <setFont name="Helvetica" size="9" />
+                <fill color="black" />
+                <drawString x="20.0" y="525.0">Details : [[ objects[0].details ]]</drawString>
                 <setFont name="Helvetica" size="8" />
-                <fill color="black" />
-                <drawString x="20.0" y="525.0">Page : <pageNumber /> / </drawString>
-                <drawString x="62.0" y="525.0"><pageCount /></drawString>
-                <drawString x="20.0" y="510.0">Date [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</drawString>
+                <drawString x="20.0" y="510.0">Page : <pageNumber /> / </drawString>
+                <drawString x="62.0" y="510.0"><pageCount /></drawString>
+                <drawString x="20.0" y="495.0">Date [[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</drawString>
             </pageGraphics>
         </pageTemplate>
 
 
=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
--- bin/addons/msf_printed_documents/report/report_reception.rml	2023-08-08 09:24:25 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.rml	2023-10-23 07:51:06 +0000
@@ -302,6 +302,7 @@
         </para>
 
         <blockTable colWidths="800.0" >
+            <tr><td><para style="Standard">Details : [[ objects[0].details ]]</para></td></tr>
             <tr><td><para style="Standard">Expected Receipt Date : [[ getERD(objects[0]) ]]</para></td></tr>
             <tr><td><para style="Standard">Actual Receipt Date   : [[ getActualReceiptDate(objects[0]) ]]</para></td></tr>
         </blockTable>
 
=== modified file 'bin/addons/msf_printed_documents/report/sale_order.rml'
--- bin/addons/msf_printed_documents/report/sale_order.rml	2023-08-08 09:24:25 +0000
+++ bin/addons/msf_printed_documents/report/sale_order.rml	2023-10-23 07:51:06 +0000
@@ -8,6 +8,8 @@
         <pageGraphics>
             <drawString x="35" y="560.0">FIELD ORDER [[ '%s (%s/%s)' % (objects[0].name, getSel(objects[0],'order_type'), getSel(objects[0],'state')) ]]</drawString>
             <image x="700" y="530.0" height="53.3" width="100">[[ company.logo or removeParentNode('image') ]]</image>
+            <setFont name="Helvetica" size="9"/>
+            <drawString x="35" y="520.0">Details : [[ objects[0].details ]]</drawString>
             <setFont name="Helvetica" size="8"/>
             <fill color="black"/>
             <drawString x="730" y="520.0">Page : <pageNumber /></drawString>
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-08-16 09:21:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-10-23 07:51:06 +0000
@@ -5882,10 +5882,8 @@
 #: field:hr.payroll.msf,name:0
 #: report:empty.picking.ticket:0
 #: report:invoice:0
-#: field:pack.family.memory,description_ppl:0
 #: report:packing.list:0
 #: report:picking.ticket:0
-#: field:stock.picking,description_ppl:0
 #: report:po.follow.up_rml:0
 #: report:addons/msf_tools/report/report_inconsistencies_xls.mako:81
 #: field:process.transition,note:0
@@ -8007,8 +8005,8 @@
 
 #. module: msf_outgoing
 #: view:stock.picking:0
-msgid "Save description"
-msgstr "Sauvegarder la description"
+msgid "Save details"
+msgstr "Sauvegarder les détails"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -41360,6 +41358,7 @@
 #: report:purchase.order.merged:0
 #: report:msf.sale.order:0
 #: report:po.follow.up_rml:0
+#: report:packing.list:0
 msgid "Notes :"
 msgstr "Notes :"
 
@@ -44632,8 +44631,8 @@
 #: view:shipment:0
 #: code:addons/msf_outgoing/msf_outgoing.py:5347
 #, python-format
-msgid "Change description"
-msgstr "Changer la description"
+msgid "Change details"
+msgstr "Changer les détails"
 
 #. module: account
 #: view:report.account.sales:0
@@ -70067,8 +70066,8 @@
 
 #. module: msf_outgoing
 #: view:stock.picking:0
-msgid "Change description shipment line"
-msgstr "Changer la description de la ligne d'expédition"
+msgid "Change details shipment line"
+msgstr "Changer les détails de la ligne d'expédition"
 
 #. module: msf_tools
 #: code:addons/msf_tools/automated_import.py:163
@@ -90631,7 +90630,7 @@
 msgid "%sDestination %s is not active at this date: %s"
 msgstr "%sLa Destination %s n'est pas active à cette date: %s"
 
-#. modules: purchase, tender_flow, purchase_allocation_report, sale, procurement, msf_supply_doc_export, msf_doc_import, purchase_compare_rfq, stock, consumption_calculation
+#. modules: purchase, tender_flow, purchase_allocation_report, sale, procurement, msf_supply_doc_export, msf_doc_import, purchase_compare_rfq, stock, consumption_calculation, msf_outgoing
 #: view:wizard.import.in.simulation.screen:0
 #: view:wizard.import.po:0
 #: view:wizard.import.po.simulation.screen:0
@@ -90649,9 +90648,19 @@
 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:549
 #: field:tender,details:0
 #: field:real.average.consumption,details:0
+#: field:stock.picking,details:0
+#: report:freight_manifest:0
+#: field:pack.family.memory,description_ppl:0
+#: field:stock.picking,description_ppl:0
 msgid "Details"
 msgstr "Détails"
 
+#. module: msf_outgoing
+#: report:empty.picking.ticket:0
+#: report:packing.list:0
+msgid "Details:"
+msgstr "Détails:"
+
 #. module: account_hq_entries
 #: model:ir.model,name:account_hq_entries.model_hq_reallocation
 msgid "HQ reallocation wizard"
@@ -92332,8 +92341,13 @@
 msgid "You have to enter the quantities you want to process before processing the move."
 msgstr "Vous devez saisir les quantités avant de traiter le mouvement"
 
-#. module: sale
+#. module: msf_outgoing, sale, stock_override, procurement_request
 #: report:msf.report_reception_in:0
+#: report:picking.ticket:0
+#: report:procurement.request.report:0
+#: report:msf.sale.order:0
+#: report:delivery.order:0
+#: report:internal.move:0
 msgid "Details :"
 msgstr "Détails :"
 
@@ -121450,3 +121464,21 @@
 msgid "In-Pipe Quantity included"
 msgstr "Quantité en attente incluse"
 
+#. modules: msf_outgoing, stock
+#: field:pack.family.memory,parcel_comment:0
+#: report:packing.list:0
+#: field:stock.move,parcel_comment:0
+msgid "Parcel Comment"
+msgstr "Commentaire de Colis"
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:4853
+#, python-format
+msgid "The Total Weight[kg] must be a number"
+msgstr "Le Poids Total[kg] doit être un nombre"
+
+#. module: msf_outgoing
+#: code:addons/msf_outgoing/msf_outgoing.py:4860
+#, python-format
+msgid "The Total Volume[dm³] must be a number"
+msgstr "Le Volume Total[dm³] doit être un nombre"
 
=== modified file 'bin/addons/procurement_request/procurement_request_view.xml'
--- bin/addons/procurement_request/procurement_request_view.xml	2023-07-24 13:26:27 +0000
+++ bin/addons/procurement_request/procurement_request_view.xml	2023-10-23 07:51:06 +0000
@@ -52,6 +52,7 @@
                                 <button colspan="1" name="update_date" string="Apply to lines" type="object" context="{'field_name': 'stock_take', 'type': 'sale.order'}" icon="gtk-indent"
                                     attrs="{'invisible': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" />
                             </group>
+                            <field name="details" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                             <field name="fo_to_resource" invisible="1" />
                             <field name="parent_order_name" attrs="{'invisible': [('fo_to_resource', '=', False)]}" />
                         </group>
@@ -175,6 +176,7 @@
                     <field name="origin" />
                     <field name="requestor" />
                     <field name="location_requestor_id" />
+                    <field name="details" truncate="15"/>
                     <field name="ir_total_amount" string="Indicative Total Value"/>
                     <field name="functional_currency_id" />
                     <field name="line_count"/>
@@ -202,6 +204,7 @@
                     <field name="origin" />
                     <field name="requestor" />
                     <field name="location_requestor_id" />
+                    <field name="details" />
                     <field name="product_id" />
                     <newline />
                     <group string="Group By...">
 
=== modified file 'bin/addons/procurement_request/report/procurement_request_report.rml'
--- bin/addons/procurement_request/report/procurement_request_report.rml	2023-08-08 09:24:25 +0000
+++ bin/addons/procurement_request/report/procurement_request_report.rml	2023-10-23 07:51:06 +0000
@@ -138,19 +138,25 @@
                     <para style="Header">[[ req.origin  ]]</para>
                 </td>
                 <td>
+                    <para style="HeaderRight">Details :</para>
+                </td>
+                <td>
+                    <para style="Header">[[ req.details ]]</para>
+                </td>
+                <td>
                     <para style="HeaderRight">Functional Currency :</para>
                 </td>
                 <td>
                     <para style="Header">[[ req.functional_currency_id and get_name('res.currency', req.functional_currency_id.id) or '' ]]</para>
                 </td>
+            </tr>
+            <tr>
                 <td>
                     <para style="HeaderRight">Warehouse :</para>
                 </td>
                 <td>
                     <para style="Header">[[ req.warehouse_id and get_name('stock.warehouse', req.warehouse_id.id) or '' ]]</para>
                 </td>
-            </tr>
-            <tr>
                 <td>
                     <para style="HeaderRight">Order category :</para>
                 </td>
@@ -163,12 +169,6 @@
                 <td>
                     <para style="Header"></para>
                 </td>
-                <td>
-                    <para style="HeaderRight"></para>
-                </td>
-                <td>
-                    <para style="Header"></para>
-                </td>
             </tr>
         </blockTable>
 
 
=== modified file 'bin/addons/reason_types_moves/reason_type_view.xml'
--- bin/addons/reason_types_moves/reason_type_view.xml	2022-06-13 15:38:44 +0000
+++ bin/addons/reason_types_moves/reason_type_view.xml	2023-10-23 07:51:06 +0000
@@ -118,9 +118,6 @@
 		<field name="inherit_id" ref="stock.vpicktree" />
 		<field name="arch" type="xml">
 			<data>
-				<xpath expr="/tree/field[@name='origin']" position="after">
-					<field name="reason_type_id" />
-				</xpath>
 				<xpath expr="/tree/field[@name='stock_journal_id']" position="replace" />
 				<xpath expr="/tree/field[@name='invoice_state']" position="replace" />
 			</data>
@@ -139,9 +136,6 @@
 				<xpath expr="/tree//field[@name='origin']" position="before">
 					<field name="backorder_id" />
 				</xpath>
-				<xpath expr="/tree/field[@name='origin']" position="after">
-					<field name="reason_type_id" />
-				</xpath>
 				<xpath expr="/tree//field[@name='invoice_state']" position="replace" />
 				<xpath expr="/tree//field[@name='stock_journal_id']" position="replace" />
 			</data>
@@ -239,16 +233,6 @@
             <field name="inherit_id" ref="stock.view_picking_internal_search" />
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/search/group/field[@name='origin']" position="after">
-                        <field name="reason_type_id" widget="selection" />
-                    </xpath>
-                    <xpath expr="/search//field[@name='stock_journal_id']" position="replace">
-                    	<field name="date" />
-                    </xpath>
-                    <xpath expr="/search//field[@name='company_id']" position="replace">
-                        <field name="min_date" string="Expected Move Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'import'])]}"
-                            on_change="change_min_date()" required="1"/>
-                    </xpath>
                     <xpath expr="/search/group[@string='Group By...']/filter[@string='Journal']" position="replace">
                         <filter string="Reason type" icon="terp-purchase" domain="[]" context="{'group_by': 'reason_type_id'}" />
                     </xpath>
 
=== modified file 'bin/addons/reason_types_moves/stock_view.xml'
--- bin/addons/reason_types_moves/stock_view.xml	2022-06-13 15:38:44 +0000
+++ bin/addons/reason_types_moves/stock_view.xml	2023-10-23 07:51:06 +0000
@@ -152,6 +152,7 @@
                         <field name="origin"/>
                         <field name="customers" />
                         <field name="order_category" />
+                        <field name="details" />
                         <field name="reason_type_id" widget="selection" domain="[('incoming_ok', '=', True)]" />
                         <newline />
                         <field name="date" string="Creation date" />
@@ -190,6 +191,7 @@
                     <field name="customer_ref" />
                     <field name="customers" />
                     <field name="order_category" />
+                    <field name="details" truncate="15" />
                     <field name="shipment_ref" />
                     <field name="reason_type_id" domain="[('incoming_ok', '=', True)]" />
                     <field name="date" string="Creation Date" />
 
=== modified file 'bin/addons/service_purchasing/service_purchasing_view.xml'
--- bin/addons/service_purchasing/service_purchasing_view.xml	2023-02-08 13:27:53 +0000
+++ bin/addons/service_purchasing/service_purchasing_view.xml	2023-10-23 07:51:06 +0000
@@ -17,21 +17,6 @@
         </record>
 
         <!-- OUT -->
-        <record id="view_picking_out_tree" model="ir.ui.view">
-            <field name="name">stock.picking.out.tree</field>
-            <field name="model">stock.picking</field>
-            <field name="type">tree</field>
-            <field name="priority">25</field>
-            <field name="inherit_id" ref="stock.view_picking_out_tree" />
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='origin']" position="after">
-                        <field name="order_category" />
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <record id="view_picking_out_search" model="ir.ui.view">
             <field name="name">stock.picking.out.search</field>
             <field name="model">stock.picking</field>
@@ -40,9 +25,6 @@
             <field name="inherit_id" ref="stock.view_picking_out_search" />
             <field name="arch" type="xml">
                 <data>
-                    <field name="origin" position="after">
-                        <field name="order_category" />
-                    </field>
                     <filter string="Partner" position="after">
                         <separator orientation="vertical" />
                         <filter string="Order Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'order_category'}" />
@@ -59,21 +41,6 @@
 
        <!-- id: view_picking_form, name: stock.picking.form, inherit_id:stock.view_picking_form was here -->
 
-       <record id="view_picking_internal_search" model="ir.ui.view">
-            <field name="name">stock.picking.internal.search</field>
-            <field name="model">stock.picking</field>
-            <field name="type">search</field>
-            <field name="priority">20</field>
-            <field name="inherit_id" ref="stock.view_picking_internal_search" />
-            <field name="arch" type="xml">
-                <data>
-                    <field name="origin" position="after">
-                        <field name="order_category" />
-                    </field>
-                </data>
-            </field>
-       </record>
-
        <record id="view_stock_picking_filter" model="ir.ui.view">
             <field name="name">stock.picking.list.select</field>
             <field name="model">stock.picking</field>
 
=== modified file 'bin/addons/stock/stock.py'
--- bin/addons/stock/stock.py	2023-08-08 09:24:25 +0000
+++ bin/addons/stock/stock.py	2023-10-23 07:51:06 +0000
@@ -1116,6 +1116,7 @@
         'total_qty_process_str': fields.function(_get_total_qty_str, method=1, string='Qties to Process', type='char', multi='total_qty'),
         '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),
         'alert_msl_mml': fields.function(_get_alert_msl_mml, method=True, type='char', string="Contains non-conform MML/MSL"),
+        'details': fields.char(size=86, string='Details', readonly=True),
     }
 
     _defaults = {
 
=== modified file 'bin/addons/stock/stock_move.py'
--- bin/addons/stock/stock_move.py	2023-08-02 12:18:23 +0000
+++ bin/addons/stock/stock_move.py	2023-10-23 07:51:06 +0000
@@ -583,6 +583,7 @@
         # msf_outgoing
         'from_pack': fields.integer(string='From p.'),
         'to_pack': fields.integer(string='To p.'),
+        'parcel_comment': fields.char(string='Parcel Comment', size=256),
         'ppl_returned_ok': fields.boolean(string='Has been returned ?', readonly=True, internal=True),
         'integrity_error': fields.selection(INTEGRITY_STATUS_SELECTION, 'Error', readonly=True),
         'pack_type': fields.many2one('pack.type', string='Pack Type'),
 
=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2023-01-31 15:24:11 +0000
+++ bin/addons/stock/stock_view.xml	2023-10-23 07:51:06 +0000
@@ -738,6 +738,8 @@
                     <field name="name"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
+                    <field name="details" truncate="15"/>
+                    <field name="reason_type_id" />
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="invoice_state"/>
@@ -807,6 +809,9 @@
                     <field name="partner_id"/>
                     <field name="destinations_list"/>
                     <field name="origin"/>
+                    <field name="details" truncate="15"/>
+                    <field name="order_category" />
+                    <field name="reason_type_id" />
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="backorder_id" groups="base.group_extended"/>
@@ -847,6 +852,8 @@
                         <field name="name"/>
                         <field name="partner_id" />
                         <field name="origin"/>
+                        <field name="details"/>
+                        <field name="order_category" />
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                    </group>
@@ -1001,8 +1008,12 @@
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="origin"/>
-                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        <field name="company_id" widget="selection"/>
+                        <field name="details"/>
+                        <field name="reason_type_id" widget="selection" />
+                        <field name="order_category" />
+                        <field name="date" />
+                        <newline/>
+                        <field name="min_date" string="Expected Move Date" attrs="{'readonly': [('state', 'in', ['done', 'cancel', 'import'])]}" on_change="change_min_date()" required="1"/>
                         <field name="product_id"/>
                     </group>
                     <newline/>
 
=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
--- bin/addons/stock_override/report/delivery_order.rml	2023-08-10 11:18:31 +0000
+++ bin/addons/stock_override/report/delivery_order.rml	2023-10-23 07:51:06 +0000
@@ -186,6 +186,26 @@
                     <para style="Header">[[ picking.warehouse_id and picking.warehouse_id.name or '' ]]</para>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <para style="HeaderRight">Details :</para>
+                </td>
+                <td>
+                    <para style="Header">[[ picking.details ]]</para>
+                </td>
+                <td>
+                    <para style="HeaderRight"></para>
+                </td>
+                <td>
+                    <para style="Header"></para>
+                </td>
+                <td>
+                    <para style="HeaderRight"></para>
+                </td>
+                <td>
+                    <para style="Header"></para>
+                </td>
+            </tr>
         </blockTable>
 
         <para style="Header">
 
=== modified file 'bin/addons/stock_override/report/internal_move.rml'
--- bin/addons/stock_override/report/internal_move.rml	2023-07-27 14:18:08 +0000
+++ bin/addons/stock_override/report/internal_move.rml	2023-10-23 07:51:06 +0000
@@ -152,10 +152,10 @@
                     <para style="Header">[[ get_selec(picking, 'state') ]]</para>
                 </td>
                 <td>
-                    <para style="HeaderRight"> </para>
+                    <para style="HeaderRight">Details :</para>
                 </td>
                 <td>
-                    <para style="Header"> </para>
+                    <para style="Header">[[ picking.details ]]</para>
                 </td>
                 <td>
                     <para style="HeaderRight"> </para>
 
=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2023-07-24 15:36:24 +0000
+++ bin/addons/stock_override/stock.py	2023-10-23 07:51:06 +0000
@@ -364,14 +364,20 @@
         if context.get('not_workflow', False):
             vals['from_wkf'] = False
 
-        if vals.get('from_wkf') and vals.get('purchase_id'):
-            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)
-            vals['customers'] = po.dest_partner_names
-            vals['customer_ref'] = po.short_customer_ref
-            for line in po.order_line:
-                if line.linked_sol_id:
-                    vals['from_wkf_sourcing'] = True
-                    break
+        if vals.get('from_wkf'):
+            if vals.get('purchase_id'):
+                ftf = ['dest_partner_names', 'short_customer_ref', 'linked_sol_id', 'order_line', 'details']
+                po = self.pool.get('purchase.order').browse(cr, uid, vals['purchase_id'], fields_to_fetch=ftf, context=context)
+                vals['customers'] = po.dest_partner_names
+                vals['customer_ref'] = po.short_customer_ref
+                if 'details' not in vals:
+                    vals['details'] = po.details
+                for line in po.order_line:
+                    if line.linked_sol_id:
+                        vals['from_wkf_sourcing'] = True
+                        break
+            elif vals.get('sale_id') and 'details' not in vals:
+                vals['details'] = self.pool.get('sale.order').read(cr, uid, vals['sale_id'], ['details'], context=context)['details']
 
         if not vals.get('partner_id2') and vals.get('address_id'):
             addr = self.pool.get('res.partner.address').browse(cr, uid, vals.get('address_id'), context=context)
@@ -1786,6 +1792,7 @@
             'reason_type_id': reason_type_id,
             'previous_chained_pick_id': picking.id,
             'from_wkf': picking.from_wkf,
+            'details': picking.details,
         }
         return picking_obj.create(cr, uid, pick_values, context=context)
 
 
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml	2023-08-08 09:24:25 +0000
+++ bin/addons/stock_override/stock_view.xml	2023-10-23 07:51:06 +0000
@@ -198,8 +198,9 @@
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
-                            <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
+                            <field name="origin" attrs="{'readonly': ['|', ('state', 'not in', ['auto', 'assigned', 'confirmed']), '&amp;', '&amp;', ('incoming_id', '=', False), ('sale_id', '=', False), ('from_pick_cancel_id', '=', False)]}"/>
                             <field name="backorder_id" readonly="1"/>
+                            <field name="details"  attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                             <field name="reason_type_id" widget="selection"
                                    domain="[('internal_ok', '=', True)]" 
                                    attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
@@ -391,18 +392,6 @@
             </field>
         </record>
 
-        <record id="sale.stock_picking_inherit_sale" model="ir.ui.view">
-            <field name="name">stock.picking.form</field>
-            <field name="model">stock.picking</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
-                    <field name="sale_id" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
-                </field>
-            </field>
-        </record>
-
         <record id="stock.view_picking_in_form" model="ir.ui.view">
             <field name="name">view.picking.in.form</field>
             <field name="model">stock.picking</field>
@@ -451,7 +440,7 @@
                     <group colspan="4" col="6">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
-                            <field name="origin" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>
+                            <field name="origin" attrs="{'readonly': ['|', ('state', 'not in', ['auto', 'assigned', 'confirmed']), ('purchase_id', '=', False)]}"/>
                             <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)]}"/>
                             <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'))]" />
                             <field name="address_id" invisible="1" />
@@ -471,6 +460,7 @@
                             <field name="min_date_manually" invisible="1" />
                             <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
                             <field name="shipment_ref" />
+                            <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}" />
                             <field name="claim_name" readonly="1" attrs="{'invisible': [('claim', '=', False)]}"/>
                         </group>
                     </group>
@@ -800,6 +790,7 @@
                                 attrs="{'readonly': ['|', ('from_wkf', '=', True), ('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"
                                 on_change="on_change_rt_out(partner_id2, reason_type_id)"
                                 />
+                            <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}" />
                         </group>
                         <group colspan="2" col="2">
                             <field name="date" attrs="{'readonly': [('state', 'not in', ['draft', 'auto', 'assigned', 'confirmed'])]}"/>