From 67a6556955ce061f5ac055dc70589226f668fbd6 Mon Sep 17 00:00:00 2001 From: Humberto Arocha Date: Fri, 27 Jul 2012 17:33:42 -0530 Subject: [PATCH] [IMP] Se une en un solo Wizard todos los reportes --- account_financial_report/__openerp__.py | 4 +- .../report/account_report_report.xml | 42 ++--- account_financial_report/report/parser.py | 15 +- .../report.xml} | 28 +-- account_financial_report/view/wizard.xml | 94 ++++++++++ account_financial_report/wizard/__init__.py | 6 +- account_financial_report/wizard/wizard.py | 162 ++++++++++++++++++ 7 files changed, 303 insertions(+), 48 deletions(-) rename account_financial_report/{wizard/wizard_report_report.xml => view/report.xml} (68%) create mode 100644 account_financial_report/view/wizard.xml create mode 100644 account_financial_report/wizard/wizard.py diff --git a/account_financial_report/__openerp__.py b/account_financial_report/__openerp__.py index 77dbffa3..2430be9e 100644 --- a/account_financial_report/__openerp__.py +++ b/account_financial_report/__openerp__.py @@ -37,8 +37,8 @@ "demo_xml" : [], "update_xml" : [ "security/security.xml", - "wizard/wizard_report_report.xml", - "wizard/account_report_wizard.xml", + "view/report.xml", + "view/wizard.xml", "view/account_view.xml", "view/company_view.xml", ], diff --git a/account_financial_report/report/account_report_report.xml b/account_financial_report/report/account_report_report.xml index 6ce7e71b..37f26d48 100644 --- a/account_financial_report/report/account_report_report.xml +++ b/account_financial_report/report/account_report_report.xml @@ -1,33 +1,35 @@ - - + - + + id="wizard_report_reporte" + menu="True" + model="wizard.report.account.balance.gene" + name="account.account.balance.gene" + rml="account_financial_report/report/balance_full.rml" + string="Balance de Comprobacion Wizard" + header="False" + /> - diff --git a/account_financial_report/report/parser.py b/account_financial_report/report/parser.py index e8c1e42b..b6bb5873 100644 --- a/account_financial_report/report/parser.py +++ b/account_financial_report/report/parser.py @@ -384,21 +384,20 @@ class account_balance(report_sxw.rml_parse): result_acc.append(res2) return result_acc - -report_sxw.report_sxw('report.wizard.report.reporte', +report_sxw.report_sxw('report.afr.1cols', 'wizard.report', - 'account_financial_report/report/balance_full_4_cols.rml', + 'account_financial_report/report/balance_full.rml', parser=account_balance, header=False) -report_sxw.report_sxw('report.account.account.balance.gene.2', - 'wizard.report.account.balance.gene.2', +report_sxw.report_sxw('report.afr.2cols', + 'wizard.report', 'account_financial_report/report/balance_full_2_cols.rml', parser=account_balance, header=False) -report_sxw.report_sxw('report.account.account.balance.gene', - 'wizard.report.account.balance.gene', - 'account_financial_report/report/balance_full.rml', +report_sxw.report_sxw('report.afr.4cols', + 'wizard.report', + 'account_financial_report/report/balance_full_4_cols.rml', parser=account_balance, header=False) diff --git a/account_financial_report/wizard/wizard_report_report.xml b/account_financial_report/view/report.xml similarity index 68% rename from account_financial_report/wizard/wizard_report_report.xml rename to account_financial_report/view/report.xml index d9d4cb9f..983185fe 100644 --- a/account_financial_report/wizard/wizard_report_report.xml +++ b/account_financial_report/view/report.xml @@ -1,36 +1,38 @@ + + + - diff --git a/account_financial_report/view/wizard.xml b/account_financial_report/view/wizard.xml new file mode 100644 index 00000000..ed3a8b3a --- /dev/null +++ b/account_financial_report/view/wizard.xml @@ -0,0 +1,94 @@ + + + + + + Wizard Report Balance Four Columns + wizard.report + form + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +