Merge lp:~openerp-dev/openobject-addons/6.0-opw-572587-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

Assign audittrail log name as blank in case logged object does not have name field.

If any object does not have name field in that case it tries to log name using resource['name'] and raised error(while create, update, delete).

Please review it.

Regards,
Rifakat

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2011-11-28 06:54:12 +0000
+++ audittrail/audittrail.py	2012-03-15 13:23:19 +0000
@@ -324,7 +324,7 @@
                     "object_id": model.id,
                     "user_id": uid_orig,
                     "res_id": resource['id'],
-                    "name": resource['name'],
+                    "name": resource.get('name', ''),
             }
             if 'id' in resource:
                 del resource['id']
@@ -389,7 +389,7 @@
                     "object_id": model.id,
                     "user_id": uid_orig,
                     "res_id": res_id,
-                    "name" : v['name'],
+                    "name" : v.get('name', ''),
                 }
                 log_id = log_pool.create(cr, uid, vals)
                 lines = []
@@ -444,7 +444,7 @@
                         "object_id": model.id,
                         "user_id": uid_orig,
                         "res_id": resource_id,
-                        "name": resource['name'],
+                        "name": resource.get('name', ''),
                     }