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

[jftempo]

[lp:~dorian-kemps/unifield-server/US-10783]

6492. By Dorian on 2023-07-10

US-10783 [MERGE] Merge with trunk

6493. By Dorian on 2023-07-17

US-10783-11563 [IMP] PO: Replaced location_id by location_ids and location_names. Their value depends on each PO line's origin, and new location value at line level affects the destination of the created INs

6494. By Dorian on 2023-07-18

US-10783-11563 [IMP] PO: Fixed translations

6495. By Dorian on 2023-07-24

US-10783 [FIX] PO line: changed reception_dest_id to be a fields.many2one, added patch script to set the value of old PO lines, and fixed data setup in purchase.report

6496. By Dorian on 2023-07-24

US-10783 [FIX] PO line: Fixed data setup in purchase.report

6497. By Dorian on 2023-07-26

US-10783 [FIX] PO: Destination location calculation now uses SQL

6498. By Dorian on 2023-07-31

US-10783 [FIX] PO line destination: Destination is always service for service products, destination is cross docking when the line is linked to a FO even if the product is non-stockable, destination is non-stockable when the product is non-stockable and is from scratch or comes from an IR ; destination is input in all other cases

6499. By Dorian on 2023-08-01

US-10783-11563 [FIX] PO line destination: Fixed destination if the source is an internal IR

=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py	2023-04-05 09:27:49 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py	2023-08-01 08:54:21 +0000
@@ -675,7 +675,6 @@
             values['location_dest_id'] = db_data.get('cd_loc')
         elif wizard.picking_id and wizard.picking_id.type == 'in' and line.product_id.type == 'service_recep':
             values['location_dest_id'] = db_data.get('service_loc')
-            values['cd_from_bo'] = False
         elif wizard.dest_type == 'to_cross_docking' and not service_non_stock_ok:
             if db_data.get('setup').allocation_setup == 'unallocated':
                 raise osv.except_osv(
@@ -685,10 +684,7 @@
             # Below, "source_type" is only used for the outgoing shipment. We set it to "None" because by default it is
             # "default" and we do not want that info on INCOMING shipment
             wizard.source_type = None
-            values.update({
-                'location_dest_id': db_data.get('cd_loc'),
-                'cd_from_bo': False,
-            })
+            values.update({'location_dest_id': db_data.get('cd_loc')})
         elif wizard.dest_type == 'to_stock' or service_non_stock_ok:
             # Below, "source_type" is only used for the outgoing shipment. We set it to "None because by default it is
             # "default" and we do not want that info on INCOMING shipment
@@ -700,8 +696,6 @@
                 # treat moves towards STOCK if NOT SERVICE
                 values['location_dest_id'] = db_data.get('input_loc')
 
-            values['cd_from_bo'] = False
-
         if wizard.dest_type != 'to_cross_docking':
             values['direct_incoming'] = wizard.direct_incoming
 
@@ -1273,8 +1267,7 @@
                     }, context=context)
                     return backorder_id
 
-                self.write(cr, uid, [picking_id], {'backorder_id': backorder_id, 'cd_from_bo': values.get('cd_from_bo', False)},
-                           context=context)
+                self.write(cr, uid, [picking_id], {'backorder_id': backorder_id}, context=context)
 
                 # Claim specific code
                 current_backorder = picking_obj.read(cr, uid, backorder_id, ['backorder_id'], context=context)

=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_purchase.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2017-11-24 09:30:12 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2023-08-01 08:54:21 +0000
@@ -32,8 +32,7 @@
     rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
     if object_ids:
         # Create the rule
-        fields = ['partner_ref', 'details', 'delivery_requested_date', 'delivery_confirmed_date', 'partner_id', 'notes',
-        'order_type', 'categ', 'priority', 'shipped', 'state', 'pricelist_id', 'origin', 'transport_type', 'cross_docking_ok', 'location_id', 'unallocation_ok']
+        fields = ['partner_ref', 'details', 'delivery_requested_date', 'delivery_confirmed_date', 'partner_id', 'notes', 'order_type', 'categ', 'priority', 'shipped', 'state', 'pricelist_id', 'origin', 'transport_type', 'cross_docking_ok', 'unallocation_ok']
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'purchase.order'), ('name', 'in', fields)], context=context)
         vals= {'name': name,
                'object_id': object_ids[0],

=== modified file 'bin/addons/msf_cross_docking/cross_docking.py'
--- bin/addons/msf_cross_docking/cross_docking.py	2021-07-07 16:30:21 +0000
+++ bin/addons/msf_cross_docking/cross_docking.py	2023-08-01 08:54:21 +0000
@@ -34,98 +34,23 @@
 
     _columns = {
         'cross_docking_ok': fields.boolean('Cross docking'),
-        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage', '<>', 'view')],
-                                       help="""This location is set according to the Warehouse selected, or according to the option 'Cross docking'
-        or freely if you do not select 'Warehouse'.But if the 'Order category' is set to 'Transport' or 'Service',
-        you cannot have an other location than 'Service'"""),
     }
 
     _defaults = {
         'cross_docking_ok': False,
     }
 
-    def onchange_internal_type(self, cr, uid, ids, order_type, partner_id, categ, dest_partner_id=False, warehouse_id=False, delivery_requested_date=False):
-        '''
-        Changes destination location
-        '''
-        res = super(purchase_order, self).onchange_internal_type(cr, uid, ids, order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)
-        if order_type == 'direct':
-            location_id = self.onchange_cross_docking_ok(cr, uid, ids, False, warehouse_id, categ)['value']['location_id']
-            if 'value' in res:
-                res['value'].update({'location_id': location_id})
-            else:
-                res.update({'value': {'location_id': location_id}})
-        return res
-
-    def onchange_cross_docking_ok(self, cr, uid, ids, cross_docking_ok, warehouse_id, categ, context=None):
-        """ Finds location id for changed cross_docking_ok.
-        @param cross_docking_ok: Changed value of cross_docking_ok.
-        @return: Dictionary of values.
-        """
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-
-        warning = {}
-        if cross_docking_ok:
-            c_dock_loc = self.pool.get('stock.location').get_cross_docking_location(cr, uid)
-            warning = {
-                'title': _('Warning'),
-                'message': _('The IR lines to an internal location sourced by one of the lines of this PO will not affected by this modification'),
-            }
-        else:
-            warehouse_obj = self.pool.get('stock.warehouse')
-            if not warehouse_id:
-                warehouse_ids = warehouse_obj.search(cr, uid, [], limit=1)
-                if not warehouse_ids:
-                    return {'warning': {'title': _('Error !'), 'message': _('No Warehouse defined !')}, 'value': {'location_id': False}}
-                warehouse_id = warehouse_ids[0]
-            if categ not in ('service', 'transport'):
-                c_dock_loc = warehouse_obj.read(cr, uid, [warehouse_id], ['lot_input_id'])[0]['lot_input_id'][0]
-            else:
-                c_dock_loc = self.pool.get('stock.location').get_service_location(cr, uid)
-        return {
-            'value': {'location_id': c_dock_loc},
-            'warning': warning,
-        }
-
-    def onchange_location_id(self, cr, uid, ids, location_id, categ, context=None):
-        """ If location_id == cross docking we tick the box "cross docking".
-        @param location_id: Changed value of location_id.
-        @return: Dictionary of values.
-        """
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        stock_loc_obj = self.pool.get('stock.location')
-        res = {}
-        res['value'] = {}
-        if location_id == stock_loc_obj.get_cross_docking_location(cr, uid) and categ not in ['service', 'transport']:
-            cross_docking_ok = True
-        elif location_id != stock_loc_obj.get_cross_docking_location(cr, uid):
-            cross_docking_ok = False
-        elif location_id != stock_loc_obj.get_service_location(cr, uid) and categ in ['service', 'transport']:
-            return {'warning': {'title': _('Error !'), 'message': _("""
-            If the 'Order Category' is 'Service' or 'Transport', you cannot have an other location than 'Service'
-            """)}, 'value': {'location_id': stock_loc_obj.get_service_location(cr, uid)}}
-        res['value']['cross_docking_ok'] = cross_docking_ok
-        return res
-
-    def onchange_categ(self, cr, uid, ids, category, warehouse_id, cross_docking_ok, location_id, context=None):
+    def onchange_categ(self, cr, uid, ids, category, context=None):
         """
         Check if the list of products is valid for this new category
         :param cr: Cursor to the database
         :param uid: ID of the res.users that calls the method
         :param ids: List of ID of purchase.order to check
         :param category: DB value of the new choosen category
-        :param warehouse_id: ID of the new stock.warehouse of the PO
-        :param cross_docking_ok: Boolean to know if the PO is a Cross-Docking PO or not
-        :param location_id: ID of the new stock.location of the PO
         :param context: Context of the call
         :return: A dictionary containing the warning message if any
         """
         nomen_obj = self.pool.get('product.nomenclature')
-        loc_obj = self.pool.get('stock.location')
-        wh_obj = self.pool.get('stock.warehouse')
-        setup_obj = self.pool.get('unifield.setup.configuration')
 
         if context is None:
             context = {}
@@ -133,27 +58,9 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        setup = setup_obj.get_config(cr, uid)
-
         value = {}
         message = {}
 
-        # Get specific location ID
-        cross_loc = False
-        service_loc = loc_obj.get_service_location(cr, uid)
-        if setup.allocation_setup != 'unallocated':
-            cross_loc = loc_obj.get_cross_docking_location(cr, uid)
-
-        if cross_docking_ok:
-            value['location_id'] = cross_loc
-        elif category in ['service', 'transport']:
-            value['location_id'] = service_loc
-        elif location_id == service_loc or (setup.allocation_setup != 'unallocated' and location_id == cross_loc):
-            if warehouse_id:
-                value['location_id'] = wh_obj.read(cr, uid, [warehouse_id], ['lot_input_id'])[0]['lot_input_id'][0]
-            else:
-                value['location_id'] = False
-
         res = False
         if ids and category in ['log', 'medical']:
             try:
@@ -203,52 +110,16 @@
             return True
         if isinstance(ids, (int, long)):
             ids = [ids]
-        stock_loc_obj = self.pool.get('stock.location')
-        if 'order_type' in vals and vals['order_type'] == 'direct':
+        if ('order_type' in vals and vals['order_type'] == 'direct') or \
+                ('categ' in vals and vals['categ'] in ['service', 'transport']):
             vals.update({'cross_docking_ok': False})
