Merge lp:~dani-ds/openerp-spain/6.0 into lp:~openerp-spain-team/openerp-spain/6.0

[Daniel Campos (Avanzosc)]

A la hora de mostrar el informe de Libro Mayor y buscar el año fiscal puedes obtener un id en vez de una lista de ids

[Daniel Campos (Avanzosc) (dani-ds)]

Si no hay ninguna objeción, procedo a realizar el merge.

[Pedro Manuel Baeza (pedro.baeza)]

De acuerdo, Dani, puedes proceder con ello, ¿tienes claro cómo hacerlo para que se quede todo cerrado?

Un saludo.

review: Approve (code review)

[Daniel Campos (Avanzosc) (dani-ds)]

Hola Pedro, si no hay problema.

[lp:~dani-ds/openerp-spain/6.0]

361. By Daniel Campos (Avanzosc) on 2014-05-12

[FIX] A la hora de mostrar el informe del Libro Mayor y el Balance de Sumas y Saldos, al buscar el año fiscal puedes obtener un id en vez de una lista de ids

=== modified file 'account_financial_report_web/report/account_balance.py'
--- account_financial_report_web/report/account_balance.py	2014-02-28 13:09:11 +0000
+++ account_financial_report_web/report/account_balance.py	2014-05-08 15:04:40 +0000
@@ -72,10 +72,11 @@
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         fiscalyear = None
 
-        if form.get('fiscalyear'):
-
-            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
-
+        if 'fiscalyear' in form:
+            if isinstance(form['fiscalyear'], int):
+                fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'])
+            else:
+                fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
             return fiscalyear.name or fiscalyear.code
         else:
             fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, fiscalyear_obj.find(self.cr, self.uid))
@@ -89,7 +90,9 @@
         period_obj = self.pool.get('account.period')
         periods_str = None
         fiscalyear_id = form['fiscalyear'] or fiscalyear_obj.find(self.cr, self.uid)
-        period_ids = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear_id[0]),('special','=',False)])
+        if isinstance(fiscalyear_id, list):
+            fiscalyear_id = fiscalyear_id[0]
+        period_ids = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear_id),('special','=',False)])
         if form['state'] in ['byperiod', 'all']:
             period_ids = form['periods']
         periods_str = ', '.join([period.name or period.code for period in period_obj.browse(self.cr, self.uid, period_ids)])
@@ -133,8 +136,11 @@
 
         # Get the fiscal year
         fiscalyear = None
-        if form.get('fiscalyear'):
-            fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
+        if 'fiscalyear' in form:
+            if isinstance(form['fiscalyear'], int):
+                fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'])
+            else:
+                fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'][0])
         else:
             fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, fiscalyear_obj.find(self.cr, self.uid))
 

=== modified file 'account_financial_report_web/report/general_ledger.py'
--- account_financial_report_web/report/general_ledger.py	2014-02-28 13:09:11 +0000
+++ account_financial_report_web/report/general_ledger.py	2014-05-08 15:04:40 +0000
@@ -73,8 +73,11 @@
 
     def get_fiscalyear(self, form):
         res=[]
-        if form.has_key('fiscalyear'):
-            fisc_id = form['fiscalyear'][0]
+        if 'fiscalyear' in form:
+            if isinstance(form['fiscalyear'], int):
+                fisc_id = form['fiscalyear']
+            else:
+                fisc_id = form['fiscalyear'][0]
             if not (fisc_id):
                 return ''
             self.cr.execute("SELECT name FROM account_fiscalyear WHERE id = %s" , (int(fisc_id),))
@@ -148,7 +151,10 @@
         # ctx: Context for the given date or period
         ctx = self.context.copy()
         if 'fiscalyear' in form and form['fiscalyear']:
-            ctx['fiscalyear'] = form['fiscalyear'][0]
+            if isinstance(form['fiscalyear'], int):
+                ctx['fiscalyear'] = form['fiscalyear']
+            else:
+                ctx['fiscalyear'] = form['fiscalyear'][0]
         if form['state'] in ['byperiod', 'all']:
             ctx['periods'] = form['periods']
         if form['state'] in ['bydate', 'all']: