From f226abe7aa39a8da0979cb997fffd85082214d72 Mon Sep 17 00:00:00 2001 From: Humberto Arocha Date: Fri, 10 Aug 2012 10:44:25 -0530 Subject: [PATCH] [IMP] Cambiando algunas etiquetas en reportes. Removiendo algunos prints. --- account_financial_report/report/balance_full.rml | 2 +- account_financial_report/report/balance_full_13_cols.rml | 2 +- account_financial_report/report/balance_full_2_cols.rml | 2 +- account_financial_report/report/balance_full_4_cols.rml | 2 +- .../report/balance_full_4_cols_analytic_ledger.rml | 2 +- account_financial_report/report/balance_full_5_cols.rml | 2 +- account_financial_report/report/balance_full_qtr_cols.rml | 2 +- account_financial_report/report/parser.py | 7 ++----- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/account_financial_report/report/balance_full.rml b/account_financial_report/report/balance_full.rml index 96616271..3f54e5b9 100644 --- a/account_financial_report/report/balance_full.rml +++ b/account_financial_report/report/balance_full.rml @@ -21,7 +21,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_13_cols.rml b/account_financial_report/report/balance_full_13_cols.rml index ae4e19be..642ca409 100644 --- a/account_financial_report/report/balance_full_13_cols.rml +++ b/account_financial_report/report/balance_full_13_cols.rml @@ -26,7 +26,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_2_cols.rml b/account_financial_report/report/balance_full_2_cols.rml index 06ceeffa..3f135198 100644 --- a/account_financial_report/report/balance_full_2_cols.rml +++ b/account_financial_report/report/balance_full_2_cols.rml @@ -25,7 +25,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_4_cols.rml b/account_financial_report/report/balance_full_4_cols.rml index e3c01744..008d041d 100644 --- a/account_financial_report/report/balance_full_4_cols.rml +++ b/account_financial_report/report/balance_full_4_cols.rml @@ -26,7 +26,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_4_cols_analytic_ledger.rml b/account_financial_report/report/balance_full_4_cols_analytic_ledger.rml index d30f430e..79fafa0d 100644 --- a/account_financial_report/report/balance_full_4_cols_analytic_ledger.rml +++ b/account_financial_report/report/balance_full_4_cols_analytic_ledger.rml @@ -26,7 +26,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_5_cols.rml b/account_financial_report/report/balance_full_5_cols.rml index 6f971ab4..51b8debd 100644 --- a/account_financial_report/report/balance_full_5_cols.rml +++ b/account_financial_report/report/balance_full_5_cols.rml @@ -26,7 +26,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/balance_full_qtr_cols.rml b/account_financial_report/report/balance_full_qtr_cols.rml index 825d883c..5685dc9c 100644 --- a/account_financial_report/report/balance_full_qtr_cols.rml +++ b/account_financial_report/report/balance_full_qtr_cols.rml @@ -26,7 +26,7 @@ - [[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']] + [[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']] diff --git a/account_financial_report/report/parser.py b/account_financial_report/report/parser.py index 796c33b9..e0ebe1e1 100644 --- a/account_financial_report/report/parser.py +++ b/account_financial_report/report/parser.py @@ -94,7 +94,7 @@ class account_balance(report_sxw.rml_parse): 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) + return _('From ')+self.formatLang(form['date_from'], date=True)+ _(' to ')+self.formatLang(form['date_to'], date=True) elif form['filter'] in ['byperiod', 'all']: aux=[] period_obj = self.pool.get('account.period') @@ -103,7 +103,7 @@ class account_balance(report_sxw.rml_parse): 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) + return _('From ')+self.formatLang(aux[0], date=True)+_(' to ')+self.formatLang(aux[-1], date=True) def get_periods_and_date_text(self, form): """ @@ -186,7 +186,6 @@ class account_balance(report_sxw.rml_parse): self.cr.execute(sql_detalle) resultat = self.cr.dictfetchall() balance = account['balanceinit'] - #~ print balance for det in resultat: balance += det['debit'] - det['credit'] res.append({ @@ -600,9 +599,7 @@ class account_balance(report_sxw.rml_parse): #~ ANALYTIC LEDGER if to_include and form['analytic_ledger'] and form['columns']=='four' and form['inf_type'] == 'BS' and res['type'] in ('other','liquidity','receivable','payable'): - print 'MAYOR ANALITICO' res['mayor'] = self._get_analytic_ledger(res,ctx=ctx_end) - print "res['mayor'] ", res['mayor'] else: res['mayor'] = []