Unifield Server

Merge lp:~unifield-team/unifield-server/us-1557 into lp:unifield-server

  1. us-1557
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4048
Proposed branch: lp:~unifield-team/unifield-server/us-1557
Merge into: lp:unifield-server
Diff against target: 44 lines (+10/-2)
2 files modified
bin/addons/msf_audittrail/data/audittrail_data_purchase.yml (+2/-2)
bin/addons/msf_tools/msf_tools.py (+8/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1557
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+310510@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
1=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_purchase.yml'
2--- bin/addons/msf_audittrail/data/audittrail_data_purchase.yml 2013-01-04 15:58:10 +0000
3+++ bin/addons/msf_audittrail/data/audittrail_data_purchase.yml 2016-11-10 08:16:07 +0000
4@@ -120,7 +120,7 @@
5 rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
6 if object_ids:
7 # Create the rule
8- fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom']
9+ fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom', 'line_number']
10
11 fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'purchase.order.line'), ('name', 'in', fields)], context=context)
12 field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'purchase.order.line'), ('name', '=', 'line_number')], context=context)
13@@ -184,4 +184,4 @@
14 if rule_id:
15 self.write(cr, uid, rule_id, vals, context=context)
16 # Subscribe to the rule
17- self.subscribe(cr, uid, rule_id)
18\ No newline at end of file
19+ self.subscribe(cr, uid, rule_id)
20
21=== modified file 'bin/addons/msf_tools/msf_tools.py'
22--- bin/addons/msf_tools/msf_tools.py 2016-08-22 13:55:25 +0000
23+++ bin/addons/msf_tools/msf_tools.py 2016-11-10 08:16:07 +0000
24@@ -395,6 +395,9 @@
25 base_obj = self.pool.get(base_object)
26 dest_obj = self.pool.get(dest_object)
27 seq_obj = self.pool.get('ir.sequence')
28+ audit_obj = self.pool.get('audittrail.rule')
29+
30+ to_trace = dest_obj.check_audit(cr, uid, 'write')
31
32 # find the corresponding base ids
33 base_ids = [x[foreign_field][0] for x in dest_obj.read(cr, uid, ids, [foreign_field], context=context) if x[foreign_field]]
34@@ -420,6 +423,11 @@
35 # numbering value
36 start_num = start_num+1
37 if item_data[i][seq_field] != start_num:
38+ # Create the audittrail log line if the object is traceable
39+ if to_trace:
40+ previous_values = dest_obj.read(cr, uid, [item_data[i]['id']], [seq_field], context=context)
41+ audit_obj.audit_log(cr, uid, to_trace, dest_obj, [item_data[i]['id']], 'write', previous_values, {item_data[i]['id']: {seq_field: start_num}}, context=context)
42+
43 cr.execute("update "+dest_obj._table+" set "+seq_field+"=%s where id=%s", (start_num, item_data[i]['id']))
44 #dest_obj.write(cr, uid, [item_data[i]['id']], {seq_field: start_num}, context=context)
45

Subscribers

People subscribed via source and target branches

to all changes: