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

[jftempo]

Unmerged revisions

6245. By jftempo on 2024-05-03

US-12195 [FIX] Asset track changes

=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_asset.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_asset.yml	2023-10-18 12:00:54 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_asset.yml	2024-05-07 10:17:41 +0000
@@ -1,52 +1,244 @@
 -
-  Asset Form Creation / Deletion
--  
-  !python {model: audittrail.rule}: |
-    name = 'Asset Form Creation'
-    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset')], context=context)
-    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids), ('log_create', '=', True)], context=context)
-    if object_ids:
-        fields = ['name']
-        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset'), ('name', 'in', fields)], context=context)
-
-
-        vals = {
-            'name': name,
-            'object_id': object_ids[0],
-            'log_write': False,
-            'log_unlink': True,
-            'log_create': True,
-            'field_ids': [(6, 0, fields_ids)],
-        }
-
-        if not rule_id:
-            rule_id = self.create(cr, uid, vals, context=context)
-        elif rule_id:
-            self.write(cr, uid, rule_id, vals, context=context)
-        # Subscribe to the rule
-        self.subscribe(cr, uid, rule_id)
--
-  Asset Form Write
--
-  !python {model: audittrail.rule}: |
-    name = 'Asset Form Write'
+  For Asset Forms (product.asset), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+    name = 'Asset Forms'
     object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset')], context=context)
     rule_id = self.search(cr, uid, [('object_id', 'in', object_ids), ('log_write', '=', True)], context=context)
     if object_ids:
-        fields = ['name', 'state', 'product_id', 'asset_type_id', 'userful_life_id', 'serial_nb', 'brand', 'type', 'model', 'year', 'move_line_id', 'invo_value', 'invo_date', 'asset_bs_depreciation_account_id', 'asset_pl_account_id', 'start_date']
+        fields = ['name', 'state', 'product_id', 'instance_id', 'asset_type_id', 'useful_life_id', 'description', 'hq_ref', 'local_ref', 'serial_nb', 'brand', 'type', 'model', 'year', 'comment', 'project_po', 'international_po', 'arrival_date', 'receipt_place', 'move_line_id', 'quantity_divisor', 'invo_value', 'invo_currency', 'invo_date', 'invo_supplier_id', 'invo_donator_code', 'invo_certif_depreciation', 'from_invoice', 'state', 'start_date', 'depreciation_amount', 'disposal_amount', 'asset_pl_account_id']
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset'), ('name', 'in', fields)], context=context)
         vals = {
             'name': name,
             'object_id': object_ids[0],
             'log_write': True,
-            'log_unlink': False,
-            'log_create': False,
-            'field_ids': [(6, 0, fields_ids)],
-        }
-
-        if not rule_id:
-            rule_id = self.create(cr, uid, vals, context=context)
-        elif rule_id:
-            self.write(cr, uid, rule_id, vals, context=context)
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+
+-
+  For Asset Types (product.asset.type), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+    name = 'Asset Types'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.type')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['name','description', 'active', 'useful_life_id']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.type'), ('name', 'in', fields)], context=context)
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+-
+  For Useful Life (product.asset.useful.life), track the creation and modif, delete
+-
+  !python {model: audittrail.rule}: |
+    name = 'Useful Life'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.useful.life')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['year', 'is_active', 'asset_type_id']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.useful.life'), ('name', 'in', fields)], context=context)
+        field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.useful.life'), ('name', '=', 'year')], context=context)
+        field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.useful.life'), ('name', '=', 'asset_type_id')], context=context)
+
+        name_id = False
+        parent_id = False
+
+        if field_parent:
+          parent_id = field_parent[0]
+          if field_name:
+            name_id = field_name[0]
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+            'parent_field_id': parent_id,
+            'name_get_field_id': name_id,
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+
+
+-
+  For Asset Events (product.asset.event), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+    name = 'Asset Events'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.event')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['date','event_type_id', 'asset_id', 'location', 'proj_code', 'product_id', 'comment']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.event'), ('name', 'in', fields)], context=context)
+        field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.event'), ('name', '=', 'date')], context=context)
+        field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.event'), ('name', '=', 'asset_id')], context=context)
+
+        name_id = False
+        parent_id = False
+
+        if field_parent:
+          parent_id = field_parent[0]
+          if field_name:
+            name_id = field_name[0]
+
+        vals = {
+          'name': name,
+          'object_id': object_ids[0],
+          'log_write': True,
+          'log_unlink': True,
+          'log_create': True,
+          'field_ids': [ (6, 0, fields_ids) ],
+          'parent_field_id': parent_id,
+          'name_get_field_id': name_id,
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+
+
+-
+  For Asset Event Types (product.asset.event.type), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+    name = 'Asset Event Types'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.event.type')], context=context)
+    rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+    if object_ids:
+        # Create the rule
+        fields = ['name','is_disposal', 'active', 'expense_account_id']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.event.type'), ('name', 'in', fields)], context=context)
+
+        vals = {
+            'name': name,
+            'object_id': object_ids[0],
+            'log_write': True,
+            'log_unlink': True,
+            'log_create': True,
+            'field_ids': [(6, 0, fields_ids)],
+        }
+
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+
+
+-
+  For Depreciation Lines (product.asset.line), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+      name = 'Depreciation Lines'
+      object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.line')], context=context)
+      rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+      if object_ids:
+        # Create the rule
+        fields = ['date','depreciation_amount', 'remaining_amount', 'amount', 'asset_bs_depreciation_account_id', 'asset_pl_account_id', 'analytic_distribution_id', 'move_id', 'move_state']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.line'), ('name', 'in', fields)], context=context)
+        field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.line'), ('name', '=', 'date')], context=context)
+        field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.line'), ('name', '=', 'asset_id')], context=context)
+        
+        name_id = False
+        parent_id = False
+
+        if field_parent:
+          parent_id = field_parent[0]
+          if field_name:
+            name_id = field_name[0]
+
+        vals = {
+          'name': name,
+          'object_id': object_ids[0],
+          'log_write': True,
+          'log_unlink': True,
+          'log_create': True,
+          'field_ids': [ (6, 0, fields_ids) ],
+          'parent_field_id': parent_id,
+          'name_get_field_id': name_id,
+        }
+
+        if not rule_id:
+          rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+          self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+
+
+-
+  For Asset Dispose (product.asset.disposal), track the creation, modif and delete
+-
+  !python {model: audittrail.rule}: |
+      name = 'Asset Dispose'
+      object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'product.asset.disposal')], context=context)
+      rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
+      if object_ids:
+        # Create the rule
+        fields = ['disposal_date','event_type_id', 'location', 'proj_code', 'comment']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'product.asset.disposal'), ('name', 'in', fields)], context=context)
+        field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.disposal'), ('name', '=', 'disposal_date')], context=context)
+        field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.asset.disposal'), ('name', '=', 'asset_id')], context=context)
+        
+        name_id = False
+        parent_id = False
+
+        if field_parent:
+          parent_id = field_parent[0]
+          if field_name:
+            name_id = field_name[0]
+
+        vals = {
+          'name': name,
+          'object_id': object_ids[0],
+          'log_write': True,
+          'log_unlink': True,
+          'log_create': True,
+          'field_ids': [ (6, 0, fields_ids) ],
+          'parent_field_id': parent_id,
+          'name_get_field_id': name_id,
+        }
+
+        if not rule_id:
+          rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+          self.write(cr, uid, rule_id, vals, context=context)
         # Subscribe to the rule
         self.subscribe(cr, uid, rule_id)

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/data/patches.xml	2024-05-07 10:17:41 +0000
@@ -1054,5 +1054,8 @@
         </record>
 
 