-        if 'cross_docking_ok' in vals and vals['cross_docking_ok']:
-            vals.update({'location_id': stock_loc_obj.get_cross_docking_location(cr, uid)})
-        elif 'categ' in vals and vals['categ'] in ['service', 'transport']:
-            vals.update({'cross_docking_ok': False, 'location_id': stock_loc_obj.get_service_location(cr, uid)})
         return super(purchase_order, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
-        stock_loc_obj = self.pool.get('stock.location')
-        if vals.get('order_type') == 'direct':
+        if vals.get('order_type') == 'direct' or ('categ' in vals and vals['categ'] in ['service', 'transport']):
             vals.update({'cross_docking_ok': False})
-        if vals.get('cross_docking_ok'):
-            vals.update({'location_id': stock_loc_obj.get_cross_docking_location(cr, uid)})
-        elif 'categ' in vals and vals['categ'] in ['service', 'transport']:
-            vals.update({'cross_docking_ok': False, 'location_id': stock_loc_obj.get_service_location(cr, uid)})
         return super(purchase_order, self).create(cr, uid, vals, context=context)
 
-    def _check_cross_docking(self, cr, uid, ids, context=None):
-        """
-        Check that if you select cross docking, you do not have an other location than cross docking
-        """
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if context is None:
-            context = {}
-        stock_loc_obj = self.pool.get('stock.location')
-        setup = self.pool.get('unifield.setup.configuration').get_config(cr, uid)
-        for purchase in self.browse(cr, uid, ids, context=context):
-            if purchase.cross_docking_ok:
-                if setup.allocation_setup == 'unallocated':
-                    raise osv.except_osv(_('Error'), _("""The Allocated stocks setup is set to Unallocated.
-In this configuration, you cannot made a Cross-docking Purchase order."""))
-                cross_docking_location = stock_loc_obj.get_cross_docking_location(cr, uid)
-                if purchase.location_id.id != cross_docking_location:
-                    raise osv.except_osv(_('Warning !'), _("""If you tick the box \"cross docking\",
-you cannot have an other location than \"Cross docking\""""))
-                else:
-                    return True
-            else:
-                return True
-
-    _constraints = [
-        (_check_cross_docking, 'If you tick the box \"cross docking\", you cannot have an other location than \"Cross docking\"', ['location_id']),
-    ]
 
 purchase_order()
 

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2022-06-29 15:47:02 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py	2023-08-01 08:54:21 +0000
@@ -338,7 +338,7 @@
                                 # update POL :
                                 purchase_line_obj.write(cr, uid, rfq_line_ids, to_write, context=context)
 
-                        else: # its not RfQ
+                        else:  # it's not RfQ
                             purchase_line_obj.create(cr, uid, to_write, context=context)
 
 
@@ -398,9 +398,8 @@
                         cr.execute("RELEASE SAVEPOINT line_save")
 
                 if not blocker_msg:
-                    categ_log = purchase_obj.onchange_categ(
-                        cr, uid, [wiz.po_id.id], wiz.po_id.categ, wiz.po_id.warehouse_id.id, wiz.po_id.cross_docking_ok,
-                        wiz.po_id.location_id.id, context=context).get('warning', {}).get('message', '').upper()
+                    categ_log = purchase_obj.onchange_categ(cr, uid, [wiz.po_id.id], wiz.po_id.categ,
+                                                            context=context).get('warning', {}).get('message', '').upper()
                     categ_log = categ_log.replace('THIS', 'THE')
 
         wizard_vals = {'percent_completed': 100}

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2022-06-08 13:47:24 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2023-08-01 08:54:21 +0000
@@ -284,25 +284,20 @@
             vals['linked_to_out'] = False
 
         if not vals.get('dest_type', False):
-            cd_move = move_obj.search(cr, uid, [
+            cd_move = move_obj.search_exist(cr, uid, [
                 ('picking_id', '=', picking.id),
                 ('location_dest_id.cross_docking_location_ok', '=', True),
-            ], count=True, context=context)
-            in_move = move_obj.search(cr, uid, [
+            ], context=context)
+            in_move = move_obj.search_exist(cr, uid, [
                 ('picking_id', '=', picking.id),
                 ('location_dest_id.input_ok', '=', True),
-            ], count=True, context=context)
+            ], context=context)
 
-            if cd_move and in_move:
+            if (cd_move and in_move) or (not cd_move and not in_move):
                 vals['dest_type'] = 'default'
-            elif not picking.backorder_id:
-                if picking.purchase_id and picking.purchase_id.cross_docking_ok:
-                    vals['dest_type'] = 'to_cross_docking'
-                elif picking.purchase_id:
-                    vals['dest_type'] = 'to_stock'
-            elif picking.cd_from_bo or (cd_move and not in_move):
+            elif cd_move and not in_move:
                 vals['dest_type'] = 'to_cross_docking'
-            elif not picking.cd_from_bo or (in_move and not cd_move):
+            elif not cd_move and in_move:
                 vals['dest_type'] = 'to_stock'
 
         if not vals.get('source_type', False):

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2023-07-20 07:43:37 +0000
+++ bin/addons/msf_profile/data/patches.xml	2023-08-01 08:54:21 +0000
@@ -947,6 +947,7 @@
         <record id="us_11130_trigger_down_account_mapping" model="patch.scripts">
             <field name="method">us_11130_trigger_down_account_mapping</field>
         </record>
+<<<<<<< TREE
 
         <record id="us_11448_update_rfq_line_state" model="patch.scripts">
             <field name="method">us_11448_update_rfq_line_state</field>
@@ -961,5 +962,12 @@
         </record>
 
 
+=======
+
+        <!-- UF30.0 -->
+        <record id="us_10783_11563_po_reception_destination" model="patch.scripts">
+            <field name="method">us_10783_11563_po_reception_destination</field>
+        </record>
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
--- bin/addons/msf_profile/i18n/es_MF.po	2023-04-17 12:42:12 +0000
+++ bin/addons/msf_profile/i18n/es_MF.po	2023-08-01 08:54:21 +0000
@@ -71321,11 +71321,6 @@
 msgid "Theoretical Kit Composition"
 msgstr "Composición de kit teórico "
 
-#. module: order_types
-#: field:stock.picking,cd_from_bo:0
-msgid "CD from BO"
-msgstr "CD de BO"
-
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-07-20 07:58:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-08-01 08:54:21 +0000
@@ -600,12 +600,6 @@
 msgid "Cost Center:"
 msgstr "Centre de Coût"
 
-#. module: msf_cross_docking
-#: code:addons/msf_cross_docking/cross_docking.py:80
-#, python-format
-msgid "No Warehouse defined !"
-msgstr "Pas d'Entrepôt défini !"
-
 #. modules: account, msf_instance
 #: field:account.journal,default_debit_account_id:0
 #: field:account.journal.fake,default_debit_account_id:0
@@ -6269,12 +6263,6 @@
 msgid "unconsistent.stock.report.line"
 msgstr "unconsistent.stock.report.line"
 
-#. module: msf_cross_docking
-#: code:addons/msf_cross_docking/cross_docking.py:73
-#, python-format
-msgid "The IR lines to an internal location sourced by one of the lines of this PO will not affected by this modification"
-msgstr "The IR lines to an internal location sourced by one of the lines of this PO will not affected by this modification"
-
 #. module: msf_field_access_rights
 #: model:ir.actions.act_window,name:msf_field_access_rights.field_access_rule_line_list
 #: model:ir.ui.menu,name:msf_field_access_rights.field_access_rule_line_list_menu
@@ -35128,13 +35116,11 @@
 "    "
 
 #. module: purchase
-#: help:purchase.order,location_id:0
-msgid "This location is set according to the Warehouse selected, or according to the option 'Cross docking'\n"
-"        or freely if you do not select 'Warehouse'.But if the 'Order category' is set to 'Transport' or 'Service',\n"
-"        you cannot have an other location than 'Service'"
-msgstr "Ce lieu est configuré selon l'entrepôt sélectionné ou selon l'option 'Transbordement'\n"
-"        ou librement si vous ne sélectionnez pas 'Entrepôt'. Mais si, pour la 'Catégorie de commande', il est indiqué 'Transport' ou 'Service',\n"
-"        vous ne pouvez pas avoir un autre zone que 'Service'"
+#: help:purchase.order,location_names:0
+msgid "This location is set according to the origin of the line(s) of the document. \n"
+"        It can have 'Input', 'Cross Docking', 'Non-Stockable' and/or 'Service' as data"
+msgstr "Ce lieu est configuré selon l'origine des lignes du document. \n"
+"        Il peut avoir 'Entrée', 'Transbordement', 'Non Stockable' et/ou 'Service' comme donnée"
 
 #. module: base
 #: selection:res.config.users,context_tz:0
@@ -50667,14 +50653,6 @@
 msgid "Comment written"
 msgstr "Commentaire écrit"
 
-#. module: msf_cross_docking
-#: code:addons/msf_cross_docking/cross_docking.py:238
-#, python-format
-msgid "The Allocated stocks setup is set to Unallocated.\n"
-"In this configuration, you cannot made a Cross-docking Purchase order."
-msgstr "La configuration des stocks alloués est configurée sur Non alloués.\n"
-"Dans cette configuration, vous ne pouvez pas établir de bon de commande de transbordement."
-
 #. module: sales_followup
 #: report:sales.follow.up.report_pdf:0
 msgid "FIELD ORDER FOLLOW UP"
@@ -59193,9 +59171,10 @@
 msgid "PO File"
 msgstr "Fichier au format PO"
 
-#. module: msf_cross_docking, product_attributes
+#. module: msf_cross_docking, product_attributes, purchase
 #: model:stock.location,name:msf_cross_docking.stock_location_input
 #: code:addons/product_attributes/report/merged_ud_products.py:139
+#: code:addons/purchase/purchase_order.py:544
 msgid "Input"
 msgstr "Entrée"
 
@@ -71736,14 +71715,6 @@
 msgid "Commitments voucher"
 msgstr "Bon d'Engagement"
 
-#. module: msf_cross_docking
-#: code:addons/msf_cross_docking/cross_docking.py:242
-#, python-format
-msgid "If you tick the box \"cross docking\",\n"
-"you cannot have an other location than \"Cross docking\""
-msgstr "Si vous cochez la case \"transbordement\",\n"
-"vous ne pouvez pas avoir un autre lieu que \"Transbordement\""
-
 #. modules: register_accounting, account_mcdb
 #: view:account.move:0
 #: view:account.move.line:0
@@ -82712,11 +82683,6 @@
 msgid "]"
 msgstr "]"
 
-#. module: order_types
-#: field:stock.picking,cd_from_bo:0
-msgid "CD from BO"
-msgstr "CD from BO"
-
 #. modules: purchase_msf, purchase_override, msf_partner, product_manufacturer, product_attributes
 #: field:product.supplierinfo,check_manufacturer:0
 #: field:product.supplierinfo,manufacturer_id:0
@@ -83035,16 +83001,6 @@
 msgid "Delivered"
 msgstr "Livré"
 
-#. module: msf_cross_docking
-#: code:addons/msf_cross_docking/cross_docking.py:106
-#, python-format
-msgid "\n"
-"            If the 'Order Category' is 'Service' or 'Transport', you cannot have an other location than 'Service'\n"
-"            "
-msgstr "\n"
-"            Si la 'Catégorie d'ordre' est 'Service' ou 'Transport', vous ne pouvez avoir un autre lieu que 'Service'\n"
-"            "
-
 #. modules: msf_field_access_rights, sync_client, msf_audittrail, msf_doc_import, procurement_cycle
 #: field:audittrail.log.line,rule_id:0
 #: view:msf_field_access_rights.field_access_rule_line:0
@@ -83694,27 +83650,6 @@
 msgid "Open CSV file"
 msgstr "Ouvrir le fichier CSV"
 
-#. modules: msf_cross_docking, purchase, register_accounting, finance, sales_followup, service_purchasing, sourcing, specific_rules, transport_mgmt, purchase_allocation_report, order_line_number, msf_audittrail, delete_button, tender_flow, msf_doc_import, res_currency_functional, sync_so
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-#: constraint:purchase.order:0
-msgid "If you tick the box \"cross docking\", you cannot have an other location than \"Cross docking\""
-msgstr "Si vous cochez la case \"transbordement\", vous ne pouvez pas avoir d'autre lieu que \"Transbordement\""
-
 #. module: msf_doc_import
 #: model:ir.model,name:msf_doc_import.model_wizard_import_threshold_value_line
 msgid "Import Threshold value lines from Excel sheet"
@@ -95767,7 +95702,8 @@
 #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:243
 #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:249
 #: report:po.follow.up_rml:0
-#: field:purchase.order,location_id:0
+#: field:purchase.order,location_ids:0
+#: field:purchase.order,location_names:0
 #: report:addons/purchase_allocation_report/report/po_allocation_report.mako:229
 #: report:addons/purchase_allocation_report/report/po_line_allocation_report.mako:183
 #: report:po.line.allocation.report:0
@@ -120555,6 +120491,7 @@
 #: view:res.company:0
 msgid "HQ System Accounts Mapping"
 msgstr "Association comptes HQ"
+<<<<<<< TREE
 
 #. module: msf_supply_doc_export
 #: report:po.follow.up_rml:0
@@ -120762,3 +120699,11 @@
 #, python-format
 msgid "%s line %s %s: Percentage is mandatory"
 msgstr "%s ligne %s %s: Le Pourcentage est obligatoire"
+=======
+
+#. modules: purchase, purchase_override
+#: field:purchase.order.line,reception_dest_id:0
+#: field:purchase.order.merged.line,reception_dest_id:0
+msgid "Line Destination"
+msgstr "Destination de la ligne"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2023-07-20 07:43:37 +0000
+++ bin/addons/msf_profile/msf_profile.py	2023-08-01 08:54:21 +0000
@@ -109,6 +109,65 @@
 
 
 
+    # UF30.0
+    def us_10783_11563_po_reception_destination(self, cr, uid, *a, **b):
+        '''
+        For each PO line, look at its origin to set the reception_destination_id. It can be Cross Docking, Service,
+        Non-Stockable or Input
+        '''
+        data_obj = self.pool.get('ir.model.data')
+        srv_id = self.pool.get('stock.location').get_service_location(cr, uid, context={})
+        input_id = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
+        cross_id = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_cross_docking')[1]
+        n_stock_id = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
+
+        # Cross Docking: PO line linked to a FO and product is not Service or an IR to Ext CU and product is neither
+        # Service or Non-Stockable
+        cr.execute("""UPDATE purchase_order_line SET reception_dest_id = %s WHERE id IN (
+            SELECT pl.id FROM purchase_order_line pl 
+                LEFT JOIN product_product pp ON pl.product_id = pp.id
+                LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
+                LEFT JOIN sale_order so ON pl.link_so_id = so.id 
+                LEFT JOIN stock_location l ON so.location_requestor_id = l.id
+            WHERE pl.link_so_id = so.id AND ((pt.type != 'service_recep' AND so.procurement_request = 'f') OR 
+                (pt.type NOT IN ('service_recep', 'consu') AND so.location_requestor_id IS NOT NULL AND l.usage = 'customer'))
+        )""", (cross_id,))
+        self.log_info(cr, uid, "US-10783-11563: The Line Destination of %s PO line(s) have been set to 'Cross Docking'" % (cr.rowcount,))
+
+        # Service: PO line from scratch or linked to internal IR and product is Service
+        cr.execute("""UPDATE purchase_order_line SET reception_dest_id = %s WHERE id IN (
+            SELECT pl.id FROM purchase_order_line pl
+                LEFT JOIN product_product pp ON pl.product_id = pp.id
+                LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
+            WHERE pt.type = 'service_recep'
+        )""", (srv_id,))
+        self.log_info(cr, uid, "US-10783-11563: The Line Destination of %s PO line(s) have been set to 'Service'" % (cr.rowcount,))
+
+        # Non-Stockable: PO line from scratch or linked to internal IR and product is Non-Stockable
+        cr.execute("""UPDATE purchase_order_line SET reception_dest_id = %s WHERE id IN (
+            SELECT pl.id FROM purchase_order_line pl
+                LEFT JOIN product_product pp ON pl.product_id = pp.id
+                LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
+                LEFT JOIN sale_order so ON pl.link_so_id = so.id 
+                LEFT JOIN stock_location l ON so.location_requestor_id = l.id
+            WHERE pt.type = 'consu' AND (pl.link_so_id IS NULL OR so.procurement_request = 't')
+        )""", (n_stock_id,))
+        self.log_info(cr, uid, "US-10783-11563: The Line Destination of %s PO line(s) have been set to 'Non-Stockable'" % (cr.rowcount,))
+
+        # Input: All others
+        cr.execute("""UPDATE purchase_order_line SET reception_dest_id = %s WHERE id IN (
+            SELECT pl.id FROM purchase_order_line pl
+                LEFT JOIN product_product pp ON pl.product_id = pp.id
+                LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
+                LEFT JOIN sale_order so ON pl.link_so_id = so.id 
+                LEFT JOIN stock_location l ON so.location_requestor_id = l.id
+            WHERE (pl.product_id IS NULL OR pt.type NOT IN ('service_recep', 'consu')) 
+                AND (pl.link_so_id IS NULL OR (so.procurement_request = 't' AND l.usage != 'customer'))
+        )""", (input_id,))
+        self.log_info(cr, uid, "US-10783-11563: The Line Destination of %s PO line(s) have been set to 'Input'" % (cr.rowcount,))
+
+        return True
+
     # UF29.0
     def us_11399_oca_mm_target(self, cr, uid, *a, **b):
         if self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id:

=== modified file 'bin/addons/order_types/stock.py'
--- bin/addons/order_types/stock.py	2022-05-17 12:44:46 +0000
+++ bin/addons/order_types/stock.py	2023-08-01 08:54:21 +0000
@@ -130,7 +130,6 @@
     _columns = {
         'certificate_donation': fields.function(_get_certificate, string='Certif ?', type='boolean', method=True),
         'attach_cert': fields.boolean(string='Certificate attached ?', readonly=True),
-        'cd_from_bo':  fields.boolean(string='CD from BO'),
     }
 
     _defaults = {

=== modified file 'bin/addons/purchase/purchase_order.py'
--- bin/addons/purchase/purchase_order.py	2023-02-17 13:56:40 +0000
+++ bin/addons/purchase/purchase_order.py	2023-08-01 08:54:21 +0000
@@ -528,6 +528,33 @@
 
         return res
 
+    def _get_location_data(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        for po in self.browse(cr, uid, ids, fields_to_fetch=['order_line', 'state'], context=context):
+            if po.order_line:
+                not_cancel = ""
+                if po.state != 'cancel':
+                    not_cancel = " AND pl.state NOT IN ('cancel', 'cancel_r')"
+                cr.execute("""
+                    SELECT DISTINCT(l.id), l.name FROM purchase_order p 
+                        LEFT JOIN purchase_order_line pl ON pl.order_id = p.id
+                        LEFT JOIN stock_location l ON pl.reception_dest_id = l.id
+                    WHERE p.id = %s""" + not_cancel, (po.id,))
+                location_ids = []
+                location_names = []
+                for loc in cr.fetchall():
+                    location_ids.append(loc[0])
+                    location_names.append(loc[1])
+                res[po.id] = {
+                    'location_ids': location_ids,
+                    'location_names': "; ".join(location_names)
+                }
+            else:
+                input_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'msf_cross_docking',
+                                                                               'stock_location_input')[1]
+                res[po.id] = {'location_ids': [input_id], 'location_names': _('Input')}
+        return res
+
     def _get_less_advanced_pol_state(self, cr, uid, ids, field_name, arg, context=None):
         """
         Get the less advanced state of the purchase order lines
@@ -908,7 +935,10 @@
                                            "In this case, it will remove the warehouse link and set the customer location."
                                            ),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
-        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage', '<>', 'view')]),
+        'location_ids': fields.function(_get_location_data, type='many2many', relation='stock.location', string='Destination', method=True, multi='location_data', readonly=True),
+        'location_names': fields.function(_get_location_data, type='char', size=256, string='Destination', method=True, multi='location_data',
+                                          readonly=True, store=False, help="""This location is set according to the origin of the line(s) of the document. 
+        It can have 'Input', 'Cross Docking', 'Non-Stockable' and/or 'Service' as data"""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
         'state': fields.function(_get_less_advanced_pol_state, string='Order State', method=True, type='selection', selection=PURCHASE_ORDER_STATE_SELECTION, readonly=True,
                                  store={
@@ -1177,8 +1207,6 @@
 
         if 'partner_id' in vals:
             self._check_user_company(cr, uid, vals['partner_id'], context=context)
-        # we need to update the location_id because it is readonly and so does not pass in the vals of create and write
-        vals = self._get_location_id(cr, uid, vals, warehouse_id=vals.get('warehouse_id', False), context=context)
         res = super(purchase_order, self).create(cr, uid, vals, context=context)
 
         if vals.get('stock_take_date'):
@@ -1305,8 +1333,7 @@
                     vals.update({'invoice_method': 'manual'})
                 else:
                     vals.update({'invoice_method': 'picking'})
-            # we need to update the location_id because it is readonly and so does not pass in the vals of create and write
-            vals = self._get_location_id(cr, uid, vals,  warehouse_id=vals.get('warehouse_id', order['warehouse_id'] and order['warehouse_id'][0] or False), context=context)
+
             # FIXME here it is useless to continue as the next loop will overwrite vals
             break
 
@@ -1846,7 +1873,7 @@
                   'categ', 'priority', 'internal_type', 'arrival_date',
                   'transport_type', 'shipment_date', 'ready_to_ship_date',
                   'cross_docking_ok', 'delivery_confirmed_date',
-                  'est_transport_lead_time', 'location_id',
+                  'est_transport_lead_time',
                   'dest_address_id', 'incoterm_id']
 
         delivery_requested_date = getattr(order_id, 'delivery_requested_date')
@@ -1940,7 +1967,6 @@
                     'partner_address_id': porder.partner_address_id.id,
                     'dest_address_id': porder.dest_address_id.id,
                     'warehouse_id': porder.warehouse_id.id,
-                    'location_id': porder.location_id.id,
                     'pricelist_id': porder.pricelist_id.id,
                     'state': 'draft',
                     'order_line': [],
@@ -2286,8 +2312,7 @@
         '''
         res = {}
         if not warehouse_id:
-            wh_info = self.pool.get('stock.warehouse').read(cr, uid, [warehouse_id], ['lot_input_id'])
-            res = {'value': {'location_id': wh_info[0]['lot_input_id'][0], 'dest_address_id': False, 'cross_docking_ok': False}}
+            res = {'value': {'dest_address_id': False, 'cross_docking_ok': False}}
 
         if not res.get('value', {}).get('dest_address_id') and order_type != 'direct':
             cp_address_id = self.pool.get('res.partner').address_get(cr, uid, self.pool.get('res.users').browse(cr, uid, uid).company_id.partner_id.id, ['delivery'])['delivery']
@@ -2544,22 +2569,6 @@
         if not pol:
             return False
 
-        dest = pol.order_id.location_id.id
-        if pol.product_id.type == 'service_recep' and not pol.order_id.cross_docking_ok:
-            # service with reception are directed to Service Location
-            dest = self.pool.get('stock.location').get_service_location(cr, uid)
-        else:
-            sol = pol.linked_sol_id
-            if sol and sol.order_id and not sol.order_id.procurement_request:
-                # source a FO line => go to Cross Dock (set at PO header)
-                pass
-            elif pol.product_id.type == 'service_recep':
-                dest = self.pool.get('stock.location').get_service_location(cr, uid)
-            elif pol.product_id.type == 'consu':
-                dest = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
-            elif sol and sol.order_id and sol.order_id.location_requestor_id.usage != 'customer':
-                dest = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
-            # please also check in delivery_mechanism/delivery_mechanism.py _get_values_from_line to set location_dest_id
         values = {
             'name': ''.join((pol.order_id.name, ': ', (pol.name or ''))),
             'product_id': pol.product_id.id,
@@ -2568,7 +2577,7 @@
             'product_uom': pol.product_uom.id,
             'product_uos': pol.product_uom.id,
             'location_id': pol.order_id.partner_id.property_stock_supplier.id,
-            'location_dest_id': dest,
+            'location_dest_id': pol.reception_dest_id.id,
             'picking_id': incoming.id,
             'move_dest_id': pol.move_dest_id.id,
             'state': 'draft',
@@ -2608,7 +2617,7 @@
             return False
 
         # compute source location:
-        src_location = pol.order_id.location_id
+        src_location = pol.reception_dest_id
 
         # compute destination location
         dest = self.pool.get('purchase.order.line').final_location_dest(cr, uid, pol, context=context)
@@ -2646,34 +2655,6 @@
 
         return move_obj.create(cr, uid, values, context=ctx)
 
-    def _get_location_id(self, cr, uid, vals, warehouse_id=False, context=None):
-        """
-        Get the location_id according to the cross_docking_ok option
-        Return vals
-        """
-        if 'cross_docking_ok' not in vals:
-            return vals
-
-        stock_warehouse_obj = self.pool.get('stock.warehouse')
-        if not warehouse_id:
-            warehouse_id = stock_warehouse_obj.search(cr, uid, [], context=context)[0]
-
-        if isinstance(warehouse_id, (str, unicode)):
-            try:
-                warehouse_id = int(warehouse_id)
-            except ValueError:
-                raise osv.except_osv(
-                    _('Error'),
-                    _('The field \'warehouse_id\' is a float field but value is a string - Please contact your administrator'),
-                )
-
-        if not vals.get('cross_docking_ok', False):
-            vals.update({'location_id': stock_warehouse_obj.read(cr, uid, warehouse_id, ['lot_input_id'], context=context)['lot_input_id'][0]})
-        elif vals.get('cross_docking_ok', False):
-            vals.update({'location_id': self.pool.get('stock.location').get_cross_docking_location(cr, uid)})
-
-        return vals
-
     def set_manually_done(self, cr, uid, ids, all_doc=True, context=None):
         '''
         Set the PO to done state

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2023-06-13 13:00:48 +0000
+++ bin/addons/purchase/purchase_order_line.py	2023-08-01 08:54:21 +0000
@@ -587,6 +587,7 @@
                                     ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null', select=True),
         'location_dest_id': fields.many2one('stock.location', 'Final Destination of move', ondelete='set null', select=True),
+        'reception_dest_id': fields.many2one('stock.location', string='Line Destination', ondelete='set null', select=True),
         'price_unit': fields.float('Unit Price', required=True,
                                    digits_compute=dp.get_precision('Purchase Price Computation'), en_thousand_sep=False),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False,
@@ -1308,6 +1309,8 @@
             #if not product_id and not vals.get('name'):  # US-3530
             #    vals.update({'name': 'None'})
 
+        vals['reception_dest_id'] = self.get_reception_dest(cr, uid, vals, context=context)
+
         # add the database Id to the sync_order_line_db_id
         po_line_id = super(purchase_order_line, self).create(cr, uid, vals, context=context)
         if not vals.get('sync_order_line_db_id', False):  # 'sync_order_line_db_id' not in vals or vals:
@@ -1383,6 +1386,8 @@
             default.update({'stock_take_date': False, 'loan_line_id': False})
             if 'location_dest_id' not in default:
                 default['location_dest_id'] = False
+            if 'reception_dest_id' not in default:
+                default['reception_dest_id'] = False
 
         # from RfQ line to PO line: grab the linked sol if has:
         if pol.order_id.rfq_ok and context.get('generate_po_from_rfq', False):
@@ -1481,6 +1486,8 @@
             if line.state == 'draft' and 'price_unit' in new_vals:
                 new_vals['original_price'] = new_vals.get('price_unit')
 
+            new_vals['reception_dest_id'] = self.get_reception_dest(cr, uid, new_vals, pol=line, context=context)
+
             res = super(purchase_order_line, self).write(cr, uid, [line.id], new_vals, context=context)
 
             if self._name != 'purchase.order.merged.line' and vals.get('origin') and not vals.get('linked_sol_id', line.linked_sol_id):
@@ -2303,7 +2310,7 @@
     def final_location_dest(self, cr, uid, pol_obj, fo_obj=False, context=None):
         data_obj = self.pool.get('ir.model.data')
 
-        dest = pol_obj.order_id.location_id.id
+        dest = pol_obj.reception_dest_id.id
 
         if not pol_obj.product_id:
             return dest
@@ -2319,7 +2326,7 @@
         if fo and fo.procurement_request and fo.location_requestor_id.usage != 'customer':
             return fo.location_requestor_id.id
 
-        chained = self.pool.get('stock.location').chained_location_get(cr, uid, pol_obj.order_id.location_id, product=pol_obj.product_id, context=context)
+        chained = self.pool.get('stock.location').chained_location_get(cr, uid, pol_obj.reception_dest_id, product=pol_obj.product_id, context=context)
         if chained:
             if chained[0].chained_location_type == 'nomenclature':
                 # 1st round : Input > Stock, 2nd round Stock -> MED/LOG
@@ -2330,6 +2337,52 @@
 
         return dest
 
+    def get_reception_dest(self, cr, uid, vals, pol=None, context=None):
+        '''
+        Get the location the linked IN move will be sent to during reception
+        '''
+        if context is None:
+            context = {}
+
+        prod_obj = self.pool.get('product.product')
+        data_obj = self.pool.get('ir.model.data')
+        srv_id = self.pool.get('stock.location').get_service_location(cr, uid, context=context)
+        input_id = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_input')[1]
+        cross_id = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_cross_docking')[1]
+        n_stock_id = data_obj.get_object_reference(cr, uid, 'stock_override', 'stock_location_non_stockable')[1]
+
+        product_type, so = False, False
+        if pol:
+            if 'product_id' in vals and vals.get('product_id'):
+                product_type = prod_obj.read(cr, uid, vals['product_id'], ['type'], context=context)['type']
+            else:
+                product_type = pol.product_id.type
+            if 'link_so_id' in vals and vals.get('link_so_id'):
+                ftf = ['procurement_request', 'location_requestor_id']
+                so = self.pool.get('sale.order').browse(cr, uid, vals['link_so_id'], fields_to_fetch=ftf, context=context)
+            else:
+                so = pol.linked_sol_id and pol.linked_sol_id.order_id or pol.link_so_id or False
+        else:
+            if 'product_id' in vals and vals.get('product_id'):
+                product_type = prod_obj.read(cr, uid, vals['product_id'], ['type'], context=context)['type']
+            if 'linked_sol_id' in vals and vals.get('linked_sol_id'):
+                so = self.pool.get('sale.order.line').browse(cr, uid, vals['linked_sol_id'],
+                                                             fields_to_fetch=['order_id'], context=context).order_id
+
+        dest = input_id
+        # please also check in delivery_mechanism/delivery_mechanism.py _get_values_from_line to set location_dest_id
+        if product_type == 'service_recep':
+            dest = srv_id
+        elif so:
+            if product_type == 'consu' and so.procurement_request:
+                dest = n_stock_id
+            elif not so.procurement_request or (so.procurement_request and so.location_requestor_id.usage == 'customer'):
+                dest = cross_id
+        elif product_type == 'consu':
+            dest = n_stock_id
+
+        return dest
+
     def open_po_form(self, cr, uid, ids, context=None):
         pol = self.browse(cr, uid, ids[0], fields_to_fetch=['order_id'], context=context)
 

=== modified file 'bin/addons/purchase/purchase_view.xml'
--- bin/addons/purchase/purchase_view.xml	2023-04-26 14:00:21 +0000
+++ bin/addons/purchase/purchase_view.xml	2023-08-01 08:54:21 +0000
@@ -194,7 +194,7 @@
                         <field name="order_type" on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('order_type', '=', 'loan_return')]}"/>
                         <field name="priority" attrs="{'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                         <newline/>
-                        <field name="categ" on_change="onchange_categ(categ, warehouse_id, cross_docking_ok, location_id)" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                        <field name="categ" on_change="onchange_categ(categ)" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                         <field name="details" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
                         <newline/>
                     </group>
@@ -372,7 +372,7 @@
                                 <field name="dest_partner_id" attrs="{'invisible': [('order_type', '!=', 'direct')], 'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}" on_change="on_change_dest_partner_id(dest_partner_id)" domain="[('id', '!=', company_id), ('available_on_po_dpo', '=', active_id)]"/>
                                 <field name="dest_address_id" domain="[('dest_address', '=', dest_partner_id)]" attrs="{'required': [('order_type', '=', 'direct')], 'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated'])]}"/>
                                 <field name="cross_docking_ok" invisible="1" />
-                                <field name="location_id" domain="[('usage', '=', 'internal')]" readonly="1" on_change="onchange_location_id(location_id,categ)"/>
+                                <field name="location_names" readonly="1"/>
                                 <field name="incoterm_id" attrs="{'invisible': [('intl_supplier_ok', '=', False)], 'readonly': [('state', 'not in', ['draft', 'draft_p', 'validated', 'validated_p'])]}" widget="selection"/>
                             </group>
                             <newline/>
@@ -703,7 +703,7 @@
                                 <field name="display_resourced_orig_line" readonly="1"/>
                                 <field name="display_sync_ref" invisible="1"/>
                                 <field name="instance_sync_order_ref" attrs="{'required': [('display_sync_ref', '=', True), ('created_by_vi_import', '=', False)], 'invisible': ['|', ('display_sync_ref', '=', False), ('origin', '=', False)]}" domain="[('order_id.name', '=', origin)]"/>
-
+                                <field name="reception_dest_id" readonly="1"/>
 
                             <separator string="Changes" colspan="5"/>
                             <group colspan="5" col="8">

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2023-06-13 13:00:48 +0000
+++ bin/addons/purchase/purchase_workflow.py	2023-08-01 08:54:21 +0000
@@ -797,7 +797,7 @@
                     self.pool.get('stock.move').in_action_confirm(cr, uid, incoming_move_id, context)
 
                 # create internal moves (INT):
-                if pol.order_id.location_id.input_ok and pol.product_id.type not in ('service_recep', 'consu'):
+                if pol.reception_dest_id.input_ok and pol.product_id.type not in ('service_recep', 'consu'):
                     internal_pick = self.pool.get('stock.picking').search(cr, uid, [
                         ('type', '=', 'internal'),
                         ('purchase_id', '=', pol.order_id.id),

=== modified file 'bin/addons/purchase/report/purchase_report.py'
--- bin/addons/purchase/report/purchase_report.py	2018-10-30 10:56:14 +0000
+++ bin/addons/purchase/report/purchase_report.py	2023-08-01 08:54:21 +0000
@@ -97,7 +97,7 @@
                     else
                         u.id
                     end) as product_uom,
-                    s.location_id as location_id,
+                    l.reception_dest_id as location_id,
                     sum(l.product_qty/u.factor) as quantity,
                     extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay,
                     extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
@@ -119,7 +119,7 @@
                     s.partner_id,
                     l.product_qty,
                     u.factor,
-                    s.location_id,
+                    l.reception_dest_id,
                     l.price_unit,
                     s.date_approve,
                     l.date_planned,

=== modified file 'bin/addons/sync_so/purchase.py'
--- bin/addons/sync_so/purchase.py	2023-04-03 15:05:12 +0000
+++ bin/addons/sync_so/purchase.py	2023-08-01 08:54:21 +0000
@@ -827,7 +827,6 @@
         original_po = self.browse(cr, uid, po_id, context=context)
         # UTP-661: Get the 'Cross Docking' value of the original PO, and add it into the split PO
         header_result['cross_docking_ok'] = original_po['cross_docking_ok']
-        header_result['location_id'] = original_po.location_id.id
 
         default = {}
         default.update(header_result)

=== modified file 'bin/addons/sync_so/so_po_common.py'
--- bin/addons/sync_so/so_po_common.py	2023-01-30 15:49:16 +0000
+++ bin/addons/sync_so/so_po_common.py	2023-08-01 08:54:21 +0000
@@ -265,7 +265,6 @@
 
         partner_id = self.get_partner_id(cr, uid, source, context)
         address_id = self.get_partner_address_id(cr, uid, partner_id, context=context)
-        location_id = self.get_location(cr, uid, partner_id, context)
         # just roll back what has been modified --- NO MODIF HERE!
         price_list = self.get_price_list_id(cr, uid, partner_id, context)
 
@@ -273,7 +272,6 @@
         header_result['partner_id'] = partner_id
         header_result['partner_address_id'] = address_id
         header_result['pricelist_id'] = price_list
-        header_result['location_id'] = location_id
 
         return header_result
 

=== modified file 'bin/addons/tender_flow/report/purchase_report.py'
--- bin/addons/tender_flow/report/purchase_report.py	2022-12-12 15:51:35 +0000
+++ bin/addons/tender_flow/report/purchase_report.py	2023-08-01 08:54:21 +0000
@@ -116,7 +116,7 @@
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
-                    s.location_id as location_id,
+                    l.reception_dest_id as location_id,
                     s.warehouse_id as warehouse_id,
                     (case when cc.percentage is not null then
                         cc.analytic_id
@@ -188,7 +188,7 @@
                     ccp.percentage,
                     s.partner_id,
                     part.zone,
-                    s.location_id,
+                    l.reception_dest_id,
                     l.price_unit,
                     s.date_approve,
                     l.date_planned,

=== modified file 'bin/addons/tender_flow/tender_flow_view.xml'
--- bin/addons/tender_flow/tender_flow_view.xml	2023-07-13 11:47:42 +0000
+++ bin/addons/tender_flow/tender_flow_view.xml	2023-08-01 08:54:21 +0000
@@ -289,7 +289,7 @@
                         <field name="order_type" on_change="onchange_internal_type(order_type, partner_id, categ, dest_partner_id, warehouse_id, delivery_requested_date)" attrs="{'readonly': [('rfq_state', 'in', ['updated','done','cancel'])]}"/>
                         <field name="priority" attrs="{'readonly': [('rfq_state', 'in', ['updated','done','cancel'])]}"/>
                         <newline />
-                        <field name="categ" on_change="onchange_categ(categ, warehouse_id, cross_docking_ok, location_id)" attrs="{'readonly': [('rfq_state', 'in', ['updated','done','cancel'])]}"/>
+                        <field name="categ" on_change="onchange_categ(categ)" attrs="{'readonly': [('rfq_state', 'in', ['updated','done','cancel'])]}"/>
                         <field name="details" attrs="{'readonly': [('rfq_state', 'in', ['updated','done','cancel'])]}"/>
                         <field name="parent_order_name" readonly="True" attrs="{'invisible': [('parent_order_name', '=', False)]}" />
                         <newline />