Merge lp:~unifield-team/unifield-server/us1358-trackchanges into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3941
Proposed branch: lp:~unifield-team/unifield-server/us1358-trackchanges
Merge into: lp:unifield-server
Diff against target: 100 lines (+73/-0)
3 files modified
bin/addons/msf_audittrail/__openerp__.py (+1/-0)
bin/addons/msf_audittrail/audittrail.py (+15/-0)
bin/addons/msf_audittrail/data/audittrail_data_JI.yml (+57/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us1358-trackchanges
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+303654@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/msf_audittrail/__openerp__.py'
--- bin/addons/msf_audittrail/__openerp__.py 2015-06-08 14:49:44 +0000
+++ bin/addons/msf_audittrail/__openerp__.py 2016-08-23 07:24:56 +0000
@@ -45,6 +45,7 @@
45 'data/audittrail_data_sale.yml',45 'data/audittrail_data_sale.yml',
46 'data/audittrail_data_purchase.yml',46 'data/audittrail_data_purchase.yml',
47 'data/audittrail_data_products.yml',47 'data/audittrail_data_products.yml',
48 'data/audittrail_data_JI.yml',
48 'audittrail_report.xml',49 'audittrail_report.xml',
49 'audittrail_invoice_data.yml',50 'audittrail_invoice_data.yml',
50 ],51 ],
5152
=== modified file 'bin/addons/msf_audittrail/audittrail.py'
--- bin/addons/msf_audittrail/audittrail.py 2016-05-25 15:17:02 +0000
+++ bin/addons/msf_audittrail/audittrail.py 2016-08-23 07:24:56 +0000
@@ -320,6 +320,21 @@
320320
321account_period()321account_period()
322322
323#UF-1358: Track changes also for account move and account move line
324class account_move(osv.osv):
325 _name = 'account.move'
326 _inherit = 'account.move'
327 _trace = True
328
329account_move()
330
331class account_move_line(osv.osv):
332 _name = 'account.move.line'
333 _inherit = 'account.move.line'
334 _trace = True
335
336account_move_line()
337
323338
324class ir_module(osv.osv):339class ir_module(osv.osv):
325 _inherit = 'ir.module.module'340 _inherit = 'ir.module.module'
326341
=== added file 'bin/addons/msf_audittrail/data/audittrail_data_JI.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_JI.yml 1970-01-01 00:00:00 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_JI.yml 2016-08-23 07:24:56 +0000
@@ -0,0 +1,57 @@
1-
2 For Journal Entries (account.move), track the creation and modif, delete
3- !python {model: audittrail.rule}: |
4 name = 'Journal Entries'
5 object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'account.move')], context=context)
6 rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
7 if object_ids and not rule_id:
8 # Create the rule
9 fields = ['name','state','ref','journal_id','period_id','date','partner_id','status','sequence_id','manual_name','document_date','analytic_distribution_id','employee_id','instance_id','manual_currency_id']
10 fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'account.move'), ('name', 'in', fields)], context=context)
11
12 rule_id = self.create(cr, uid, {'name': name,
13 'object_id': object_ids[0],
14 'log_write': True,
15 'log_unlink': True,
16 'log_create': True,
17 'field_ids': [(6, 0, fields_ids)],
18 }, context=context)
19
20 # Subscribe to the rule
21 self.subscribe(cr, uid, rule_id)
22
23-
24 For Journal Items (account.move.line), track the creation and modif, delete
25- !python {model: audittrail.rule}: |
26 name = 'Journal Items'
27 object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'account.move.line')], context=context)
28 rule_id = self.search(cr, uid, [('object_id', 'in', object_ids)], context=context)
29 if object_ids and not rule_id:
30 # Create the rule
31 fields = ['state','reference','account_id','partner_txt','debit','credit','employee_id','analytic_distribution_id']
32
33 fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'account.move.line'), ('name', 'in', fields)], context=context)
34 field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'account.move.line'), ('name', '=', 'reference')], context=context)
35 field_parent = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'account.move.line'), ('name', '=', 'move_id')], context=context)
36
37 name_id = False
38 parent_id = False
39
40 if field_parent:
41 parent_id = field_parent[0]
42 if field_name:
43 name_id = field_name[0]
44
45 rule_id = self.create(cr, uid, {'name': name,
46 'object_id': object_ids[0],
47 'log_write': True,
48 'log_unlink': True,
49 'log_create': True,
50 'field_ids': [(6, 0, fields_ids)],
51 'parent_field_id': parent_id,
52 'name_get_field_id': name_id,
53 }, context=context)
54
55 # Subscribe to the rule
56 self.subscribe(cr, uid, rule_id)
57
0\ No newline at end of file58\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: