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

[jftempo]

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2021-02-09 17:29:10 +0000
+++ bin/addons/mission_stock/mission_stock.py	2021-09-27 10:27:25 +0000
@@ -1019,6 +1019,7 @@
                     qty = self.pool.get('product.uom')._compute_qty(cr, uid, uom, qty, line.product_id.uom_id.id)
 
                 vals['in_pipe_qty'] += qty
+                vals['used_in_transaction'] = True
 
                 if partner == coordo_id:
                     vals['in_pipe_coor_qty'] += qty
@@ -1047,6 +1048,53 @@
             ''')
             res = cr.fetchall()
             all_move_ids = []
+            doc_field_error_dom = [
+                ('stock_move', 'product_id'),
+                ('stock_production_lot', 'product_id'),
+                ('purchase_order_line', 'product_id'),
+                ('sale_order_line', 'product_id'),
+                ('tender_line', 'product_id'),
+                ('physical_inventory_counting', 'product_id'),
+                ('initial_stock_inventory_line', 'product_id'),
+                ('real_average_consumption_line', 'product_id'),
+                ('replenishment_segment_line', 'product_id'),
+                ('product_list_line', 'name'),
+                ('composition_kit', 'composition_product_id'),
+                ('composition_item', 'item_product_id'),
+            ]
+
+            timer_used = time.time()
+            # record the current value in transaction_updated
+            cr.execute("update stock_mission_report_line set transaction_updated=coalesce(used_in_transaction, 'f'), used_in_transaction='f' where mission_report_id=%s", (report_id, ))
+            for table, foreign_field in doc_field_error_dom:
+                # set used_in_transaction='t'
+                cr.execute('''
+                    update
+                        stock_mission_report_line l
+                    set
+                        used_in_transaction='t'
+                    from
+                        ''' + table + ''' ft
+                    where
+                        coalesce(l.used_in_transaction,'f')='f' and
+                        l.mission_report_id = %s and
+                        ft.''' + foreign_field + ''' = l.product_id
+                    ''', (report_id, )) # not_a_user_entry
+
+            # trigger sync update
+            cr.execute('''
+                update ir_model_data d
+                    set last_modification=NOW(), touched='[''used_in_transaction'']'
+                from
+                    stock_mission_report_line l
+                where
+                    l.id = d.res_id and
+                    l.transaction_updated!=used_in_transaction and
+                    d.model='stock.mission.report.line' and
+                    l.mission_report_id = %s
+            ''', (report_id, ))
+            logging.getLogger('MSR').info("""___ computation of used in transaction in %.2f sec.""" % (time.time() - timer_used))
+
             for move in res:
                 all_move_ids.append(move[0])
                 product = product_obj.browse(cr, uid, move[1],
@@ -1056,17 +1104,19 @@
                 if line_id:
                     line = line_obj.browse(cr, uid, line_id[0])
                     qty = self.pool.get('product.uom')._compute_qty(cr, uid, move[2], move[3], product.uom_id.id)
-                    vals = {'internal_qty': line.internal_qty or 0.00,
-                            'stock_qty': line.stock_qty or 0.00,
-                            'cross_qty': line.cross_qty or 0.00,
-                            'secondary_qty': line.secondary_qty or 0.00,
-                            'cu_qty': line.cu_qty or 0.00,
-                            'quarantine_qty': line.quarantine_qty or 0.00,
-                            'input_qty': line.input_qty or 0.00,
-                            'opdd_qty': line.opdd_qty or 0.00,
-                            'updated': True,
-                            'product_state': line.product_id.state and line.product_id.state.code,}
-
+                    vals = {
+                        'internal_qty': line.internal_qty or 0.00,
+                        'stock_qty': line.stock_qty or 0.00,
+                        'cross_qty': line.cross_qty or 0.00,
+                        'secondary_qty': line.secondary_qty or 0.00,
+                        'cu_qty': line.cu_qty or 0.00,
+                        'quarantine_qty': line.quarantine_qty or 0.00,
+                        'input_qty': line.input_qty or 0.00,
+                        'opdd_qty': line.opdd_qty or 0.00,
+                        'updated': True,
+                        'product_state': line.product_id.state and line.product_id.state.code,
+                        'used_in_transaction': True
+                    }
                     if move[4] in internal_loc:
                         vals['internal_qty'] -= qty
                     if move[4] in stock_loc:
@@ -1500,8 +1550,8 @@
         'product_id': fields.many2one('product.product', string='Name', required=True, ondelete="cascade", select=1),
         'default_code': fields.related('product_id', 'default_code', string='Reference', type='char', size=64, store=True, write_relate=False),
         'xmlid_code': fields.related('product_id', 'xmlid_code', string='MSFID', type='char', size=18, store=True, write_relate=False, _fnct_migrate=xmlid_code_migration),
-        'old_code': fields.related('product_id', 'old_code', string='Old Code', type='char'),
-        'name': fields.related('product_id', 'name', string='Name', type='char'),
+        'old_code': fields.related('product_id', 'old_code', string='Old Code', type='char', write_relate=False),
+        'name': fields.related('product_id', 'name', string='Name', type='char', write_relate=False),
         'categ_id': fields.related('product_id', 'categ_id', string='Category', type='many2one', relation='product.category',
                                    store={'product.template': (_get_template, ['type'], 10),
                                           'stock.mission.report.line': (lambda self, cr, uid, ids, c={}: ids, ['product_id'], 10)},
@@ -1526,17 +1576,17 @@
         ),
         'product_state': fields.char(size=128, string='Unifield state'),
         # mandatory nomenclature levels
-        'nomen_manda_0': fields.related('product_id', 'nomen_manda_0', type='many2one', relation='product.nomenclature', string='Main Type'),
-        'nomen_manda_1': fields.related('product_id', 'nomen_manda_1', type='many2one', relation='product.nomenclature', string='Group'),
-        'nomen_manda_2': fields.related('product_id', 'nomen_manda_2', type='many2one', relation='product.nomenclature', string='Family'),
-        'nomen_manda_3': fields.related('product_id', 'nomen_manda_3', type='many2one', relation='product.nomenclature', string='Root'),
+        'nomen_manda_0': fields.related('product_id', 'nomen_manda_0', type='many2one', relation='product.nomenclature', string='Main Type', write_relate=False),
+        'nomen_manda_1': fields.related('product_id', 'nomen_manda_1', type='many2one', relation='product.nomenclature', string='Group', write_relate=False),
+        'nomen_manda_2': fields.related('product_id', 'nomen_manda_2', type='many2one', relation='product.nomenclature', string='Family', write_relate=False),
+        'nomen_manda_3': fields.related('product_id', 'nomen_manda_3', type='many2one', relation='product.nomenclature', string='Root', write_relate=False),
         # optional nomenclature levels
-        'nomen_sub_0': fields.related('product_id', 'nomen_sub_0', type='many2one', relation='product.nomenclature', string='Sub Class 1'),
-        'nomen_sub_1': fields.related('product_id', 'nomen_sub_1', type='many2one', relation='product.nomenclature', string='Sub Class 2'),
-        'nomen_sub_2': fields.related('product_id', 'nomen_sub_2', type='many2one', relation='product.nomenclature', string='Sub Class 3'),
-        'nomen_sub_3': fields.related('product_id', 'nomen_sub_3', type='many2one', relation='product.nomenclature', string='Sub Class 4'),
-        'nomen_sub_4': fields.related('product_id', 'nomen_sub_4', type='many2one', relation='product.nomenclature', string='Sub Class 5'),
-        'nomen_sub_5': fields.related('product_id', 'nomen_sub_5', type='many2one', relation='product.nomenclature', string='Sub Class 6'),
+        'nomen_sub_0': fields.related('product_id', 'nomen_sub_0', type='many2one', relation='product.nomenclature', string='Sub Class 1', write_relate=False),
+        'nomen_sub_1': fields.related('product_id', 'nomen_sub_1', type='many2one', relation='product.nomenclature', string='Sub Class 2', write_relate=False),
+        'nomen_sub_2': fields.related('product_id', 'nomen_sub_2', type='many2one', relation='product.nomenclature', string='Sub Class 3', write_relate=False),
+        'nomen_sub_3': fields.related('product_id', 'nomen_sub_3', type='many2one', relation='product.nomenclature', string='Sub Class 4', write_relate=False),
+        'nomen_sub_4': fields.related('product_id', 'nomen_sub_4', type='many2one', relation='product.nomenclature', string='Sub Class 5', write_relate=False),
+        'nomen_sub_5': fields.related('product_id', 'nomen_sub_5', type='many2one', relation='product.nomenclature', string='Sub Class 6', write_relate=False),
         'nomen_manda_0_s': fields.function(_get_nomen_s, method=True, type='many2one', relation='product.nomenclature', string='Main Type', fnct_search=_search_nomen_s, multi="nom_s"),
         'nomen_manda_1_s': fields.function(_get_nomen_s, method=True, type='many2one', relation='product.nomenclature', string='Group', fnct_search=_search_nomen_s, multi="nom_s"),
         'nomen_manda_2_s': fields.function(_get_nomen_s, method=True, type='many2one', relation='product.nomenclature', string='Family', fnct_search=_search_nomen_s, multi="nom_s"),
@@ -1552,8 +1602,8 @@
         'product_amc': fields.float('AMC'),
         'product_consumption': fields.float('FMC'),
 
-        'currency_id': fields.related('product_id', 'currency_id', type='many2one', relation='res.currency', string='Func. cur.'),
-        'cost_price': fields.related('product_id', 'standard_price', type='float', string='Cost price'),
+        'currency_id': fields.related('product_id', 'currency_id', type='many2one', relation='res.currency', string='Func. cur.', write_relate=False),
+        'cost_price': fields.related('product_id', 'standard_price', type='float', string='Cost price', write_relate=False),
         'uom_id': fields.related('product_id', 'uom_id', type='many2one', relation='product.uom', string='UoM',
                                  store={
                                      'product.template': (_get_template, ['type'], 10),
@@ -1582,7 +1632,7 @@
         'in_pipe_coor_qty': fields.float(digits=(16,2), string='In Pipe from Coord.', related_uom='uom_id'),
         'in_pipe_coor_val': fields.float(digits=(16,2), string='In Pipe from Coord.', related_uom='uom_id'),
         'updated': fields.boolean(string='Updated'),
-        'full_view': fields.related('mission_report_id', 'full_view', string='Full view', type='boolean', store=True),
+        'full_view': fields.related('mission_report_id', 'full_view', string='Full view', type='boolean', store=True, write_relate=False),
         'instance_id': fields.many2one(
             'msf.instance',
             string='HQ Instance',
@@ -1591,6 +1641,8 @@
         'quarantine_qty': fields.float(digits=(16, 2), string='Quarantine Qty.', related_uom='uom_id'),
         'input_qty': fields.float(digits=(16, 2), string='Input Qty.', related_uom='uom_id'),
         'opdd_qty': fields.float(digits=(16, 2), string='Output/Packing/Dispatch/Distribution Qty.', related_uom='uom_id'),
+        'used_in_transaction': fields.boolean('Used in a transaction'),
+        'transaction_updated': fields.boolean('Used changed', help='temporary value used to touch ir.model.data'),
     }
 
     @tools.cache(skiparg=2)
@@ -1642,7 +1694,8 @@
                             sum(l.internal_qty)*t.standard_price AS internal_val,
                             sum(l.quarantine_qty) AS quarantine_qty,
                             sum(l.input_qty) AS input_qty,
-                            sum(l.opdd_qty) AS opdd_qty
+                            sum(l.opdd_qty) AS opdd_qty,
+                            bool_or(used_in_transaction) AS used_in_transaction
                      FROM stock_mission_report_line l
                        LEFT JOIN
                           stock_mission_report m
@@ -1683,10 +1736,10 @@
                     internal_qty=%s, stock_qty=%s,
                     cross_qty=%s, secondary_qty=%s,
                     cu_qty=%s, in_pipe_qty=%s, in_pipe_coor_qty=%s,
-                    wh_qty=%s, quarantine_qty=%s, input_qty=%s, opdd_qty=%s
+                    wh_qty=%s, quarantine_qty=%s, input_qty=%s, opdd_qty=%s, used_in_transaction=%s
                     WHERE id=%s""" % (line[1] or 0.00, line[2] or 0.00, line[3] or 0.00, line[4] or 0.00,
                                       line[5] or 0.00, line[6] or 0.00, line[7] or 0.00,
-                                      (line[2] or 0.00) + (line[3] or 0.00), line[9], line[10], line[11], line_id)) # not_a_user_entry
+                                      (line[2] or 0.00) + (line[3] or 0.00), line[9], line[10], line[11], line[12] or False, line_id)) # not_a_user_entry
         return True
 
 
 
=== modified file 'bin/addons/mission_stock/mission_stock_view.xml'
--- bin/addons/mission_stock/mission_stock_view.xml	2020-10-20 15:57:14 +0000
+++ bin/addons/mission_stock/mission_stock_view.xml	2021-09-27 10:27:25 +0000
@@ -80,6 +80,7 @@
                <field name="default_code"/>
                <field name="name"/>
                <field name="categ_id" widget="selection" operator="child_of"/>
+               <field name="used_in_transaction" />
                <newline/>
                <filter string="Single Item" icon="terp-accessories-archiver" domain="[('subtype','=','single')]"/>
                <filter string="Kit/Module" icon="terp-accessories-archiver" domain="[('subtype','=','kit')]"/>
@@ -152,12 +153,51 @@
                 <!-- <field name="cu_val" invisible="not context.get('with_valuation')" /> -->
                 <field name="product_amc" invisible="context.get('hide_amc_fmc')"/>
                 <field name="product_consumption" invisible="context.get('hide_amc_fmc')" />
+                <field name="used_in_transaction" />
                 <field name="in_pipe_qty" />
                 <field name="categ_id" invisible="1" />
                 <field name="type" invisible="1" />
             </tree>
         </field>
     </record>
+    
+    <record id="mission_stock_line_form_view" model="ir.ui.view">
+        <field name="name">mission.stock.product.form.view</field>
+        <field name="model">stock.mission.report.line</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Mission Stock Report" noteditable="1" hide_new_button="1" hide_save_button="1" hide_duplicate_button="1" hide_delete_button="1">
+                <field name="product_id" />
+                <field name="default_code" />
+                <field name="name" />
+                <field name="product_active" />
+                <field name="uom_id" />
+                <field name="cost_price" invisible="not context.get('with_valuation')" />
+                <field name="currency_id" invisible="not context.get('with_valuation')" />
+                <field name="internal_qty" />
+                <field name="internal_val" invisible="not context.get('with_valuation')" />
+                <!-- field name="in_pipe_coor_qty" />
+                <field name="in_pipe_coor_val" invisible="not context.get('with_valuation')" / -->
+                <field name="stock_qty" />
+                <field name="cross_qty" />
+                <!-- <field name="cross_val" invisible="not context.get('with_valuation')" /> -->
+                <field name="secondary_qty" />
+                <!-- <field name="secondary_val" invisible="not context.get('with_valuation')" /> -->
+                <field name="cu_qty" />
+                <field name="quarantine_qty" />
+                <field name="input_qty" />
+                <field name="opdd_qty" />
+                <!-- <field name="cu_val" invisible="not context.get('with_valuation')" /> -->
+                <field name="product_amc" invisible="context.get('hide_amc_fmc')"/>
+                <field name="product_consumption" invisible="context.get('hide_amc_fmc')" />
+                <field name="used_in_transaction" />
+                <field name="in_pipe_qty" />
+                <field name="categ_id" invisible="1" />
+                <field name="type" invisible="1" />
+            </form>
+        </field>
+    </record>
+
 
     <record id="consolidated_mission_stock_wizard_view" model="ir.ui.view">
         <field name="name">consolidated.mission.stock.wizard.view</field>
 
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2021-08-18 16:06:31 +0000
+++ bin/addons/msf_profile/data/patches.xml	2021-09-27 10:27:25 +0000
@@ -701,5 +701,8 @@
         <record id="us_9003_partner_im_is_currencies" model="patch.scripts">
             <field name="method">us_9003_partner_im_is_currencies</field>
         </record>
+        <record id="us_8336_update_msr_used" model="patch.scripts">
+            <field name="method">us_8336_update_msr_used</field>
+        </record>
     </data>
 </openerp>
 
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2021-08-19 10:03:30 +0000
+++ bin/addons/msf_profile/msf_profile.py	2021-09-27 10:27:25 +0000
@@ -37,6 +37,7 @@
 from msf_field_access_rights.osv_override import _get_instance_level
 import cStringIO
 import csv
+import zlib
 
 
 class patch_scripts(osv.osv):
@@ -53,6 +54,65 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+    def us_8336_update_msr_used(self, cr, uid, *a, **b):
+        if not self.pool.get('sync.client.entity'):
+            # exclude new instances
+            return True
+
+        if _get_instance_level(self, cr, uid) == 'hq':
+            # exclude hq
+            return True
+
+        doc_field_error_dom = [
+            ('stock_move', 'product_id'),
+            ('stock_production_lot', 'product_id'),
+            ('purchase_order_line', 'product_id'),
+            ('sale_order_line', 'product_id'),
+            ('tender_line', 'product_id'),
+            ('physical_inventory_counting', 'product_id'),
+            ('initial_stock_inventory_line', 'product_id'),
+            ('real_average_consumption_line', 'product_id'),
+            ('replenishment_segment_line', 'product_id'),
+            ('product_list_line', 'name'),
+            ('composition_kit', 'composition_product_id'),
+            ('composition_item', 'item_product_id'),
+        ]
+        report_ids = self.pool.get('stock.mission.report').search(cr, uid, [('local_report', '=', True), ('full_view', '=', False)])
+        if not report_ids:
+            return True
+        report_id = report_ids[0]
+        for table, foreign_field in doc_field_error_dom:
+            # set used_in_transaction='t'
+            cr.execute('''
+                update
+                    stock_mission_report_line l
+                set
+                    used_in_transaction='t'
+                from
+                    ''' + table + ''' ft
+                where
+                    coalesce(l.used_in_transaction,'f')='f' and
+                    l.mission_report_id = %s and
+                    ft.''' + foreign_field + ''' = l.product_id
+                ''', (report_id, )) # not_a_user_entry
+
+        cr.execute('''
+            select d.name
+            from ir_model_data d, stock_mission_report_line l
+            where
+                l.id = d.res_id and
+                used_in_transaction='t' and
+                d.model='stock.mission.report.line' and
+                l.mission_report_id = %s
+        ''', (report_id,))
+        if cr.rowcount:
+            zipstr = base64.b64encode(zlib.compress(','.join([x[0] for x in cr.fetchall()])))
+            self.pool.get('sync.trigger.something.up').create(cr, uid, {'name': 'msr_used', 'args': zipstr})
+        return True
+
+
+
+
     # UF22.0
     def us_9003_partner_im_is_currencies(self, cr, uid, *a, **b):
         self.us_5559_set_pricelist(cr, uid, *a, **b)
@@ -4962,7 +5022,17 @@
                 if remote_id:
                     cr.execute("update stock_mission_report_line set cu_qty=0, cu_val=0 where mission_report_id in (select id from stock_mission_report where instance_id = %s and full_view='f')", (remote_id[0],))
                     _logger.warn('Reset %d mission stock CU Stock for instance_id %s' % (cr.rowcount, remote_id[0]))
-
+            elif vals.get('name') == 'msr_used':
+                cr.execute('''
+                    update stock_mission_report_line l
+                        set used_in_transaction='t'
+                    from
+                        ir_model_data d
+                    where
+                        d.model='stock.mission.report.line' and
+                        d.res_id = l.id and
+                        d.name in %s
+                ''', (tuple((zlib.decompress(base64.b64decode(vals.get('args'))).split(','))),))
         return super(sync_tigger_something_up, self).create(cr, uid, vals, context)
 
 sync_tigger_something_up()
 
=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2021-06-07 13:41:02 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2021-09-27 10:27:25 +0000
@@ -100,8 +100,8 @@
 msf_sync_data_server.budget_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('budget_id','in',('msf.budget','id',[('type','=','normal'), ('state', '!=', 'draft')]))]","['account_id/id', 'budget_id/id', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12', 'destination_id/id', 'line_type']",OC,msf.budget.line,,Budget line,Valid,,431
 msf_sync_data_server.budget_status,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]",['state'],OC,msf.budget,,Budget status,Valid,,432
 msf_sync_data_server.mission_stock_report,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('full_view', '=', False), ('local_report', '=', True)]","['full_view', 'instance_id/id', 'last_update', 'name']",OC,stock.mission.report,,Mission Stock Report,Valid,,440
-msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['Local', 'Temporary'])]","['cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code', 'product_amc', 'product_consumption', 'quarantine_qty', 'input_qty', 'opdd_qty']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
-msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code', 'product_amc', 'product_consumption', 'quarantine_qty', 'input_qty', 'opdd_qty']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
+msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['Local', 'Temporary'])]","['cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code', 'product_amc', 'product_consumption', 'quarantine_qty', 'input_qty', 'opdd_qty', 'used_in_transaction']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
+msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code', 'product_amc', 'product_consumption', 'quarantine_qty', 'input_qty', 'opdd_qty', 'used_in_transaction']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
 msf_sync_data_server.financing_contract_formats_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type', 'hidden_instance_id/id']",HQ + MISSION,financing.contract.format,hidden_instance_id,Financing Contract Formats FC,Valid,,450
 msf_sync_data_server.financing_contract_formats,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('hidden_instance_id','=',False)]","['hidden_instance_id/id','cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type']",HQ + MISSION,financing.contract.format,,Financing Contract Formats,Valid,,451
 msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('instance_id', '=', False)]","['account_destination_ids/id', 'instance_id/id','allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value', 'is_quadruplet', 'quadruplet_sync_list', 'reporting_select_accounts_only', 'reporting_account_ids/id']",HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines,Valid,,452
 
=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2021-08-18 14:49:48 +0000
+++ bin/addons/product_attributes/product_attributes.py	2021-09-27 10:27:25 +0000
@@ -2737,6 +2737,7 @@
             ('composition.kit', 'composition_product_id', _('Composition Kit(s)'), []),
             ('composition.item', 'item_product_id', _('Composition Kit line(s)'), []),
         ]
+        # please update also doc_field_error_dom in bin/addons/mission_stock/mission_stock.py
 
         for obj, field, msg, dom in doc_field_error_dom:
             nb = self.pool.get(obj).search(cr, uid, [(field, '=', prod_id)]+dom, count=True, context=context)
@@ -2755,7 +2756,7 @@
 
         cr.execute('''
                     select
