Merge lp:~openerp-dev/openobject-addons/7.0-opw-593569-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue in audittrail.

Steps to reproduce the issue you have observed
  -Install purchase & audittrail modules
  -Create a audittrail.log to purchase.order object (delete, create, write) and add users
  -Push button suscribe
  -Open a P.O. and try delete it gives traceback.
Video with test case: http://youtu.be/uXVS8i3zEvY
Back-ported : lp:~openerp-dev/openobject-addons/trunk-bug-1177840-dharmraj

Thanks,
pna

[Martin Trigaux (OpenERP) (mat-openerp)]

Duplicate of lp:~openerp-dev/openobject-addons/7.0-opw-604750-skh
I have merged Somesh's one (rev 9892) as it was a bit more flexible (fallback on False if no 'name' key).
I will reject this one then.

Regards

Unmerged revisions

9246. By Pinakin Nayi (OpenERP) on 2013-06-18

[FIX]audittrail : when on subscribed object try to delete records its gives traceback

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-12-17 15:46:28 +0000
+++ audittrail/audittrail.py	2013-06-18 09:56:05 +0000
@@ -459,13 +459,11 @@
 
             # if at least one modification has been found
             for model_id, resource_id in lines:
-                name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
                 vals = {
                     'method': method,
                     'object_id': model_id,
                     'user_id': uid,
                     'res_id': resource_id,
-                    'name': name,
                 }
                 if (model_id, resource_id) not in old_values and method not in ('copy', 'read'):
                     # the resource was not existing so we are forcing the method to 'create'
@@ -476,7 +474,11 @@
                     # the resource is not existing anymore so we are forcing the method to 'unlink'
                     # (because it could also come with the value 'write' if we are deleting the
                     #  record through a one2many field)
+                    name = old_values[(model_id, resource_id)]['value']['name']
                     vals.update({'method': 'unlink'})
+                else :
+                    name = pool[model.model].name_get(cr, uid, [resource_id])[0][1]
+                vals.update({'name': name})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
                     log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)