Merge lp:~openerp-dev/openobject-addons/6.1-opw-573362-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the problem of maximum recursion depth when object has many2many field of it self with respect of maintenance case:573362 .

Thanks

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Alexis de Lattre (alexis-via)]

Could this branch be merged in addons/6.1 please ?

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-573362-port-mma/+merge/132242 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Unmerged revisions

6738. By Hardik Ansodariya (OpenERP) on 2012-04-26

[Fixed] audittrail: fix the problem of recursion if object contains o2m or m2m field of same object(Maintanace Case: 573362)

=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-03-23 14:25:41 +0000
+++ audittrail/audittrail.py	2012-04-26 10:17:23 +0000
@@ -344,7 +344,12 @@
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
                         x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        field_resource_ids = list(set(resource[field]))
+                        if model.model == x2m_model.model:
+                            # we need to remove current resource_id from the many2many to prevent an infinit loop
+                            if resource_id in field_resource_ids:
+                                field_resource_ids.remove(resource_id)
+                        data.update(self.get_data(cr, 1, pool, field_resource_ids, x2m_model, method))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
@@ -402,6 +407,10 @@
                     x2m_new_values_ids = new_values.get(key, {'value': {}})['value'].get(field_name, [])
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
+                    if model.model == x2m_model.model:
+                        # we need to remove current resource_id from the many2many to prevent an infinit loop
+                        if resource_id in res_ids:
+                            res_ids.remove(resource_id)
                     for res_id in res_ids:
                         lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change