+        <record id="us_12195_deactivate_asset_creation_rule" model="patch.scripts">
+            <field name="method">us_12195_deactivate_asset_creation_rule</field>
+        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/msf_profile.py	2024-05-07 10:17:41 +0000
@@ -57,6 +57,7 @@
         'model': lambda *a: 'patch.scripts',
     }
 
+<<<<<<< TREE
     # UF33.0
     def us_12074_gdpr_remove_personal_data_from_track_changes(self, cr, uid, *a, **b):
         '''
@@ -180,6 +181,15 @@
         return True
 
 
+=======
+    def us_12195_deactivate_asset_creation_rule(self, cr, uid, *a, **b):
+        asset_obj = self.pool.get('audittrail.rule')
+        asset_ids = asset_obj.search(cr, uid, [('name', '=', 'Asset Form Creation')])
+        if asset_ids:
+            asset_obj.write(cr, uid, asset_ids, {'state': 'draft'})
+        return True
+
+>>>>>>> MERGE-SOURCE
     # UF32.0
     def us_12273_remove_never_exp_password(self, cr, uid, *a, **b):
         instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id

=== modified file 'bin/addons/product_asset/product_asset.py'
--- bin/addons/product_asset/product_asset.py	2023-11-16 13:03:16 +0000
+++ bin/addons/product_asset/product_asset.py	2024-05-07 10:17:41 +0000
@@ -15,6 +15,7 @@
     _name = "product.asset.type"
     _description = "Specify the type of asset at product level"
     _order = 'name, id'
+    _trace = True
 
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=1),
@@ -36,6 +37,7 @@
     _name = 'product.asset.event.type'
     _description = 'Event Type'
     _order = 'name, id'
+    _trace = True
 
     _columns = {
         'name': fields.char('Name', size=512, required=True, translate=1),
@@ -57,6 +59,7 @@
     _description = 'Asset Useful Life'
     _rec_name = 'year'
     _order = 'year, id'
+    _trace = True
 
     _columns = {
         'asset_type_id': fields.many2one('product.asset.type', 'Asset Type', required=1),
@@ -853,6 +856,7 @@
     _rec_name = 'asset_id'
     _description = "Event for asset follow up"
     _order = 'date desc, id desc'
+    _trace = True
 
     eventTypeSelection = [('reception', 'Reception'),
                           ('startUse', 'Start Use'),
@@ -972,6 +976,7 @@
     _rec_name = 'date'
     _order = 'date, id'
     _description = "Depreciation Lines"
+    _trace = True
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -1230,6 +1235,7 @@
     _name = 'product.asset.disposal'
     _description = 'Asset Dispose'
     _rec_name = 'asset_id'
+    _trace = True
     _columns = {
         'asset_id': fields.many2one('product.asset', 'Asset', required=1),
         'event_type_id': fields.many2one('product.asset.event.type', 'Event Type', required=1, domain=[('is_disposal', '=', True)], add_empty=True),