Browse Source

[MERGE] Added field parent_id in search view of account.account.


			
			
				6.0
			
			
		
Vauxoo 12 years ago
committed by Nhomar Hernandez
parent
commit
ca36468f69
  1. 1
      account_financial_report/__openerp__.py
  2. 3
      account_financial_report/report/account_balance_2_cols.py
  3. 3
      account_financial_report/report/account_balance_4_cols.py
  4. 6
      account_financial_report/report/balance_full_2_cols.rml
  5. 14
      account_financial_report/report/balance_full_4_cols.rml
  6. 23
      account_financial_report/view/account_view.xml
  7. 2
      account_financial_report/wizard/wizard_account_balance_2_report.py
  8. 2
      account_financial_report/wizard/wizard_account_balance_4_report.py

1
account_financial_report/__openerp__.py

@ -38,6 +38,7 @@
"update_xml" : [
"wizard/wizard_report_report.xml" ,
"wizard/account_report_wizard.xml" ,
"view/account_view.xml",
] ,
"active": False ,
"installable": True

3
account_financial_report/report/account_balance_2_cols.py

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

3
account_financial_report/report/account_balance_4_cols.py

@ -79,7 +79,8 @@ class account_balance(report_sxw.rml_parse):
inf_type = {
'bgen' : ' Balance General',
'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']]

6
account_financial_report/report/balance_full_2_cols.rml

@ -16,7 +16,11 @@
</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>
<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>
<td><para style="TOP_TITLE"></para></td>

14
account_financial_report/report/balance_full_4_cols.rml

@ -22,7 +22,11 @@
</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>
<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>
<td><para style="TOP_TITLE"></para></td>
@ -65,14 +69,14 @@
<paraStyle
name="TITLE_LEFT_ALIGN"
fontName="Helvetica-Bold"
fontSize="8.0"
fontSize="6.0"
leading="10"
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="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" alignment="CENTER" fontName="Helvetica" fontSize="18.0" leading="20" spaceBefore="-3.0" textColor="black"/>
</stylesheet>

23
account_financial_report/view/account_view.xml

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!--
=====================================================
Vista para agregar ala vista en lista de la lista de
cuentas contables el campo padre.
=====================================================
-->
<record id="view_account_search_padre" model="ir.ui.view">
<field name="name">account.account.search.padre</field>
<field name="model">account.account</field>
<field name="type">search</field>
<field name="inherit_id" ref="account.view_account_search"/>
<field name="arch" type="xml">
<xpath expr="/search/group/field[@name='code']" position="after">
<field name="parent_id"/>
</xpath>
</field>
</record>
</data>
</openerp>

2
account_financial_report/wizard/wizard_account_balance_2_report.py

@ -45,7 +45,7 @@ class wizard_account_balance_gene_2(osv.osv_memory):
'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),
'inf_type': fields.selection([('bgen','Balance General'),('bcom','Balance Comprobacion'),('edogp','Estado Ganancias y Perdidas'),('bdl','Diario 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),
}

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'),
'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),
'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),
}

Loading…
Cancel
Save