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

[jftempo]

=== modified file 'bin/addons/msf_audittrail/data/audittrail_data_purchase.yml'
--- bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2013-01-04 15:58:10 +0000
+++ bin/addons/msf_audittrail/data/audittrail_data_purchase.yml	2016-11-10 08:16:07 +0000
@@ -120,7 +120,7 @@
     rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
     if object_ids:
         # Create the rule
-        fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom']
+        fields = ['confirmed_delivery_date', 'date_planned', 'default_code', 'name', 'notes', 'price_unit', 'product_qty', 'product_uom', 'line_number']
         
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'purchase.order.line'), ('name', 'in', fields)], context=context)
         field_name = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'purchase.order.line'), ('name', '=', 'line_number')], context=context)
@@ -184,4 +184,4 @@
         if rule_id:
             self.write(cr, uid, rule_id, vals, context=context)
         # Subscribe to the rule
-        self.subscribe(cr, uid, rule_id)
 \ No newline at end of file
+        self.subscribe(cr, uid, rule_id)
 
=== modified file 'bin/addons/msf_tools/msf_tools.py'
--- bin/addons/msf_tools/msf_tools.py	2016-08-22 13:55:25 +0000
+++ bin/addons/msf_tools/msf_tools.py	2016-11-10 08:16:07 +0000
@@ -395,6 +395,9 @@
         base_obj = self.pool.get(base_object)
         dest_obj = self.pool.get(dest_object)
         seq_obj = self.pool.get('ir.sequence')
+        audit_obj = self.pool.get('audittrail.rule')
+
+        to_trace = dest_obj.check_audit(cr, uid, 'write')
 
         # find the corresponding base ids
         base_ids = [x[foreign_field][0] for x in dest_obj.read(cr, uid, ids, [foreign_field], context=context) if x[foreign_field]]
@@ -420,6 +423,11 @@
                     # numbering value
                     start_num = start_num+1
                     if item_data[i][seq_field] != start_num:
+                        # Create the audittrail log line if the object is traceable
+                        if to_trace:
+                            previous_values = dest_obj.read(cr, uid, [item_data[i]['id']], [seq_field], context=context)
+                            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)
+
                         cr.execute("update "+dest_obj._table+" set "+seq_field+"=%s where id=%s", (start_num, item_data[i]['id']))
                         #dest_obj.write(cr, uid, [item_data[i]['id']], {seq_field: start_num}, context=context)