Merge lp:~vauxoo/account-financial-report/miguel-bug-918857 into lp:~vauxoo/account-financial-report/trunk

[Miguel Delgado (Vauxoo)]

=== modified file 'account_financial_report/report/account_balance.py'
--- account_financial_report/report/account_balance.py	2012-01-02 22:27:49 +0000
+++ account_financial_report/report/account_balance.py	2012-01-20 23:38:23 +0000
@@ -53,8 +53,8 @@
             'lines': self.lines,
             'get_fiscalyear_text': self.get_fiscalyear_text,
             'get_periods_and_date_text': self.get_periods_and_date_text,
-            'get_inf_text': self.get_informe_text,
-            'get_month':self._get_month,
+            'get_informe_text': self.get_informe_text,
+            'get_month':self.get_month,
         })
         self.context = context
 
@@ -72,21 +72,25 @@
             fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, fiscalyear_obj.find(self.cr, self.uid))
             return "%s*" % (fiscalyear.name or fiscalyear.code)
             
-    def _get_month(self, form):
+    def get_month(self, form):
         '''
         return day, year and month
         '''
-
-        months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
-
-        mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
-        ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
-        dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
-
-        if form['inf_type']=='edogp':
-            return 'DESDE: '+self.formatLang(form['date_from'], date=True)+'  HASTA: '+self.formatLang(form['date_to'], date=True)
-        else:
-            return 'AL '+str(dia) + ' DE ' + mes.upper() + ' DE ' + str(ano)
+        if form['filter'] in ['bydate', 'all']:
+            months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
+            mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
+            ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
+            dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
+            return 'Período del '+self.formatLang(form['date_from'], date=True)+' al '+self.formatLang(form['date_to'], date=True)
+        elif form['filter'] in ['byperiod', 'all']:
+            aux=[]
+            period_obj = self.pool.get('account.period')
+            
+            for period in period_obj.browse(self.cr, self.uid, form['periods']):
+                aux.append(period.date_start)
+                aux.append(period.date_stop)
+            sorted(aux)
+            return 'Período del '+self.formatLang(aux[0], date=True)+' al '+self.formatLang(aux[-1], date=True)
 
     def get_informe_text(self, form):
         """
@@ -107,12 +111,12 @@
         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),('special','=',False)])
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] 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)])
 
         dates_str = None
-        if form['state'] in ['bydate', 'all']:
+        if form['filter'] in ['bydate', 'all']:
             dates_str = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
 
         return {'periods':periods_str, 'date':dates_str}
@@ -184,13 +188,12 @@
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),'|',('special','=',False),('date_stop','<',fiscalyear.date_stop)])
         else:
             # Use all the open fiscal years
-            open_fiscalyear_ids = fiscalyear_obj.search(self.cr, self.uid, [('state','=','draft')])
+            open_fiscalyear_ids = fiscalyear_obj.search(self.cr, self.uid, [('filter','=','draft')])
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','in',open_fiscalyear_ids),'|',('special','=',False),('date_stop','<',fiscalyear.date_stop)])
 
         fy_balance = {}
         for acc in account_obj.read(self.cr, self.uid, [x[0] for x in account_ids], ['balance'], ctx):
             fy_balance[acc['id']] = acc['balance']
-
         #
         # Calculate the FY Debit/Credit
         # (from full fiscal year without opening or closing periods)
@@ -204,12 +207,12 @@
         # (from the selected period or all the non special periods in the fy)
         #
         ctx = self.context.copy()
-        ctx['state'] = form.get('state','all')
+        ctx['filter'] = form.get('filter','all')
         ctx['fiscalyear'] = fiscalyear.id
         ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id)])
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] in ['byperiod', 'all']:
             ctx['periods'] = form['periods']
-        if form['state'] in ['bydate', 'all']:
+        if form['filter'] in ['bydate', 'all']:
             ctx['date_from'] = form['date_from']
             ctx['date_to'] = form['date_to']
 
 
=== modified file 'account_financial_report/report/account_balance_2_cols.py'
--- account_financial_report/report/account_balance_2_cols.py	2012-01-02 22:36:00 +0000
+++ account_financial_report/report/account_balance_2_cols.py	2012-01-20 23:38:23 +0000
@@ -53,8 +53,8 @@
             'lines': self.lines,
             'get_fiscalyear_text': self.get_fiscalyear_text,
             'get_periods_and_date_text': self.get_periods_and_date_text,
-            'get_inf_text': self.get_informe_text,
-            'get_month':self._get_month,
+            'get_informe_text': self.get_informe_text,
+            'get_month':self.get_month,
         })
         self.context = context
 
@@ -78,27 +78,30 @@
         """
         inf_type = {
             'bgen' : '               Balance General',
-            'bcom' : '       Balance de Comprobacion',
-            'edogp': 'Estado de Ganancias y Perdidas',
-            'bdl': 'Libro Diario Legal',
+            'bcom' : '       Balance de Comprobacion',            
+            'edogp': 'Estado de Ganancias y Perdidas' 
         }
         return inf_type[form['inf_type']]
 
-    def _get_month(self, form):
+    def get_month(self, form):
         '''
         return day, year and month
         '''
-
-        months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
-
-        mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
-        ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
-        dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
-
-        if form['inf_type']=='edogp':
-            return 'DESDE: '+self.formatLang(form['date_from'], date=True)+'  HASTA: '+self.formatLang(form['date_to'], date=True)
-        else:
-            return 'AL '+str(dia) + ' DE ' + mes.upper() + ' DE ' + str(ano)
+        if form['filter'] in ['bydate', 'all']:
+            months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
+            mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
+            ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
+            dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
+            return 'Período del '+self.formatLang(form['date_from'], date=True)+' al '+self.formatLang(form['date_to'], date=True)
+        elif form['filter'] in ['byperiod', 'all']:
+            aux=[]
+            period_obj = self.pool.get('account.period')
+            
+            for period in period_obj.browse(self.cr, self.uid, form['periods']):
+                aux.append(period.date_start)
+                aux.append(period.date_stop)
+            sorted(aux)
+            return 'Período del '+self.formatLang(aux[0], date=True)+' al '+self.formatLang(aux[-1], date=True)
 
     def get_periods_and_date_text(self, form):
         """
@@ -108,14 +111,13 @@
         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),('special','=',False)])
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] 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)])
 
         dates_str = None
-        if form['state'] in ['bydate', 'all']:
+        if form['filter'] in ['bydate', 'all']:
             dates_str = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
-
         return {'periods':periods_str, 'date':dates_str}
 
 
@@ -125,14 +127,17 @@
         (account info plus debit/credit/balance in the selected period
         and the full year)
         """
+        tot_bin = 0.0
         tot_deb = 0.0
         tot_crd = 0.0
+        tot_eje = 0.0
         if not ids:
             ids = self.ids
         if not ids:
             return []
         if not done:
             done = {}
+
         if form.has_key('account_list') and form['account_list']:
             account_ids = form['account_list']
             del form['account_list']
@@ -143,7 +148,6 @@
         period_obj = self.pool.get('account.period')
         fiscalyear_obj = self.pool.get('account.fiscalyear')
 
-        # Get the fiscal year
         fiscalyear = None
         if form.get('fiscalyear'):
             fiscalyear = fiscalyear_obj.browse(self.cr, self.uid, form['fiscalyear'])
@@ -153,6 +157,7 @@
         #
         # Get the accounts
         #
+
         def _get_children_and_consol(cr, uid, ids, level, context={}):
             aa_obj = self.pool.get('account.account')
             ids2=[]
@@ -173,38 +178,42 @@
         child_ids = _get_children_and_consol(self.cr, self.uid, account_ids, form['display_account_level'] and form['display_account_level'] or 100,self.context)
         if child_ids:
             account_ids = child_ids
+        
+        account_obj = self.pool.get('account.account')
+        period_obj = self.pool.get('account.period')
+        fiscalyear_obj = self.pool.get('account.fiscalyear')
 
-        #
-        # Calculate the period Debit/Credit
-        # (from the selected period or all the non special periods in the fy)
-        #
+        #############################################################################
+        # Calculate the period Debit/Credit                                         #
+        # (from the selected period or all the non special periods in the fy)       #
+        #############################################################################
 
         ctx = self.context.copy()
-        ctx['state'] = form.get('state','all')
+        ctx['filter'] = form.get('filter','all')
         ctx['fiscalyear'] = fiscalyear.id
-        ctx['periods'] = form.get('periods')
-        if form['state'] in ['byperiod', 'all']:
-            date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
-            ctx['periods'] = ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_stop','<=',date_start)])
-        if form['state'] in ['bydate', 'all']:
+        ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)])
+        if form['filter'] in ['byperiod', 'all']:
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('id','in',form['periods'] or ctx['periods']),('special','=',False)])
+        if form['filter'] in ['bydate', 'all']:
             ctx['date_from'] = form['date_from']
             ctx['date_to'] = form['date_to']
 
         accounts=[]
+
         val = account_obj.browse(self.cr, self.uid, [aa_id[0] for aa_id in account_ids], ctx)
         c = 0
         for aa_id in account_ids:
             new_acc = {
-                'id'        :val[c].id, 
-                'type'      :val[c].type,
-                'code'      :val[c].code,
-                'name'      :val[c].name,
-                'debit'     :val[c].debit,
-                'credit'    :val[c].credit,
-                'parent_id' :val[c].parent_id and val[c].parent_id.id,
-                'level'     :val[c].level,
-                'label'     :aa_id[1],
-                'total'     :aa_id[2],
+            'id'        :val[c].id, 
+            'type'      :val[c].type,
+            'code'      :val[c].code,
+            'name'      :val[c].name,
+            'debit'     :val[c].debit,
+            'credit'    :val[c].credit,
+            'parent_id' :val[c].parent_id and val[c].parent_id.id,
+            'level'     :val[c].level,
+            'label'     :aa_id[1],
+            'total'     :aa_id[2],
             }
             c += 1
             accounts.append(new_acc)
@@ -214,11 +223,38 @@
                                 fiscalyear_obj.search(self.cr, self.uid, [('date_stop','<',fiscalyear.date_start)],order='date_stop')[-1] or []
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',ctx['fiscalyear']),('date_stop','<',fiscalyear.date_start)])
         
+        #############################################################################
+        # Calculate the period initial Balance                                      #
+        # (fy balance minus the balance from the start of the selected period       #
+        #  to the end of the year)                                                  #
+        #############################################################################
+        
+        ctx = self.context.copy()
+        ctx['filter'] = form.get('filter','all')
+        ctx['fiscalyear'] = fiscalyear.id
+
+        if form['filter'] in ['byperiod', 'all']:
+            ctx['periods'] = form['periods']
+            date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_stop','<=',date_start)])
+            if not ctx['periods']:
+                missing_period()
+        elif form['filter'] in ['bydate']:
+            ctx['date_from'] = fiscalyear.date_start
+            ctx['date_to'] = form['date_from']
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_stop','<=',ctx['date_to'])])
+        elif form['filter'] == 'none':
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',True)])
+            date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
+            ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_start','<=',date_start),('special','=',True)])
+
+        period_balanceinit = {}
+        for acc in account_obj.browse(self.cr, self.uid, [x[0] for x in account_ids], ctx):
+            period_balanceinit[acc['id']] = acc.balance
 
         #
         # Generate the report lines (checking each account)
         #
-
         tot = {}        
         for account in accounts:
             account_id = account['id']
@@ -233,26 +269,31 @@
             #
             # Check if we need to include this level
             #
-
             if not form['display_account_level'] or account['level'] <= form['display_account_level']:
-
                 #
                 # Copy the account values
                 #
-
                 res = {
                         'id' : account_id,
                         'type' : account['type'],
                         'code': account['code'],
                         'name': (account['total'] and not account['label']) and 'TOTAL %s'%(account['name'].upper()) or account['name'],
                         'level': account['level'],
+                        'balanceinit': period_balanceinit[account_id],
                         'debit': account['debit'],
                         'credit': account['credit'],
+                        'balance': period_balanceinit[account_id]+account['debit']-account['credit'],
                         'parent_id': account['parent_id'],
                         'bal_type': '',
                         'label': account['label'],
                         'total': account['total'],
                     }
+                #
+                # Round the values to zero if needed (-0.000001 ~= 0)
+                #
+
+                if abs(res['balance']) < 0.5 * 10**-4:
+                    res['balance'] = 0.0
 
                 #
                 # Check whether we must include this line in the report or not
@@ -260,30 +301,31 @@
 
                 if form['display_account'] == 'bal_mouvement' and account['parent_id']:
                     # Include accounts with movements
-                    if abs(res['credit']-res['debit']) >= 0.5 * 10**-int(2) \
-                                or abs(res['credit']) >= 0.5 * 10**-int(2) \
-                                or abs(res['debit']) >= 0.5 * 10**-int(2):
-                        result_acc.append(res)
-                    elif form['display_account'] == 'bal_solde' and account['parent_id']:
-                        # Include accounts with balance
-                        if abs(res['credit']-res['debit']) >= 0.5 * 10**-int(2):
-                            result_acc.append(res)
-                    else:
-                        # Include all account
-                        result_acc.append(res)
-
+                    if abs(res['balance']) >= 0.5 * 10**-int(2):
+                        result_acc.append(res)
+                elif form['display_account'] == 'bal_solde' and account['parent_id']:
+                    # Include accounts with balance
+                    if abs(res['balance']) >= 0.5 * 10**-4:
+                        result_acc.append(res)
+                else:
+                    # Include all accounts
+                    result_acc.append(res)
                 if form['tot_check'] and res['type'] == 'view' and res['level'] == 1 and (res['id'] not in tot):
                     tot[res['id']] = True
+                    tot_bin += res['balanceinit']
                     tot_deb += res['debit']
                     tot_crd += res['credit']
+                    tot_eje += res['balance']
 
         if form['tot_check']:
             str_label = form['lab_str']
             res2 = {
                     'type' : 'view',
                     'name': 'TOTAL %s'%(str_label),
+                    'balanceinit': tot_bin,
                     'debit': tot_deb,
                     'credit': tot_crd,
+                    'balance': tot_eje,
                     'label': False,
                     'total': True,
             }
 
=== modified file 'account_financial_report/report/account_balance_4_cols.py'
--- account_financial_report/report/account_balance_4_cols.py	2012-01-02 22:27:49 +0000
+++ account_financial_report/report/account_balance_4_cols.py	2012-01-20 23:38:23 +0000
@@ -53,8 +53,8 @@
             'lines': self.lines,
             'get_fiscalyear_text': self.get_fiscalyear_text,
             'get_periods_and_date_text': self.get_periods_and_date_text,
-            'get_inf_text': self.get_informe_text,
-            'get_month':self._get_month,
+            'get_informe_text': self.get_informe_text,
+            'get_month':self.get_month,
         })
         self.context = context
 
@@ -78,27 +78,30 @@
         """
         inf_type = {
             'bgen' : '               Balance General',
-            'bcom' : '       Balance de Comprobacion',
-            'edogp': 'Estado de Ganancias y Perdidas',
-            'bml': 'Libro Mayor Legal',
+            'bcom' : '       Balance de Comprobacion',            
+            'edogp': 'Estado de Ganancias y Perdidas' 
         }
         return inf_type[form['inf_type']]
 
-    def _get_month(self, form):
+    def get_month(self, form):
         '''
         return day, year and month
         '''
-
-        months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
-
-        mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
-        ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
-        dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
-
-        if form['inf_type']=='edogp':
-            return 'DESDE: '+self.formatLang(form['date_from'], date=True)+'  HASTA: '+self.formatLang(form['date_to'], date=True)
-        else:
-            return 'AL '+str(dia) + ' DE ' + mes.upper() + ' DE ' + str(ano)
+        if form['filter'] in ['bydate', 'all']:
+            months=["Enero","Febrero","Marzo","Abril","Mayo","Junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]
+            mes = months[time.strptime(form['date_to'],"%Y-%m-%d")[1]-1]
+            ano = time.strptime(form['date_to'],"%Y-%m-%d")[0]
+            dia = time.strptime(form['date_to'],"%Y-%m-%d")[2]
+            return 'Período del '+self.formatLang(form['date_from'], date=True)+' al '+self.formatLang(form['date_to'], date=True)
+        elif form['filter'] in ['byperiod', 'all']:
+            aux=[]
+            period_obj = self.pool.get('account.period')
+            
+            for period in period_obj.browse(self.cr, self.uid, form['periods']):
+                aux.append(period.date_start)
+                aux.append(period.date_stop)
+            sorted(aux)
+            return 'Período del '+self.formatLang(aux[0], date=True)+' al '+self.formatLang(aux[-1], date=True)
 
     def get_periods_and_date_text(self, form):
         """
@@ -108,12 +111,12 @@
         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),('special','=',False)])
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] 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)])
 
         dates_str = None
-        if form['state'] in ['bydate', 'all']:
+        if form['filter'] in ['bydate', 'all']:
             dates_str = self.formatLang(form['date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' '
         return {'periods':periods_str, 'date':dates_str}
 
@@ -186,12 +189,12 @@
         #############################################################################
 
         ctx = self.context.copy()
-        ctx['state'] = form.get('state','all')
+        ctx['filter'] = form.get('filter','all')
         ctx['fiscalyear'] = fiscalyear.id
         ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)])
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] in ['byperiod', 'all']:
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('id','in',form['periods'] or ctx['periods']),('special','=',False)])
-        if form['state'] in ['bydate', 'all']:
+        if form['filter'] in ['bydate', 'all']:
             ctx['date_from'] = form['date_from']
             ctx['date_to'] = form['date_to']
 
@@ -227,20 +230,20 @@
         #############################################################################
         
         ctx = self.context.copy()
-        ctx['state'] = form.get('state','all')
+        ctx['filter'] = form.get('filter','all')
         ctx['fiscalyear'] = fiscalyear.id
 
-        if form['state'] in ['byperiod', 'all']:
+        if form['filter'] in ['byperiod', 'all']:
             ctx['periods'] = form['periods']
             date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_stop','<=',date_start)])
             if not ctx['periods']:
                 missing_period()
-        elif form['state'] in ['bydate']:
+        elif form['filter'] in ['bydate']:
             ctx['date_from'] = fiscalyear.date_start
             ctx['date_to'] = form['date_from']
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_stop','<=',ctx['date_to'])])
-        elif form['state'] == 'none':
+        elif form['filter'] == 'none':
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',True)])
             date_start = min([period.date_start for period in period_obj.browse(self.cr, self.uid, ctx['periods'])])
             ctx['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('date_start','<=',date_start),('special','=',True)])
 
=== modified file 'account_financial_report/report/balance_full.rml'
--- account_financial_report/report/balance_full.rml	2012-01-02 22:27:49 +0000
+++ account_financial_report/report/balance_full.rml	2012-01-20 23:38:23 +0000
@@ -5,37 +5,26 @@
             <frame id="first" x1="1cm" y1="1.0cm" width="19.0cm" height="23cm"/>
             <pageGraphics>
                 <setFont name="Helvetica" size="9"/>
-
-<!--
-                <image x="1.0cm" y="25.0cm" height="2.5cm" width="9.6cm">[[company.logo and company.logo or removeParentNode('image')]]</image>
-                <drawString x="1.0cm" y="24.5cm">[[company.logo and removeParentNode('para') or company.name]]</drawString> 
--->
-
                 <place x="-3.5cm" y="22.50cm" width="19cm"  height="5.0cm"> 
                     <blockTable colWidths="9.6cm,9.4cm" style="TITLE">
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER_NAME">[[ company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE' ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ (company.partner_id.vat and ('RIF: %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or removeParentNode('para')) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ get_inf_text(data['form']) ]]</para></td>
+                            <td><para style="TITLE_CENTER_NAME">
+                                <font>[[ (company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE')]]</font>
+                                <font>[[ company.partner_id.vat and ('- %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or '' ]]</font>
+                            </para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="TOP_TITLE"></para></td>
+                            <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
                         </tr>
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
                             <td><para style="TITLE_CENTER">[[data['form'] and get_month(data['form']) or '']]</para></td>
                         </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[data['form'] and ('(Expresado en %s)'%(company.currency_id.symbol)) or '']]</para></td>
-                        </tr>
                     </blockTable>
                 </place>
-                <drawRightString x="192mm" y="5mm">[[ get_inf_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
+                <drawRightString x="192mm" y="5mm">[[ get_informe_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
             </pageGraphics>
 
         </pageTemplate>
@@ -108,7 +97,7 @@
                     <para style="TITLES">Cuenta</para>
                 </td>
                 <td>
-                    <para style="TITLE_LEFT_ALIGN"></para>
+                    <para style="TITLE_LEFT_ALIGN">Balance</para>
                 </td>
             </tr>
             <tr>
@@ -127,7 +116,7 @@
                 <td>
                     <para style="TITLE_LEFT_ALIGN">
                         <font>[[ a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Courier"}) or removeParentNode('font') ]]</font>
-                        <font>[[ (a['total']==True) and formatLang(a['balance']) or '']]</font>
+                        <font>[[(a['total']==True) and formatLang(a['balance']) or '']]</font>
                     </para>
                 </td>
             </tr>
 
=== modified file 'account_financial_report/report/balance_full_2_cols.rml'
--- account_financial_report/report/balance_full_2_cols.rml	2012-01-02 22:27:49 +0000
+++ account_financial_report/report/balance_full_2_cols.rml	2012-01-20 23:38:23 +0000
@@ -5,37 +5,26 @@
             <frame id="first" x1="1cm" y1="1.0cm" width="19.0cm" height="23cm"/>
             <pageGraphics>
                 <setFont name="Helvetica" size="9"/>
-
-<!--
-                <image x="1.0cm" y="25.0cm" height="2.5cm" width="9.6cm">[[company.logo and company.logo or removeParentNode('image')]]</image>
-                <drawString x="1.0cm" y="24.5cm">[[company.logo and removeParentNode('para') or company.name]]</drawString> 
--->
-
                 <place x="-3.5cm" y="22.50cm" width="19cm"  height="5.0cm"> 
                     <blockTable colWidths="9.6cm,9.4cm" style="TITLE">
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER_NAME">[[ company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE' ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ (company.partner_id.vat and ('RIF: %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or removeParentNode('para')) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ get_inf_text(data['form']) ]]</para></td>
+                            <td><para style="TITLE_CENTER_NAME">
+                                <font>[[ (company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE')]]</font>
+                                <font>[[ company.partner_id.vat and ('- %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or '' ]]</font>
+                            </para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="TOP_TITLE"></para></td>
+                            <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
                         </tr>
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
                             <td><para style="TITLE_CENTER">[[data['form'] and get_month(data['form']) or '']]</para></td>
                         </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[data['form'] and ('(Expresado en %s)'%(company.currency_id.symbol)) or '']]</para></td>
-                        </tr>
                     </blockTable>
                 </place>
-                <drawRightString x="192mm" y="5mm">[[ get_inf_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
+                <drawRightString x="192mm" y="5mm">[[ get_informe_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
             </pageGraphics>
 
         </pageTemplate>
@@ -43,7 +32,7 @@
     <stylesheet>
         <blockTableStyle id="TITLE">
             <blockValign value="TOP"/>
-        </blockTableStyle>  
+        </blockTableStyle> 
         <blockTableStyle id="BODY">
             <blockValign value="TOP"/>
             <blockAlignment value="RIGHT"/>
@@ -75,32 +64,20 @@
             alignment="RIGHT" 
             spaceBefore="0.0" 
             spaceAfter="0.0"/>
-        <paraStyle 
-            name="TOP_TITLE" 
-            fontName="Helvetica-Bold" 
-            fontSize="9" 
-            leftIndent="0.0" 
-            alignment="LEFT"/>
-        <paraStyle name="TITLES" 
-            fontName="Helvetica-Bold" 
-            fontSize="8.0" 
-            leading="10" 
-            alignment="LEFT" 
-            spaceBefore="0.0" 
-            spaceAfter="0.0"/>
+        <paraStyle name="TOP_TITLE" fontName="Helvetica-Bold" fontSize="9"  leftIndent="0.0" alignment="LEFT"/>
+        <paraStyle name="TITLES" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"  spaceBefore="0.0" spaceAfter="0.0"/>
         <paraStyle name="TITLE_CENTER" fontName="Helvetica-Bold" fontSize="9" leading="10" leftIndent="0.0" alignment="CENTER"/>
         <paraStyle name="TITLE_CENTER_NAME" fontName="Helvetica-Bold" fontSize="12" leading="13" leftIndent="0.0" alignment="CENTER"/>
         <paraStyle name="TITLE" alignment="CENTER" fontName="Helvetica" fontSize="18.0" leading="20" spaceBefore="-3.0" textColor="black"/>
-
     </stylesheet>
     <images/>
     <story>
         <para>[[setLang(user.context_lang)]]</para>
-        <blockTable colWidths="2.5cm,11.5cm,2.5cm,2.5cm" style="BODY" repeatRows="1">
+        <blockTable colWidths="2.5cm,9.5cm,3.5cm,3.5cm" style="BODY" repeatRows="1">
             <tr noRowsplits="1">
                 <td>
                     <para style="TITLE_LEFT_ALIGN">
-                    <font>Código</font>
+                        <font>Código</font>
                     </para>
                 </td>
                 <td>
@@ -119,7 +96,6 @@
                         <font>[[ a['type']&lt;&gt;'view' and setTag('para','para',{'fontName':"Courier"}) or removeParentNode('font') ]]</font>
                         <i>[[a['label']==True and a['code'] or ''  ]]</i>
                     </para>
-                    
                 </td>
                 <td>
                     <para style="TITLES">
 
=== modified file 'account_financial_report/report/balance_full_4_cols.rml'
--- account_financial_report/report/balance_full_4_cols.rml	2012-01-02 22:27:49 +0000
+++ account_financial_report/report/balance_full_4_cols.rml	2012-01-20 23:38:23 +0000
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
     <template pageSize="(21.59cm,27.94cm)" title="Test" author="Martin Simon" allowSplitting="20" showBoundary="0">
         <pageTemplate id="first">
-            <frame id="first" x1="1cm" y1="1.0cm" width="19.0cm" height="23cm"/>
+            <frame id="first" x1="0.5cm" y1="1.0cm" width="20.5cm" height="23cm"/>
             <pageGraphics>
                 <setFont name="Helvetica" size="9"/>
 
@@ -15,27 +15,22 @@
                     <blockTable colWidths="9.6cm,9.4cm" style="TITLE">
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER_NAME">[[ company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE' ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ (company.partner_id.vat and ('RIF: %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or removeParentNode('para')) ]]</para></td>
-                        </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[ get_inf_text(data['form']) ]]</para></td>
+                            <td><para style="TITLE_CENTER_NAME">
+                                <font>[[ (company.name and company.name or 'NOMBRE DE COMPANIA NO DISPONIBLE')]]</font>
+                                <font>[[ company.partner_id.vat and ('- %s-%s-%s'%(company.partner_id.vat[2:3],company.partner_id.vat[3:11],company.partner_id.vat[11:12])) or '' ]]</font>
+                            </para></td>
+                        </tr>
+                        <tr>
+                            <td><para style="TOP_TITLE"></para></td>
+                            <td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']]</para></td>
                         </tr>
                         <tr>
                             <td><para style="TOP_TITLE"></para></td>
                             <td><para style="TITLE_CENTER">[[data['form'] and get_month(data['form']) or '']]</para></td>
                         </tr>
-                        <tr>
-                            <td><para style="TOP_TITLE"></para></td>
-                            <td><para style="TITLE_CENTER">[[data['form'] and ('(Expresado en %s)'%(company.currency_id.symbol)) or '']]</para></td>
-                        </tr>
                     </blockTable>
                 </place>
-                <drawRightString x="192mm" y="5mm">[[ get_inf_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
+                <drawRightString x="192mm" y="5mm">[[ get_informe_text(data['form']) ]] /  Pág.: <pageNumber/>-<pageCount/> </drawRightString> 
             </pageGraphics>
 
         </pageTemplate>
@@ -84,7 +79,7 @@
     <images/>
     <story>
         <para>[[setLang(user.context_lang)]]</para>
-        <blockTable colWidths="2.5cm,6.5cm,2.5cm,2.5cm,2.5cm,2.5cm" style="BODY" repeatRows="1">
+        <blockTable colWidths="2.5cm,6.5cm,2.5cm,3.5cm,3.5cm,2.5cm" style="BODY" repeatRows="1">
             <tr noRowsplits="1">
                 <td>
                     <para style="TITLE_LEFT_ALIGN">
 
=== modified file 'account_financial_report/wizard/account_report_wizard.xml'
--- account_financial_report/wizard/account_report_wizard.xml	2012-01-02 21:37:32 +0000
+++ account_financial_report/wizard/account_report_wizard.xml	2012-01-20 23:38:23 +0000
@@ -22,16 +22,16 @@
                         <separator string="Period" colspan="4"/>
                         <field name="fiscalyear"/>
                         <newline/>
-                        <field name="state" required="True"/>
+                        <field name="filter" required="True"/>
                         <newline/>
 
-                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
                                 <separator string="Date Filter" colspan="4"/>
                                 <field name="date_from"/>
                                 <field name="date_to"/>
                             </group>
-                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
                                 <separator string="Filter on Periods" colspan="4"/>
                                 <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
                             </group>
@@ -87,15 +87,15 @@
                         <separator string="Period" colspan="4"/>
                         <field name="fiscalyear"/>
                         <newline/>
-                        <field name="state" required="True"/>
+                        <field name="filter" required="True"/>
                         <newline/>
-                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
                                 <separator string="Date Filter" colspan="4"/>
                                 <field name="date_from"/>
                                 <field name="date_to"/>
                             </group>
-                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
                                 <separator string="Filter on Periods" colspan="4"/>
                                 <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
                             </group>
@@ -149,15 +149,15 @@
                         <separator string="Period" colspan="4"/>
                         <field name="fiscalyear"/>
                         <newline/>
-                        <field name="state" required="True"/>
+                        <field name="filter" required="True"/>
                         <newline/>
-                        <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-                            <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                        <group attrs="{'invisible':[('filter','=','none')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','byperiod')]}" colspan="4">
                                 <separator string="Date Filter" colspan="4"/>
                                 <field name="date_from"/>
                                 <field name="date_to"/>
                             </group>
-                            <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <group attrs="{'invisible':[('filter','=','bydate')]}" colspan="4">
                                 <separator string="Filter on Periods" colspan="4"/>
                                 <field name="periods" colspan="4" nolabel="1" domain="[('fiscalyear_id','=',fiscalyear)]"/>
                             </group>
 
=== modified file 'account_financial_report/wizard/wizard_account_balance_2_report.py'
--- account_financial_report/wizard/wizard_account_balance_2_report.py	2012-01-02 22:27:49 +0000
+++ account_financial_report/wizard/wizard_account_balance_2_report.py	2012-01-20 23:38:23 +0000
@@ -29,36 +29,47 @@
 from osv import osv,fields
 import pooler
 import time
+
 class wizard_account_balance_gene_2(osv.osv_memory):
     _name = "wizard.report.account.balance.gene.2"
 
     _columns = {
         'company_id': fields.many2one('res.company','Company',required=True),
         'account_list': fields.many2many ('account.account','rel_wizard_account','account_list','account_id','Root accounts',required=True),
-        'state': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
+        'filter': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
         'fiscalyear': fields.many2one('account.fiscalyear','Fiscal year',help='Keep empty to use all open fiscal years to compute the balance',required=True),
         'periods': fields.many2many('account.period','rel_wizard_period','wizard_id','period_id','Periods',help='All periods in the fiscal year if empty'),
-        'display_account': fields.selection([('bal_all','All'),('bal_solde', 'With balance'),('bal_mouvement','With movements')],'Display accounts'),
+        'display_account': fields.selection([('all','All'),('con_balance', 'With balance'),('con_movimiento','With movements')],'Display accounts'),
         'display_account_level': fields.integer('Up to level',help='Display accounts up to this level (0 to show all)'),
-        'date_from': fields.date('Start date',required=True),
-        'date_to': fields.date('End date',required=True),
+        'date_from': fields.date('Start date'),
+        'date_to': fields.date('End date'),
         'tot_check': fields.boolean('Show Total'),
         'lab_str': fields.char('Description', size= 128),
-        'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bdl','Libro Diario Legal')],'Tipo Informe',required=True),
+        'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas')],'Tipo Informe',required=True),
+        #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
     }
     
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-%d'),
         'date_to': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a:'byperiod',
+        'filter': lambda *a:'byperiod',
         'display_account_level': lambda *a: 0,
         'inf_type': lambda *a:'bcom',
         'company_id': lambda *a: 1,
-        'fiscalyear': lambda *a: 1,
-        'display_account': lambda *a:'bal_mouvement',
-        
+        'fiscalyear': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid),
+        'display_account': lambda *a:'con_movimiento',
     }
-
+    
+    def onchange_filter(self,cr,uid,ids,fiscalyear,filters,context=None):
+        if context is None:
+            context = {}
+        res = {}
+        if filters in ("bydate","all"):
+            fisy = self.pool.get("account.fiscalyear")
+            fis_actual = fisy.browse(cr,uid,fiscalyear,context=context)
+            res = {'value':{'date_from': fis_actual.date_start, 'date_to': fis_actual.date_stop}}
+        return res
+    
     def _get_defaults(self, cr, uid, data, context=None):
         if context is None:
             context = {}
@@ -73,40 +84,65 @@
         data['form']['context'] = context
         return data['form']
 
-
     def _check_state(self, cr, uid, data, context=None):
         if context is None:
             context = {}
-        if data['form']['state'] == 'bydate':
+        if data['form']['filter'] == 'bydate':
            self._check_date(cr, uid, data, context)
         return data['form']
     
-
     def _check_date(self, cr, uid, data, context=None):
         if context is None:
             context = {}
+            
+        if data['form']['date_from'] > data['form']['date_to']:
+            raise osv.except_osv(_('Error !'),('La fecha final debe ser mayor a la inicial'))
+        
         sql = """SELECT f.id, f.date_start, f.date_stop
             FROM account_fiscalyear f
-            WHERE '%s' between f.date_start and f.date_stop """%(data['form']['date_from'])
+            WHERE '%s' = f.id """%(data['form']['fiscalyear'])
         cr.execute(sql)
         res = cr.dictfetchall()
+
         if res:
-            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
-                raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_from'] < res[0]['date_start']):
+                raise osv.except_osv(_('UserError'),'Las fechas deben estar entre %s y %s' % (res[0]['date_start'], res[0]['date_stop']))
             else:
                 return 'report'
         else:
-            raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
+            raise osv.except_osv(_('UserError'),'No existe periodo fiscal')
 
     def print_report(self, cr, uid, ids,data, context=None):
         if context is None:
             context = {}
+            
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')
         data['form'] = self.read(cr, uid, ids[0])
+
+        if data['form']['filter'] == 'byperiod':
+            del data['form']['date_from']
+            del data['form']['date_to']
+        elif data['form']['filter'] == 'bydate':
+            self._check_date(cr, uid, data)
+            del data['form']['periods']
+        elif data['form']['filter'] == 'none':
+            del data['form']['date_from']
+            del data['form']['date_to']
+            del data['form']['periods']
+        else:
+            self._check_date(cr, uid, data)
+            lis2 = str(data['form']['periods']).replace("[","(").replace("]",")")
+            sqlmm = """select min(p.date_start) as inicio, max(p.date_stop) as fin 
+            from account_period p 
+            where p.id in %s"""%lis2
+            cr.execute(sqlmm)
+            minmax = cr.dictfetchall()
+            if minmax:
+                if (data['form']['date_to'] < minmax[0]['inicio']) or (data['form']['date_from'] > minmax[0]['fin']):
+                    raise osv.except_osv(_('Error !'),('La intersepcion entre el periodo y fecha es vacio'))
+
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance.gene.2', 'datas': data}
 
 wizard_account_balance_gene_2()
-
-
 
=== modified file 'account_financial_report/wizard/wizard_account_balance_4_report.py'
--- account_financial_report/wizard/wizard_account_balance_4_report.py	2012-01-02 22:27:49 +0000
+++ account_financial_report/wizard/wizard_account_balance_4_report.py	2012-01-20 23:38:23 +0000
@@ -1,37 +1,75 @@
 # -*- encoding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
+#    All Rights Reserved
+###############Credits######################################################
+#    Coded by:   Humberto Arocha [e-mail]
+#                Angelica Barrios [e-mail]
+#               Jordi Esteve <[e-mail]>
+#               Javier Duran <[e-mail]>
+#    Planified by: Humberto Arocha
+#    Finance by: LUBCAN COL S.A.S http://www.lubcancol.com
+#    Audited by: Humberto Arocha [e-mail]
+#############################################################################
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##############################################################################
+
 from osv import osv,fields
 import pooler
 import time
+
 class wizard_report(osv.osv_memory):
     _name = "wizard.report"
 
     _columns = {
         'company_id': fields.many2one('res.company','Company',required=True),
         'account_list': fields.many2many ('account.account','rel_wizard_account','account_list','account_id','Root accounts',required=True),
-        'state': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
+        'filter': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
         'fiscalyear': fields.many2one('account.fiscalyear','Fiscal year',help='Keep empty to use all open fiscal years to compute the balance',required=True),
         'periods': fields.many2many('account.period','rel_wizard_period','wizard_id','period_id','Periods',help='All periods in the fiscal year if empty'),
-        'display_account': fields.selection([('bal_all','All'),('bal_solde', 'With balance'),('bal_mouvement','With movements')],'Display accounts'),
+        'display_account': fields.selection([('all','All'),('con_balance', 'With balance'),('con_movimiento','With movements')],'Display accounts'),
         'display_account_level': fields.integer('Up to level',help='Display accounts up to this level (0 to show all)'),
-        'date_from': fields.date('Start date',required=True),
-        'date_to': fields.date('End date',required=True),
+        'date_from': fields.date('Start date'),
+        'date_to': fields.date('End date'),
         'tot_check': fields.boolean('Show Total'),
         'lab_str': fields.char('Description', size= 128),
-        'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bml','Libro Mayor Legal')],'Tipo Informe',required=True),
+        'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas')],'Tipo Informe',required=True),
+        #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
     }
     
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-%d'),
         'date_to': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a:'byperiod',
+        'filter': lambda *a:'byperiod',
         'display_account_level': lambda *a: 0,
         'inf_type': lambda *a:'bcom',
         'company_id': lambda *a: 1,
-        'fiscalyear': lambda *a: 1,
-        'display_account': lambda *a:'bal_mouvement',
-        
+        'fiscalyear': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid),
+        'display_account': lambda *a:'con_movimiento',
     }
-
+    
+    def onchange_filter(self,cr,uid,ids,fiscalyear,filters,context=None):
+        if context is None:
+            context = {}
+        res = {}
+        if filters in ("bydate","all"):
+            fisy = self.pool.get("account.fiscalyear")
+            fis_actual = fisy.browse(cr,uid,fiscalyear,context=context)
+            res = {'value':{'date_from': fis_actual.date_start, 'date_to': fis_actual.date_stop}}
+        return res
+    
     def _get_defaults(self, cr, uid, data, context=None):
         if context is None:
             context = {}
@@ -46,38 +84,65 @@
         data['form']['context'] = context
         return data['form']
 
-
     def _check_state(self, cr, uid, data, context=None):
         if context is None:
             context = {}
-        if data['form']['state'] == 'bydate':
+        if data['form']['filter'] == 'bydate':
            self._check_date(cr, uid, data, context)
         return data['form']
     
-
     def _check_date(self, cr, uid, data, context=None):
         if context is None:
             context = {}
+            
+        if data['form']['date_from'] > data['form']['date_to']:
+            raise osv.except_osv(_('Error !'),('La fecha final debe ser mayor a la inicial'))
+        
         sql = """SELECT f.id, f.date_start, f.date_stop
             FROM account_fiscalyear f
-            WHERE '%s' between f.date_start and f.date_stop """%(data['form']['date_from'])
+            WHERE '%s' = f.id """%(data['form']['fiscalyear'])
         cr.execute(sql)
         res = cr.dictfetchall()
+
         if res:
-            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
-                raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_from'] < res[0]['date_start']):
+                raise osv.except_osv(_('UserError'),'Las fechas deben estar entre %s y %s' % (res[0]['date_start'], res[0]['date_stop']))
             else:
                 return 'report'
         else:
-            raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
+            raise osv.except_osv(_('UserError'),'No existe periodo fiscal')
 
     def print_report(self, cr, uid, ids,data, context=None):
         if context is None:
             context = {}
+            
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')
         data['form'] = self.read(cr, uid, ids[0])
+
+        if data['form']['filter'] == 'byperiod':
+            del data['form']['date_from']
+            del data['form']['date_to']
+        elif data['form']['filter'] == 'bydate':
+            self._check_date(cr, uid, data)
+            del data['form']['periods']
+        elif data['form']['filter'] == 'none':
+            del data['form']['date_from']
+            del data['form']['date_to']
+            del data['form']['periods']
+        else:
+            self._check_date(cr, uid, data)
+            lis2 = str(data['form']['periods']).replace("[","(").replace("]",")")
+            sqlmm = """select min(p.date_start) as inicio, max(p.date_stop) as fin 
+            from account_period p 
+            where p.id in %s"""%lis2
+            cr.execute(sqlmm)
+            minmax = cr.dictfetchall()
+            if minmax:
+                if (data['form']['date_to'] < minmax[0]['inicio']) or (data['form']['date_from'] > minmax[0]['fin']):
+                    raise osv.except_osv(_('Error !'),('La intersepcion entre el periodo y fecha es vacio'))
+
         return {'type': 'ir.actions.report.xml', 'report_name': 'wizard.report.reporte', 'datas': data}
-
+            
 wizard_report()
 
=== modified file 'account_financial_report/wizard/wizard_account_balance_report.py'
--- account_financial_report/wizard/wizard_account_balance_report.py	2012-01-02 21:37:32 +0000
+++ account_financial_report/wizard/wizard_account_balance_report.py	2012-01-20 23:38:23 +0000
@@ -26,40 +26,50 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##############################################################################
 
-
 from osv import osv,fields
 import pooler
 import time
+
 class wizard_account_balance_gene(osv.osv_memory):
     _name = "wizard.report.account.balance.gene"
 
     _columns = {
         'company_id': fields.many2one('res.company','Company',required=True),
         'account_list': fields.many2many ('account.account','rel_wizard_account','account_list','account_id','Root accounts',required=True),
-        'state': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
+        'filter': fields.selection([('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],'Date/Period Filter'),
         'fiscalyear': fields.many2one('account.fiscalyear','Fiscal year',help='Keep empty to use all open fiscal years to compute the balance',required=True),
         'periods': fields.many2many('account.period','rel_wizard_period','wizard_id','period_id','Periods',help='All periods in the fiscal year if empty'),
-        'display_account': fields.selection([('bal_all','All'),('bal_solde', 'With balance'),('bal_mouvement','With movements')],'Display accounts'),
+        'display_account': fields.selection([('all','All'),('con_balance', 'With balance'),('con_movimiento','With movements')],'Display accounts'),
         'display_account_level': fields.integer('Up to level',help='Display accounts up to this level (0 to show all)'),
-        'date_from': fields.date('Start date',required=True),
-        'date_to': fields.date('End date',required=True),
+        'date_from': fields.date('Start date'),
+        'date_to': fields.date('End date'),
         'tot_check': fields.boolean('Show Total'),
         'lab_str': fields.char('Description', size= 128),
         'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas')],'Tipo Informe',required=True),
+        #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
     }
     
     _defaults = {
         'date_from': lambda *a: time.strftime('%Y-%m-%d'),
         'date_to': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a:'byperiod',
+        'filter': lambda *a:'byperiod',
         'display_account_level': lambda *a: 0,
         'inf_type': lambda *a:'bcom',
         'company_id': lambda *a: 1,
-        'fiscalyear': lambda *a: 1,
-        'display_account': lambda *a:'bal_mouvement',
-        
+        'fiscalyear': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid),
+        'display_account': lambda *a:'con_movimiento',
     }
-
+    
+    def onchange_filter(self,cr,uid,ids,fiscalyear,filters,context=None):
+        if context is None:
+            context = {}
+        res = {}
+        if filters in ("bydate","all"):
+            fisy = self.pool.get("account.fiscalyear")
+            fis_actual = fisy.browse(cr,uid,fiscalyear,context=context)
+            res = {'value':{'date_from': fis_actual.date_start, 'date_to': fis_actual.date_stop}}
+        return res
+    
     def _get_defaults(self, cr, uid, data, context=None):
         if context is None:
             context = {}
@@ -74,39 +84,65 @@
         data['form']['context'] = context
         return data['form']
 
-
     def _check_state(self, cr, uid, data, context=None):
         if context is None:
             context = {}
-        if data['form']['state'] == 'bydate':
+        if data['form']['filter'] == 'bydate':
            self._check_date(cr, uid, data, context)
         return data['form']
     
-
     def _check_date(self, cr, uid, data, context=None):
         if context is None:
             context = {}
+            
+        if data['form']['date_from'] > data['form']['date_to']:
+            raise osv.except_osv(_('Error !'),('La fecha final debe ser mayor a la inicial'))
+        
         sql = """SELECT f.id, f.date_start, f.date_stop
             FROM account_fiscalyear f
-            WHERE '%s' between f.date_start and f.date_stop """%(data['form']['date_from'])
+            WHERE '%s' = f.id """%(data['form']['fiscalyear'])
         cr.execute(sql)
         res = cr.dictfetchall()
+
         if res:
-            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < res[0]['date_start']):
-                raise  wizard.except_wizard(_('UserError'),_('Date to must be set between %s and %s') % (res[0]['date_start'], res[0]['date_stop']))
+            if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_from'] < res[0]['date_start']):
+                raise osv.except_osv(_('UserError'),'Las fechas deben estar entre %s y %s' % (res[0]['date_start'], res[0]['date_stop']))
             else:
                 return 'report'
         else:
-            raise wizard.except_wizard(_('UserError'),_('Date not in a defined fiscal year'))
+            raise osv.except_osv(_('UserError'),'No existe periodo fiscal')
 
     def print_report(self, cr, uid, ids,data, context=None):
         if context is None:
             context = {}
+            
         data = {}
         data['ids'] = context.get('active_ids', [])
         data['model'] = context.get('active_model', 'ir.ui.menu')
         data['form'] = self.read(cr, uid, ids[0])
+
+        if data['form']['filter'] == 'byperiod':
+            del data['form']['date_from']
+            del data['form']['date_to']
+        elif data['form']['filter'] == 'bydate':
+            self._check_date(cr, uid, data)
+            del data['form']['periods']
+        elif data['form']['filter'] == 'none':
+            del data['form']['date_from']
+            del data['form']['date_to']
+            del data['form']['periods']
+        else:
+            self._check_date(cr, uid, data)
+            lis2 = str(data['form']['periods']).replace("[","(").replace("]",")")
+            sqlmm = """select min(p.date_start) as inicio, max(p.date_stop) as fin 
+            from account_period p 
+            where p.id in %s"""%lis2
+            cr.execute(sqlmm)
+            minmax = cr.dictfetchall()
+            if minmax:
+                if (data['form']['date_to'] < minmax[0]['inicio']) or (data['form']['date_from'] > minmax[0]['fin']):
+                    raise osv.except_osv(_('Error !'),('La intersepcion entre el periodo y fecha es vacio'))
+
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance.gene', 'datas': data}
 
 wizard_account_balance_gene()
-