Merge lp:~openerp-community/openobject-addons/6.1-903160-jcl into lp:openobject-addons/6.1

Status: Needs review
Proposed branch: lp:~openerp-community/openobject-addons/6.1-903160-jcl
Merge into: lp:openobject-addons/6.1
Diff against target: 12 lines (+2/-0)
1 file modified
audittrail/audittrail.py (+2/-0)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/6.1-903160-jcl
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+145635@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

If the target branch is not supported by OpenERP SA any more, can you please change the ownership of the branch to openerp-community-reviewer ?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py 2012-03-23 14:25:41 +0000
+++ audittrail/audittrail.py 2013-01-30 15:33:23 +0000
@@ -384,6 +384,8 @@
384 }384 }
385 # loop on all the fields385 # loop on all the fields
386 for field_name, field_definition in pool.get(model.model)._all_columns.items():386 for field_name, field_definition in pool.get(model.model)._all_columns.items():
387 if field_name in ('__last_update', 'id'):
388 continue
387 #if the field_list param is given, skip all the fields not in that list389 #if the field_list param is given, skip all the fields not in that list
388 if field_list and field_name not in field_list:390 if field_list and field_name not in field_list:
389 continue391 continue