-                        l.product_id
+                        l.product_id, array_agg(i.code)
                     from
                         stock_mission_report r, msf_instance i, stock_mission_report_line l
                     where
@@ -2764,10 +2765,10 @@
                         l.mission_report_id = r.id and
                         l.product_id in %s and
                         r.full_view = 'f' and
-                        ( l.internal_qty > 0 or l.in_pipe_qty > 0)
+                        ( l.internal_qty > 0 or l.in_pipe_qty > 0 or l.used_in_transaction='t')
                     group by l.product_id
                 ''' , (tuple(ids), ))
-        return [x[0] for x in cr.fetchall()]
+        return [(x[0],', '.join(x[1])) for x in cr.fetchall()]
 
 
     def merge_product(self, cr, uid, nsl_prod_id, local_id, context=None):
@@ -2782,8 +2783,9 @@
         if error_used:
             raise osv.except_osv(_('Warning'), _('The selected UD product %s has already been used in the past. Merge cannot be done for this product') % (new_data['default_code'], ))
 
-        if self._has_pipe(cr, uid, nsl_prod_id):
-            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore the product cannot be merged') % (new_data['default_code'], ))
+        has_pipe = self._has_pipe(cr, uid, nsl_prod_id)
+        if has_pipe:
+            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore the product cannot be merged. Instance(s): %s') % (has_pipe[0][1], ))
 
         local_dom = [('id', '=', local_id), ('international_status', '=', 'Local'), ('replaced_by_product_id', '=', False)]
         if not context.get('sync_update_execution'):
 
=== modified file 'bin/addons/product_attributes/wizard/product_merged.py'
--- bin/addons/product_attributes/wizard/product_merged.py	2020-05-04 16:40:38 +0000
+++ bin/addons/product_attributes/wizard/product_merged.py	2021-09-27 10:27:25 +0000
@@ -26,8 +26,9 @@
         if error_used:
             raise osv.except_osv(_('Warning'), _('The selected UD product has already been used in the past. Merge cannot be done for this product.'))
 
-        if prod_obj._has_pipe(cr, uid, wiz.new_product_id.id):
-            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore this product cannot be merged.'))
+        has_pipe = prod_obj._has_pipe(cr, uid, wiz.new_product_id.id)
+        if has_pipe:
+            raise osv.except_osv(_('Warning'), _('Warning there is stock / pipeline in at least one of the instances in this mission! Therefore this product cannot be merged. Instances: %s') % (has_pipe[0][1], ))
 
         block_msg = prod_obj.check_same_value(cr, uid, wiz.new_product_id.id, wiz.old_product_id.id, blocker=True, context=context)
         if block_msg: