Merge lp:~openerp-dev/openobject-addons/trunk-bug-1177840-dharmraj into lp:openobject-addons

[Dharmraj Zala(OpenERP)]

Hello,

I have fixed the issue when audit rules applied on unlink method, it gives traceback.

Thanks,
Dharmraj.

Unmerged revisions

8757. By Dharmraj Zala(OpenERP) on 2013-06-10

[FIX] improved the condition for audit-trail logs

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2013-03-29 14:37:20 +0000
+++ audittrail/audittrail.py	2013-06-10 08:41:33 +0000
@@ -456,7 +456,10 @@
 
         # if at least one modification has been found
         for model_id, resource_id in lines:
-            name = pool[model.model].name_get(cr, uid, [resource_id])[0][1]
+            if (model_id, resource_id) not in new_values and method not in ('copy', 'read'):
+                name = old_values[(model_id, resource_id)]['value']['name']
+            else:
+                name = pool[model.model].name_get(cr, uid, [resource_id])[0][1]
             vals = {
                 'method': method,
                 'object_id': model_id,