Odoo Addons (MOVED TO GITHUB)

Merge lp:~serpent-consulting-services/openobject-addons/trunk-1013229-SerpentCS into lp:openobject-addons

  1. trunk-1013229-SerpentCS
  2. Merge into trunk
Proposed by Serpent Consulting Services
Status: Merged
Merged at revision: 7689
Proposed branch: lp:~serpent-consulting-services/openobject-addons/trunk-1013229-SerpentCS
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-1)
1 file modified
audittrail/audittrail.py (+1/-1)
To merge this branch: bzr merge lp:~serpent-consulting-services/openobject-addons/trunk-1013229-SerpentCS
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+111503@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Serpent Consulting Services (serpent-consulting-services) wrote :

Thank you Fabien(OpenERP)!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'audittrail/audittrail.py'
2--- audittrail/audittrail.py 2012-05-04 11:57:48 +0000
3+++ audittrail/audittrail.py 2012-06-21 21:53:24 +0000
4@@ -483,7 +483,7 @@
5 if len(rule['user_id']) == 0 or uid in rule['user_id']:
6 if rule.get('log_'+method,0):
7 return True
8- elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create'):
9+ elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create', 'read_group', 'import_data'):
10 if rule['log_action']:
11 return True
12

Subscribers

People subscribed via source and target branches

to all changes: