Browse Source

[FIX] Added 'Libro Mayor Legal' in General Account Balance Four Columns.


			
			
				6.0
			
			
		
Luis E. Escobar V. 13 years ago
parent
commit
3b6fd367ca
  1. 3
      account_financial_report/report/account_balance_4_cols.py
  2. 14
      account_financial_report/report/balance_full_4_cols.rml
  3. 2
      account_financial_report/wizard/wizard_account_balance_4_report.py

3
account_financial_report/report/account_balance_4_cols.py

@ -79,7 +79,8 @@ class account_balance(report_sxw.rml_parse):
inf_type = { inf_type = {
'bgen' : ' Balance General', 'bgen' : ' Balance General',
'bcom' : ' Balance de Comprobacion', 'bcom' : ' Balance de Comprobacion',
'edogp': 'Estado de Ganancias y Perdidas'
'edogp': 'Estado de Ganancias y Perdidas',
'bml': 'Libro Mayor Legal'
} }
return inf_type[form['inf_type']] return inf_type[form['inf_type']]

14
account_financial_report/report/balance_full_4_cols.rml

@ -22,7 +22,11 @@
</tr> </tr>
<tr> <tr>
<td><para style="TOP_TITLE"></para></td> <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>
<td><para style="TITLE_CENTER">[[ get_informe_text(data['form']) ]]</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.name)) or '']]</para></td>
</tr> </tr>
<tr> <tr>
<td><para style="TOP_TITLE"></para></td> <td><para style="TOP_TITLE"></para></td>
@ -65,14 +69,14 @@
<paraStyle <paraStyle
name="TITLE_LEFT_ALIGN" name="TITLE_LEFT_ALIGN"
fontName="Helvetica-Bold" fontName="Helvetica-Bold"
fontSize="8.0"
fontSize="6.0"
leading="10" leading="10"
alignment="RIGHT" alignment="RIGHT"
spaceBefore="0.0" spaceBefore="0.0"
spaceAfter="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="TOP_TITLE" fontName="Helvetica-Bold" fontSize="7" leftIndent="0.0" alignment="LEFT"/>
<paraStyle name="TITLES" fontName="Helvetica-Bold" fontSize="6.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="TITLE_CENTER" fontName="Helvetica-Bold" fontSize="7" 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_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"/> <paraStyle name="TITLE" alignment="CENTER" fontName="Helvetica" fontSize="18.0" leading="20" spaceBefore="-3.0" textColor="black"/>
</stylesheet> </stylesheet>

2
account_financial_report/wizard/wizard_account_balance_4_report.py

@ -45,7 +45,7 @@ class wizard_report(osv.osv_memory):
'date_to': fields.date('End date'), 'date_to': fields.date('End date'),
'tot_check': fields.boolean('Show Total'), 'tot_check': fields.boolean('Show Total'),
'lab_str': fields.char('Description', size= 128), '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),
'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bml','Libro Mayor Legal')],'Tipo Informe',required=True),
#~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True), #~ 'type_report': fields.selection([('un_col','Una Columna'),('dos_col','Dos Columnas'),('cuatro_col','Cuatro Columnas')],'Tipo Informe',required=True),
} }

Loading…
Cancel
Save