Merge lp:~jfb-tempo-consulting/unifield-server/US-9495 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-12-30 12:38:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-01-10 08:45:42 +0000
@@ -116921,8 +116921,9 @@
 msgid "No signature defined in user's profile"
 msgstr "Aucun signature dans le profil de l'utilisateur"
 
-#. module: purchase
+#. module: purchase, sale
 #: field:purchase.order,nb_creation_message_nr:0
+#: field:sale.order,nb_creation_message_nr:0
 msgid "Number of NR creation messages"
 msgstr "Nombre de messages NR"
 
@@ -117897,6 +117898,7 @@
 #, python-format
 msgid "Both EoY Revaluation have been done in %s"
 msgstr "Les deux réévaluations de fin d'année ont déjà été faite dans %s"
+<<<<<<< TREE
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_import.py:251
@@ -117959,3 +117961,28 @@
 #, python-format
 msgid "Active column is missing or empty at line %d"
 msgstr "Valeur manquante ou vide dans la colonne statut à la ligne %d"
+=======
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "Activate Role"
+msgstr "Activer le rôle"
+
+#. module: purchase
+#: view:purchase.order:0
+msgid "De-active Role"
+msgstr "Désactiver le rôle"
+
+#. modules: purchase, sale
+#: field:purchase.order.line,original_instance:0
+#: field:sale.order.line,original_instance:0
+msgid "Original Instance"
+msgstr "Instance originale"
+
+#. module: sourcing
+#: code:addons/sourcing/sale_order_line.py:1239
+#, python-format
+msgid "You cannot re-sync a line more than 2 times"
+msgstr "Vous ne pouvez pas faire plus de 2 re-sync"
+
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2022-02-15 14:49:57 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv	2023-01-10 08:45:42 +0000
@@ -5,7 +5,7 @@
 msf_sync_data_server.po_updates_so_ref,TRUE,TRUE,"['name','state','partner_ref']","['&','&','&',('partner_type','!=','external'),('state','in',['validated', 'validated_p', 'sourced', 'sourced_p', 'confirmed', 'confirmed_p']),('partner_ref','!=',False),'!',('partner_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,sale.order.update_sub_so_ref,purchase.order,PO updates SO ref,8,,Valid
 msf_sync_data_server.fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&', '&','&','&', ('claim_name_goods_return', '=', False), ('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,,Valid
 msf_sync_data_server.update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&','&', ('partner_type_stock_picking', 'not in', ['esc', 'external']),('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,,Valid
-msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel']), ('from_synchro_return_goods', '=', False), ('order_id.active', '=', 't')]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
+msf_sync_data_server.pol_create_sol,TRUE,TRUE,"['sync_local_id', 'order_id/name','product_id/id', 'product_id/name', 'name', 'state', 'product_qty', 'product_uom', 'price_unit', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','is_line_split','date_planned', 'stock_take_date', 'ir_name_for_sync', 'original_instance']","[('sync_linked_sol', '=', False), ('order_id.partner_type', 'not in',['external','esc']), ('state', 'in', ['validated', 'confirmed', 'done']), ('order_id.state', 'not in', ['draft', 'draft_p', 'cancel']), ('from_synchro_return_goods', '=', False), ('order_id.active', '=', 't')]",partner_id,MISSION,sale.order.line.create_so_line,purchase.order.line,PO line creates FO line,11,,Valid
 msf_sync_data_server.sol_updates_pol,TRUE,TRUE,"['resourced_original_line/id', 'resourced_original_remote_line','sync_sourced_origin', 'sync_local_id', 'sync_linked_pol', 'order_id/name', 'product_id/id', 'product_id/name', 'name', 'state','product_uom_qty', 'product_uom', 'price_unit', 'in_name_goods_return', 'analytic_distribution_id/id','comment','have_analytic_distribution_from_header','line_number', 'nomen_manda_0/id','nomen_manda_1/id','nomen_manda_2/id','nomen_manda_3/id', 'nomenclature_description','notes','default_name','default_code','date_planned','is_line_split', 'original_line_id/id', 'confirmed_delivery_date', 'stock_take_date', 'cancel_split_ok', 'modification_comment', 'from_cancel_out', 'pol_external_ref', 'dpo_line_id/.id', 'dpo_id/.id', 'sync_pushed_from_po', 'esti_dd']","[('order_id.partner_type', '!=', 'external'), ('order_id.active', '=', 't'), ('state', '!=', 'draft'), ('order_id.procurement_request', '=', False), ('product_uom_qty', '!=', 0.0), '!', '&', ('order_id.fo_created_by_po_sync', '=', False), ('order_id.state', '=', 'draft')]",partner_id,MISSION,purchase.order.line.sol_update_original_pol,sale.order.line,FO line updates PO line,12,"[('order_id.procurement_request', '=', False), ('order_id.active', '=', 't'), ('order_id.state', 'in', ['draft', 'draft_p']), ('order_id.partner_type', 'not in', ['external', 'esc']), ('order_id.client_order_ref', '=', False)]",Valid
 msf_sync_data_server.pol_update_date_expected,TRUE,TRUE,"['sync_local_id', 'sync_linked_pol']","[('id', '=', 0)]",partner_id,MISSION,purchase.order.line.update_date_expected,sale.order.line,Update IN expected date,55,,Valid
 msf_sync_data_server.partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'previous_step_id/name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'claim', 'packing_list', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_id/default_code', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/prodlot_id/type', 'move_lines/prodlot_id/comment', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment', 'move_lines/sale_line_id/id', 'move_lines/sale_line_id/in_name_goods_return', 'move_lines/sale_line_id/resourced_original_remote_line', 'move_lines/from_pack', 'move_lines/to_pack', 'move_lines/weight', 'move_lines/height', 'move_lines/length', 'move_lines/width',  'sale_id/claim_name_goods_return', 'sale_id/client_order_ref']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', 'in', ['done', 'delivered']), ('already_shipped', '=', True), ('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,,Valid

