Merge lp:~openerp-dev/openobject-addons/trunk-bug-1217779-mba into lp:openobject-addons

[Mahendra Barad(OpenERP)]

Hello sir,

I have fix the issue the wizard that generate recurring move ignore company and breaks on security rules in multi company mode.

Thank you.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

The way the query is written strikes me as very inefficient. Why use 2 nested subqueries instead of relational joins for which the database optimizer will be able to generate a widely more efficient execution plan?

Something along the line of

select account_subscription_line.id
from account_subscription_line join account_subscription on (subscription_id=account_subscription.id) join account_model on (account_subscription.model_id=account_model.id)
where account_subscription_line.date<%s and account_subscription_line.move_id is null
and account_model.company_id=%s;

(not tested, maybe outer joins should be used)

review: Needs Information (code review, no test)

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Current SQL is faulty and gives following
error

 ERROR: more than one row returned by a subquery used as an expression.

If we look to the query this error seems logical.

I have not investigate more, it is maybe due to corrupted setup and we should never have such configuration but I dont think so.

Alexandre query works out of the box.

Regards

Nicolas

review: Disapprove

Unmerged revisions

9038. By Mahendra Barad(OpenERP) on 2014-01-07

[FIX]generate recurring move ignore company issue

=== modified file 'account/wizard/account_subscription_generate.py'
--- account/wizard/account_subscription_generate.py	2013-10-27 12:31:04 +0000
+++ account/wizard/account_subscription_generate.py	2014-01-08 06:06:07 +0000
@@ -37,8 +37,9 @@
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         moves_created=[]
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id
         for data in  self.read(cr, uid, ids, context=context):
-            cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
+            cr.execute('select id from account_subscription_line where date<%s and move_id is null and subscription_id=(select id from account_subscription where model_id=(select id from account_model where company_id=%s))', (data['date'],company_id,))
             line_ids = map(lambda x: x[0], cr.fetchall())
             moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
             moves_created.extend(moves)