Merge lp:~openerp-dev/openobject-addons/trunk-bug-1200021-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello,

I have fixed the issue of Tax Report chooses wrong data if both periods are not selected.

Thanks & Regards,
Devnani Bharat R.

[lp:~openerp-dev/openobject-addons/trunk-bug-1200021-bde]

9029. By Bharat Devnani (Open ERP) on 2013-12-27

[FIX] [ACCOUNT] : Tax Report chooses wrong data if both periods are not selected

Unmerged revisions

9029. By Bharat Devnani (Open ERP) on 2013-12-27

[FIX] [ACCOUNT] : Tax Report chooses wrong data if both periods are not selected

=== modified file 'account/report/account_tax_report.py'
--- account/report/account_tax_report.py	2012-12-06 14:56:32 +0000
+++ account/report/account_tax_report.py	2013-12-27 06:52:07 +0000
@@ -31,6 +31,7 @@
         new_ids = ids
         res = {}
         self.period_ids = []
+        self.fiscalyear_id = data['form'].get('fiscalyear_id', False)
         period_obj = self.pool.get('account.period')
         self.display_detail = data['form']['display_detail']
         res['periods'] = ''
@@ -70,9 +71,12 @@
         if period_list:
             res = self._add_codes(based_on, res, period_list, context=context)
         else:
-            self.cr.execute ("select id from account_fiscalyear")
-            fy = self.cr.fetchall()
-            self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
+            if self.fiscalyear_id:
+                self.cr.execute ("select id from account_period where fiscalyear_id = %s", (self.fiscalyear_id,))
+            else:
+                self.cr.execute ("select id from account_fiscalyear")
+                fy = self.cr.fetchall()
+                self.cr.execute ("select id from account_period where fiscalyear_id = %s",(fy[0][0],))
             periods = self.cr.fetchall()
             for p in periods:
                 period_list.append(p[0])

=== modified file 'account/wizard/account_vat_view.xml'
--- account/wizard/account_vat_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_vat_view.xml	2013-12-27 06:52:07 +0000
@@ -16,7 +16,7 @@
                 </group>
 
                 <group string="Periods"  col="4">
-                    <field name="period_from"  domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
+                    <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                     <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
                 </group>
                 <footer>