=== modified file 'bin/addons/purchase/purchase_order_line.py'
--- bin/addons/purchase/purchase_order_line.py	2022-11-21 10:10:25 +0000
+++ bin/addons/purchase/purchase_order_line.py	2023-01-10 08:45:42 +0000
@@ -165,9 +165,22 @@
 
         res = {}
         for pol in self.browse(cr, uid, ids, fields_to_fetch=['linked_sol_id'], context=context):
+            if not pol.linked_sol_id:
+                original_instance = self.pool.get('res.company')._get_instance_record(cr, uid).instance
+            elif pol.linked_sol_id.original_instance:
+                original_instance = pol.linked_sol_id.original_instance
+            elif pol.linked_sol_id.order_id.partner_type in ('esc', 'external'):
+                # FO FS to Ext
+                original_instance = self.pool.get('res.company')._get_instance_record(cr, uid).instance
+            else:
+                # IR or FO from scratch to instance
+                original_instance = pol.linked_sol_id.order_id.partner_id.name
+
+
             res[pol.id] = {
                 'customer_ref': pol.linked_sol_id and pol.linked_sol_id.order_id.client_order_ref or False,
                 'ir_name_for_sync': pol.linked_sol_id and pol.linked_sol_id.order_id.name or '',
+                'original_instance': original_instance,
             }
 
         return res
@@ -656,6 +669,8 @@
         'from_dpo_id': fields.integer('DPO id on the remote', internal=1),
         'dates_modified': fields.boolean('EDD/CDD modified on validated line', internal=1),
         'loan_line_id': fields.many2one('sale.order.line', string='Linked loan line', readonly=True),
+
+        'original_instance': fields.function(_get_customer_ref, method=True, type='char', string='Original Instance', multi='custo_ref_ir_name'),
     }
 
     _defaults = {

=== modified file 'bin/addons/purchase/purchase_workflow.py'
--- bin/addons/purchase/purchase_workflow.py	2022-10-31 15:42:23 +0000
+++ bin/addons/purchase/purchase_workflow.py	2023-01-10 08:45:42 +0000
@@ -75,6 +75,7 @@
                 if split_po.linked_sol_id:
                     sol_values['line_number'] = split_po.linked_sol_id.line_number
                     sol_values['original_line_id'] = split_po.linked_sol_id.id
+                    sol_values['original_instance'] = split_po.linked_sol_id.original_instance
         return sol_values
 
 

=== modified file 'bin/addons/sale/sale_order.py'
--- bin/addons/sale/sale_order.py	2022-11-21 10:10:25 +0000
+++ bin/addons/sale/sale_order.py	2023-01-10 08:45:42 +0000
@@ -2292,6 +2292,8 @@
         'instance_sync_order_ref': fields.many2one('sync.order.label', string='Order in sync. instance'),
         'cv_line_ids': fields.one2many('account.commitment.line', 'so_line_id', string="Commitment Voucher Lines"),
         'loan_line_id': fields.many2one('purchase.order.line', string='Linked loan line', readonly=True),
+
+        'original_instance': fields.char('Original Instance', size=128, readonly=1),
     }
     _order = 'sequence, id desc'
     _defaults = {
@@ -2502,7 +2504,7 @@
             'modification_comment', 'original_product', 'original_qty', 'original_price',
             'original_uom', 'sync_linked_pol', 'resourced_original_line', 'ir_name_from_sync',
             'in_name_goods_return', 'counterpart_po_line_id', 'from_cancel_out',
-            'instance_sync_order_ref', 'sync_sourced_origin'
+            'instance_sync_order_ref', 'sync_sourced_origin', 'original_instance',
         ]:
             if x not in default:
                 default[x] = False

=== modified file 'bin/addons/sale/sale_workflow.py'
--- bin/addons/sale/sale_workflow.py	2022-05-10 14:16:17 +0000
+++ bin/addons/sale/sale_workflow.py	2023-01-10 08:45:42 +0000
@@ -189,6 +189,7 @@
                     'analytic_distribution_id': sol.analytic_distribution_id.id or False,
                     'ir_name_from_sync': sol.ir_name_from_sync or False,
                     'sync_sourced_origin': sol.sync_sourced_origin,
+                    'original_instance': sol.original_instance,
                 }
                 new_sol_id = self.copy(cr, uid, sol.id, sol_vals, context=context)
                 wf_service.trg_validate(uid, 'sale.order.line', new_sol_id, 'validated', cr)

=== modified file 'bin/addons/sale/wizard/split_order_line.py'
--- bin/addons/sale/wizard/split_order_line.py	2020-09-24 14:13:46 +0000
+++ bin/addons/sale/wizard/split_order_line.py	2023-01-10 08:45:42 +0000
@@ -84,6 +84,7 @@
                     'in_name_goods_return': split.sale_line_id.in_name_goods_return,
                     'ir_name_from_sync': split.sale_line_id.ir_name_from_sync,
                     'counterpart_po_line_id': split.sale_line_id.counterpart_po_line_id and split.sale_line_id.counterpart_po_line_id.id or False,
+                    'original_instance': split.sale_line_id.original_instance,
                 }
                 # following new sequencing policy, we check if resequencing occur (behavior 1).
                 # if not (behavior 2), the split line keeps the same line number as original line

=== modified file 'bin/addons/sourcing/res_partner.py'
--- bin/addons/sourcing/res_partner.py	2020-11-05 09:39:35 +0000
+++ bin/addons/sourcing/res_partner.py	2023-01-10 08:45:42 +0000
@@ -72,6 +72,24 @@
             result[l_id] = True
         return result
 
+    def _get_source_domain(self, cr, uid, sol_ids, context=None):
+        if isinstance(sol_ids, (int, long)):
+            sol_ids = [sol_ids]
+
+        remove_ids = set()
+        allowed_types_set = set(['external', 'esc', 'internal', 'section', 'intermission'])
+
+        for sol in self.pool.get('sale.order.line').browse(cr, uid, sol_ids, fields_to_fetch=['order_id', 'original_instance']):
+            remove_ids.add(sol.order_id.partner_id.id)
+            if not sol.order_id.procurement_request:
+                types_allowed = ['external', 'esc']
+                if sol.order_id.partner_type in ['esc', 'external']:
+                    types_allowed.extend(['internal', 'section', 'intermission'])
+                elif not sol.original_instance or sol.original_instance == sol.order_id.partner_id.name:
+                    types_allowed.extend(['internal', 'section', 'intermission'])
+                allowed_types_set.intersection_update(set(types_allowed))
+        return [('id', 'not in', list(remove_ids)), ('partner_type', 'in', list(allowed_types_set))]
+
     def _check_partner_type(self, cr, uid, obj, name, args, context=None):
         if context is None:
             context = {}
@@ -86,15 +104,7 @@
                 if arg[1] != '=' or not isinstance(arg[2], (int, long)):
                     raise osv.except_osv(_('Error'), _('Filter check_partner different than (arg[0], =, id) not implemented.'))
                 if arg[2]:
-                    so = self.pool.get('sale.order').browse(cr, uid, arg[2], fields_to_fetch=['partner_id', 'procurement_request', 'partner_type'])
-                    newargs.append(('id', '!=', so.partner_id.id))
-                    if not so.procurement_request:
-                        types_allowed = ['external', 'esc']
-                        if so.partner_type not in ['internal', 'section', 'intermission']:
-                            types_allowed.extend(['internal', 'section', 'intermission'])
-                        elif so.partner_type == 'internal':
-                            types_allowed.extend(['section', 'intermission'])
-                        newargs.append(('partner_type', 'in', types_allowed))
+                    newargs += self._get_source_domain(cr, uid, arg[2], context=context)
             else:
                 newargs.append(args)
         return newargs
