Merge lp:~openerp-dev/openobject-addons/trunk-bug-810548-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

Here i put a constraint for period related to the company.
Because, if period is not found for the company, it will take the default company's period.

Divyesh Makwana(MDI)

[qdp (OpenERP) (qdp)]

not good patch, you must use the function find(self, cr, uid, dt=None, context=None) of account_period.

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have done the changes, as per your suggestion.

Thanks and Regards,

Divyesh Makwana(MDI)

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

9 + period_ids = period_obj.find(cr, uid, inv.date_invoice)
20 + period_id = period_ids[0]

can be optimize by

                period_id = period_obj.find(cr, uid, inv.date_invoice)[0]

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have done the changes, as per your suggestion.

Thanks and Regards,

Divyesh Makwana(MDI)

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

This does not fixes the bug.

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Sir,

I have passes the "company_id" in context.

Thanks and Regards,

Divyesh Makwana(MDI)

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Approve

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2011-11-11 13:27:53 +0000
+++ account/account_invoice.py	2011-11-14 11:56:17 +0000
@@ -795,6 +795,7 @@
         """Creates invoice related analytics and financial move lines"""
         ait_obj = self.pool.get('account.invoice.tax')
         cur_obj = self.pool.get('res.currency')
+        period_obj = self.pool.get('account.period')
         context = {}
         for inv in self.browse(cr, uid, ids):
             if not inv.journal_id.sequence_id:
@@ -923,10 +924,10 @@
                 'narration':inv.comment
             }
             period_id = inv.period_id and inv.period_id.id or False
+            ctx.update({'company_id': inv.company_id.id})
             if not period_id:
-                period_ids = self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d')), ('company_id', '=', inv.company_id.id)])
-                if period_ids:
-                    period_id = period_ids[0]
+                period_ids = period_obj.find(cr, uid, inv.date_invoice, context=ctx)
+                period_id = period_ids and period_ids[0] or False
             if period_id:
                 move['period_id'] = period_id
                 for i in line: