diff --git a/account_financial_report/__openerp__.py b/account_financial_report/__openerp__.py
index f6ad8fa0..82771a52 100644
--- a/account_financial_report/__openerp__.py
+++ b/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
diff --git a/account_financial_report/report/account_balance_2_cols.py b/account_financial_report/report/account_balance_2_cols.py
index 6783b5e6..62cdb0ea 100644
--- a/account_financial_report/report/account_balance_2_cols.py
+++ b/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']]
diff --git a/account_financial_report/report/account_balance_4_cols.py b/account_financial_report/report/account_balance_4_cols.py
index f33f3e23..e5a3ad98 100644
--- a/account_financial_report/report/account_balance_4_cols.py
+++ b/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']]
diff --git a/account_financial_report/report/balance_full_2_cols.rml b/account_financial_report/report/balance_full_2_cols.rml
index 1b65f18a..55bc336d 100644
--- a/account_financial_report/report/balance_full_2_cols.rml
+++ b/account_financial_report/report/balance_full_2_cols.rml
@@ -16,7 +16,11 @@
|
- [[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']] |
+ [[ get_informe_text(data['form']) ]] |
+
+
+ |
+ [[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']] |
|
diff --git a/account_financial_report/report/balance_full_4_cols.rml b/account_financial_report/report/balance_full_4_cols.rml
index 3a590300..9af85ebe 100644
--- a/account_financial_report/report/balance_full_4_cols.rml
+++ b/account_financial_report/report/balance_full_4_cols.rml
@@ -22,7 +22,11 @@
|
- [[ get_informe_text(data['form']) ]][[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']] |
+ [[ get_informe_text(data['form']) ]] |
+
+
+ |
+ [[data['form'] and (' (Expresado en %s)'%( company.currency_id.name)) or '']] |
|
@@ -65,14 +69,14 @@
-
-
-
+
+
+
diff --git a/account_financial_report/view/account_view.xml b/account_financial_report/view/account_view.xml
new file mode 100644
index 00000000..9dd1b764
--- /dev/null
+++ b/account_financial_report/view/account_view.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ account.account.search.padre
+ account.account
+ search
+
+
+
+
+
+
+
+
+
+
diff --git a/account_financial_report/wizard/wizard_account_balance_2_report.py b/account_financial_report/wizard/wizard_account_balance_2_report.py
index 64527f78..14aea962 100644
--- a/account_financial_report/wizard/wizard_account_balance_2_report.py
+++ b/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),
}
diff --git a/account_financial_report/wizard/wizard_account_balance_4_report.py b/account_financial_report/wizard/wizard_account_balance_4_report.py
index 5d20c6de..da392ebb 100644
--- a/account_financial_report/wizard/wizard_account_balance_4_report.py
+++ b/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),
}