From a1b2385aa8a63de1b0606db6b41b137d4e63a5a1 Mon Sep 17 00:00:00 2001 From: "Luis E. Escobar V." Date: Thu, 9 Feb 2012 15:36:28 -0530 Subject: [PATCH 1/3] [IMP] Added parent_id in search view. --- account_financial_report/__openerp__.py | 1 + .../view/account_view.xml | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 account_financial_report/view/account_view.xml 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/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 + + + + + + + + + + From 3b6fd367ca92c3e84276f2bcc4f0515948f7bbe1 Mon Sep 17 00:00:00 2001 From: "Luis E. Escobar V." Date: Thu, 9 Feb 2012 15:46:17 -0530 Subject: [PATCH 2/3] [FIX] Added 'Libro Mayor Legal' in General Account Balance Four Columns. [FIX] Optimized Credit and Balance column in General Account Balance Four Columns. --- .../report/account_balance_4_cols.py | 3 ++- .../report/balance_full_4_cols.rml | 14 +++++++++----- .../wizard/wizard_account_balance_4_report.py | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) 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_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/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), } From 0173452d332ac9a8e086950ef1cc1afd3889aba1 Mon Sep 17 00:00:00 2001 From: "Luis E. Escobar V." Date: Thu, 9 Feb 2012 15:58:52 -0530 Subject: [PATCH 3/3] [FIX] Added 'Diario Legal' in General Account Balance two Columns. --- account_financial_report/report/account_balance_2_cols.py | 3 ++- account_financial_report/report/balance_full_2_cols.rml | 6 +++++- .../wizard/wizard_account_balance_2_report.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) 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/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/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), }