@@ -182,17 +192,7 @@
         for arg in args:
             if arg[0] == 'line_contains_fo':
                 if type(arg[2]) == type(list()):
-                    for line in self.pool.get('sale.order.line').browse(cr, uid, arg[2][0][2], fields_to_fetch=['partner_id', 'order_id'], context=context):
-                        res.append(('id', '!=', line.partner_id.id))
-                        if not line.order_id.procurement_request:
-                            types_allowed = ['external', 'esc']
-                            if line.partner_id.partner_type not in ['internal', 'section', 'intermission']:
-                                types_allowed.extend(['internal', 'section', 'intermission'])
-                            elif line.partner_id.partner_type == 'internal':
-                                types_allowed.extend(['section', 'intermission'])
-
-                            res.append(('partner_type', 'in', types_allowed))
-
+                    res += self._get_source_domain(cr, uid, arg[2][0][2], context=context)
         return res
 
     _columns = {

=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2022-10-28 10:41:43 +0000
+++ bin/addons/sourcing/sale_order_line.py	2023-01-10 08:45:42 +0000
@@ -1217,17 +1217,27 @@
                 _('You cannot confirm the sourcing of a line with unit price as zero.'),
             )
 
-        int_int_supplier = self.search(cr, uid, [
-            ('id', 'in', ids),
-            ('supplier.partner_type', '=', 'internal'),
-            ('order_id.partner_type', '=', 'internal'),
-            ('order_id.procurement_request', '=', False),
-        ], count=True, context=context)
-        if int_int_supplier:
-            raise osv.except_osv(
-                _('Warning'),
-                _('You cannot confirm the sourcing of a line to an internal customer with an internal supplier.'),
-            )
+        if ids:
+            cr.execute('''
+                select
+                    count(*)
+                from
+                    sale_order_line sol, sale_order so, res_partner p, res_partner supplier
+                where
+                    sol.order_id = so.id and
+                    p.id = so.partner_id and
+                    supplier.id = sol.supplier and
+                    p.partner_type in ('section', 'internal', 'intermission') and
+                    supplier.partner_type in ('section', 'internal', 'intermission') and
+                    coalesce(sol.original_instance, p.name) != p.name and
+                    sol.id in %s
+                ''',  (tuple(ids), ))
+
+            if cr.fetchone()[0]:
+                raise osv.except_osv(
+                    _('Warning'),
+                    _('You cannot re-sync a line more than 2 times')
+                )
 
         self.source_line(cr, uid, ids, context=context)
 

=== modified file 'bin/addons/sourcing/sourcing_view.xml'
--- bin/addons/sourcing/sourcing_view.xml	2020-09-28 08:39:21 +0000
+++ bin/addons/sourcing/sourcing_view.xml	2023-01-10 08:45:42 +0000
@@ -69,7 +69,7 @@
                     <field name="stock_uom_id" readonly="1" string="UoM Stock" />
 					<field name="company_id" invisible="1" />
 					<field name="supplier" colspan="2"
-						domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', order_id), '|', '|', ('supplier', '=', 't'), ('manufacturer', '=', 't'), ('transporter', '=', 't')]"
+						domain="[('id', '!=', company_id), ('available_for_dpo', '=', po_cft),('check_partner', '=', active_id), '|', '|', ('supplier', '=', 't'), ('manufacturer', '=', 't'), ('transporter', '=', 't')]"
                         context="{'product_id': product_id, 'choose_supplier': True, 'uom': product_uom, 'product_qty': product_uom_qty}"
 						attrs="{'readonly': ['|', '|', ('po_cft', '=', 'cft'), ('state', '!=', 'validated'), ('type', '=', 'make_to_stock')]}"
 						on_change="onChangeSupplier(supplier, type)" />

=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2021-08-09 17:27:06 +0000
+++ bin/addons/sync_so/sale.py	2023-01-10 08:45:42 +0000
@@ -66,6 +66,7 @@
             sol_values['order_id'] = sale_order_ids[0]
             sol_values['sync_linked_pol'] = pol_dict.get('sync_local_id', False)
             sol_values['ir_name_from_sync'] = pol_dict.get('ir_name_for_sync', False)
+            sol_values['original_instance'] = pol_dict.get('original_instance', False)
             if line_info.product_id and not sol_values.get('product_id'):
                 raise Exception('FO: %s , Product %s not found' % (so_name, line_info.default_code or ''))
             if sol_values.get('product_id'):