Merge lp:~openerp-community/openobject-addons/6.1-bug-1012931 into lp:openobject-addons/6.1

[Maxime Chambreuil (http://www.savoirfairelinux.com)]

[FIX] Audittrail

[Leonardo Pistone (lepistone)]

Hi Maxime,
This old MP in my opinion fixes bug #1157497 just fine. The 6.1 patch supplied there, in my opinion, doesn't.
I can propose that for OCB as well, do you agree?

Thanks!

review: Approve (test for bug 1157497, code review)

[debaetsr (rubendebaets)]

Hello,

I've got some news for you, I'm so excited that I couldn't fall asleep last night. Read it here please <http://option.phuspicks.com/e4msb>

Yours truly, ruben

Unmerged revisions

6974. By Kuldeep Joshi(OpenERP) on 2012-09-03

[FIX] audittrail: check field in column or not

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-03-23 14:25:41 +0000
+++ audittrail/audittrail.py	2012-09-04 00:06:20 +0000
@@ -189,17 +189,20 @@
         :return: string value or a list of values(for O2M/M2M)
         """
 
-        field_obj = (resource_pool._all_columns.get(field)).column
-        if field_obj._type in ('one2many','many2many'):
-            data = pool.get(field_obj._obj).name_get(cr, uid, value)
-            #return the modifications on x2many fields as a list of names
-            res = map(lambda x:x[1], data)
-        elif field_obj._type == 'many2one':
-            #return the modifications on a many2one field as its value returned by name_get()
-            res = value and value[1] or value
+        if field not in resource_pool._all_columns.keys():
+            return value
         else:
-            res = value
-        return res
+            field_obj = (resource_pool._all_columns.get(field)).column
+            if field_obj._type in ('one2many','many2many'):
+                data = pool.get(field_obj._obj).name_get(cr, uid, value)
+                #return the modifications on x2many fields as a list of names
+                res = map(lambda x:x[1], data)
+            elif field_obj._type == 'many2one':
+                #return the modifications on a many2one field as its value returned by name_get()
+                res = value and value[1] or value
+            else:
+                res = value
+            return res
 
     def create_log_line(self, cr, uid, log_id, model, lines=[]):
         """
@@ -334,17 +337,20 @@
                 # get the textual value of that field for this record
                 values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
 
-                field_obj = resource_pool._all_columns.get(field).column
-                if field_obj._type in ('one2many','many2many'):
-                    # check if an audittrail rule apply in super admin mode
-                    if self.check_rules(cr, 1, field_obj._obj, method):
-                        # check if the model associated to a *2m field exists, in super admin mode
-                        x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
-                        x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
-                        assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                        x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
-                        #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                if field not in resource_pool._all_columns.keys():
+                    pass
+                else:
+                    field_obj = resource_pool._all_columns.get(field).column
+                    if field_obj._type in ('one2many','many2many'):
+                        # check if an audittrail rule apply in super admin mode
+                        if self.check_rules(cr, 1, field_obj._obj, method):
+                            # check if the model associated to a *2m field exists, in super admin mode
+                            x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                            x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
+                            assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
+                            x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                            #recursive call on x2m fields that need to be checked too
+                            data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -405,6 +411,8 @@
                     for res_id in res_ids:
                         lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change
+            if field_name == 'id':
+                continue
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
                       'name': field_name,