Merge lp:~openerp-dev/openobject-addons/7.0-opw-599830-fka into lp:openobject-addons/7.0

[Foram Katharotiya (OpenERP)]

Hello,

I have fixed the issue of traceback:AttributeError: 'Field name not found in browse_record(res.partner, 4934)'

Steps to reproduce:
1) Install audittrail module.
2) Subscribe the customer audit rule from Reporting-> Audit-> Audit rules.
3) Goto customer & delete customer

Thanks,
FKA

[Ravi Gohil (OpenERP) (rgo-openerp)]

Hi,

I think this fix is not correct because it will result in giving wrong value for "Resource Name"(for the relational fields of the model) in the created log if followed the above process.

The fix from the branch lp:~openerp-dev/openobject-addons/7.0-opw-589931-rgo should solve this issue.

Thanks.

Unmerged revisions

9548. By Foram Katharotiya (OpenERP) on 2013-11-12

[MERGE] with 7.0

9547. By Foram Katharotiya (OpenERP) on 2013-10-28

[FIX] genrate traceback from audittrail module while trying to delete customer

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-12-17 15:46:28 +0000
+++ audittrail/audittrail.py	2013-11-12 05:13:58 +0000
@@ -263,6 +263,7 @@
         # fields to log. currently only used by log on read()
         field_list = []
         old_values = new_values = {}
+        name = ''
 
         if method == 'create':
             res = fct_src(cr, uid_orig, model.model, method, *args, **kw)
@@ -281,6 +282,7 @@
             field_list = args[1]
         elif method == 'unlink':
             res_ids = args[0]
+            name = pool.get(model.model).name_get(cr, uid_orig, res_ids)[0][1]
             old_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
             res = fct_src(cr, uid_orig, model.model, method, *args, **kw)
         else: # method is write, action or workflow action
@@ -300,7 +302,7 @@
                 # check the new values and store them into a dictionary
                 new_values = self.get_data(cr, uid_orig, pool, res_ids, model, method)
         # compare the old and new values and create audittrail log if needed
-        self.process_data(cr, uid_orig, pool, res_ids, model, method, old_values, new_values, field_list)
+        self.process_data(cr, uid_orig, pool, res_ids, model, method, name, old_values, new_values, field_list)
         return res
 
     def get_data(self, cr, uid, pool, res_ids, model, method):
@@ -431,7 +433,7 @@
                 lines[key].append(data)
         return lines
 
-    def process_data(self, cr, uid, pool, res_ids, model, method, old_values=None, new_values=None, field_list=None):
+    def process_data(self, cr, uid, pool, res_ids, model, method, name, old_values=None, new_values=None, field_list=None):
         """
         This function processes and iterates recursively to log the difference between the old
         data (i.e before the method was executed) and the new data and creates audittrail log
@@ -459,7 +461,8 @@
 
             # if at least one modification has been found
             for model_id, resource_id in lines:
-                name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
+                if not name:
+                    name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
                 vals = {
                     'method': method,
                     'object_id': model_id,