Merge lp:~therp-nl/openobject-addons/6.1-lp1111597 into lp:openobject-addons/6.1

[Holger Brunn (Therp)]

Unmerged revisions

7145. By Holger Brunn (Therp) on 2013-02-07

[FIX] ignore columns that are filtered out in get_data also in
prepare_audittrail_log_line

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-03-23 14:25:41 +0000
+++ audittrail/audittrail.py	2013-02-07 09:42:22 +0000
@@ -173,6 +173,9 @@
 class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
+    "Columns to be filtered from audited fields"
+    __filtered_columns = ('__last_update', 'id')
+
     def get_value_text(self, cr, uid, pool, resource_pool, method, field, value):
         """
         Gets textual values for the fields.
@@ -328,7 +331,7 @@
             resource_id = resource['id']
             # loop on each field on the res_ids we just have read
             for field in resource:
-                if field in ('__last_update', 'id'):
+                if field in self.__filtered_columns:
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
@@ -385,7 +388,7 @@
         # loop on all the fields
         for field_name, field_definition in pool.get(model.model)._all_columns.items():
             #if the field_list param is given, skip all the fields not in that list
-            if field_list and field_name not in field_list:
+            if field_list and field_name not in field_list or field_name in self.__filtered_columns:
                 continue
             field_obj = field_definition.column
             if field_obj._type in ('one2many','many2many'):