Browse Source

[IMP] Cambiando algunas etiquetas en reportes.


			
			
				6.0
			
			
		
Humberto Arocha 12 years ago
parent
commit
f226abe7aa
  1. 2
      account_financial_report/report/balance_full.rml
  2. 2
      account_financial_report/report/balance_full_13_cols.rml
  3. 2
      account_financial_report/report/balance_full_2_cols.rml
  4. 2
      account_financial_report/report/balance_full_4_cols.rml
  5. 2
      account_financial_report/report/balance_full_4_cols_analytic_ledger.rml
  6. 2
      account_financial_report/report/balance_full_5_cols.rml
  7. 2
      account_financial_report/report/balance_full_qtr_cols.rml
  8. 7
      account_financial_report/report/parser.py

2
account_financial_report/report/balance_full.rml

@ -21,7 +21,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_13_cols.rml

@ -26,7 +26,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_2_cols.rml

@ -25,7 +25,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_4_cols.rml

@ -26,7 +26,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_4_cols_analytic_ledger.rml

@ -26,7 +26,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_5_cols.rml

@ -26,7 +26,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

2
account_financial_report/report/balance_full_qtr_cols.rml

@ -26,7 +26,7 @@
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expresado en %s)'%( exchange_name(data['form']))) or '']]</para></td>
<td><para style="TITLE_CENTER">[[data['form'] and (' (Expressed in %s)'%( exchange_name(data['form']))) or '']]</para></td>
</tr>
<tr>
<td><para style="TOP_TITLE"></para></td>

7
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'] = []

Loading…
Cancel
Save