From 02c132144ee3691a2f4ba151ebdc0e2dd1559cef Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Wed, 29 Sep 2010 10:36:15 +0530 Subject: [PATCH] [IMP] account_voucher: Rename files bzr revid: psi@tinyerp.co.in-20100929050615-ydfx82fccrw7n8n1 --- addons/account_voucher/__init__.py | 2 +- addons/account_voucher/__openerp__.py | 12 ++++++------ .../{voucher.py => account_voucher.py} | 0 ...ucher_report.xml => account_voucher_report.xml} | 6 +++--- ...r_sequence.xml => account_voucher_sequence.xml} | 0 .../{voucher_view.xml => account_voucher_view.xml} | 0 ...ucher_wizard.xml => account_voucher_wizard.xml} | 0 ...r_workflow.xml => account_voucher_workflow.xml} | 0 addons/account_voucher/report/__init__.py | 8 ++++---- .../{report_voucher.py => account_voucher.py} | 2 +- .../{report_voucher.rml => account_voucher.rml} | 0 ...t_voucher_print.py => account_voucher_print.py} | 14 +++++++------- ...voucher_print.rml => account_voucher_print.rml} | 0 13 files changed, 22 insertions(+), 22 deletions(-) rename addons/account_voucher/{voucher.py => account_voucher.py} (100%) rename addons/account_voucher/{voucher_report.xml => account_voucher_report.xml} (80%) rename addons/account_voucher/{voucher_sequence.xml => account_voucher_sequence.xml} (100%) rename addons/account_voucher/{voucher_view.xml => account_voucher_view.xml} (100%) rename addons/account_voucher/{voucher_wizard.xml => account_voucher_wizard.xml} (100%) rename addons/account_voucher/{voucher_workflow.xml => account_voucher_workflow.xml} (100%) rename addons/account_voucher/report/{report_voucher.py => account_voucher.py} (97%) rename addons/account_voucher/report/{report_voucher.rml => account_voucher.rml} (100%) rename addons/account_voucher/report/{report_voucher_print.py => account_voucher_print.py} (97%) rename addons/account_voucher/report/{report_voucher_print.rml => account_voucher_print.rml} (100%) diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py index 27aee55f2d7..41f33976c53 100644 --- a/addons/account_voucher/__init__.py +++ b/addons/account_voucher/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import voucher +import account_voucher import report import wizard diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 3a846791c23..59495eddc5f 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -38,22 +38,22 @@ "update_xml" : [ "security/ir.model.access.csv", - "voucher_sequence.xml", - "voucher_workflow.xml", - "voucher_report.xml", + "account_voucher_sequence.xml", + "account_voucher_workflow.xml", + "account_voucher_report.xml", "wizard/account_voucher_unreconcile_view.xml", "wizard/account_statement_from_invoice_view.xml", - "voucher_view.xml", + "account_voucher_view.xml", "voucher_payment_receipt_view.xml", "voucher_sales_purchase_view.xml", - "voucher_wizard.xml", + "account_voucher_wizard.xml", "security/account_voucher_security.xml" ], "test" : [ # "test/account_voucher.yml", "test/sales_receipt.yml", "test/sales_payment.yml", - "test/account_voucher_report.yml" + "test/account_voucher_report.yml" ], 'certificate': '0037580727101', "active": False, diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/account_voucher.py similarity index 100% rename from addons/account_voucher/voucher.py rename to addons/account_voucher/account_voucher.py diff --git a/addons/account_voucher/voucher_report.xml b/addons/account_voucher/account_voucher_report.xml similarity index 80% rename from addons/account_voucher/voucher_report.xml rename to addons/account_voucher/account_voucher_report.xml index 04bcb5254ba..db1b4279620 100644 --- a/addons/account_voucher/voucher_report.xml +++ b/addons/account_voucher/account_voucher_report.xml @@ -5,17 +5,17 @@ string="Voucher" model="account.voucher" name="voucher.cash_receipt.drcr" - rml="account_voucher/report/report_voucher.rml" + rml="account_voucher/report/account_voucher.rml" groups="base.group_extended" auto="False" header = "False" menu="True"/> - + diff --git a/addons/account_voucher/voucher_sequence.xml b/addons/account_voucher/account_voucher_sequence.xml similarity index 100% rename from addons/account_voucher/voucher_sequence.xml rename to addons/account_voucher/account_voucher_sequence.xml diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/account_voucher_view.xml similarity index 100% rename from addons/account_voucher/voucher_view.xml rename to addons/account_voucher/account_voucher_view.xml diff --git a/addons/account_voucher/voucher_wizard.xml b/addons/account_voucher/account_voucher_wizard.xml similarity index 100% rename from addons/account_voucher/voucher_wizard.xml rename to addons/account_voucher/account_voucher_wizard.xml diff --git a/addons/account_voucher/voucher_workflow.xml b/addons/account_voucher/account_voucher_workflow.xml similarity index 100% rename from addons/account_voucher/voucher_workflow.xml rename to addons/account_voucher/account_voucher_workflow.xml diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py index eb69b63d856..b451c21b6a0 100644 --- a/addons/account_voucher/report/__init__.py +++ b/addons/account_voucher/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,9 +15,9 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## -import report_voucher -import report_voucher_print +import account_voucher +import account_voucher_print diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/account_voucher.py similarity index 97% rename from addons/account_voucher/report/report_voucher.py rename to addons/account_voucher/report/account_voucher.py index d83c319d1ba..7655f294bf9 100644 --- a/addons/account_voucher/report/report_voucher.py +++ b/addons/account_voucher/report/account_voucher.py @@ -67,6 +67,6 @@ class report_voucher(report_sxw.rml_parse): report_sxw.report_sxw( 'report.voucher.cash_receipt.drcr', 'account.voucher', - 'addons/account_voucher/report/report_voucher.rml', + 'addons/account_voucher/report/account_voucher.rml', parser=report_voucher,header="external" ) diff --git a/addons/account_voucher/report/report_voucher.rml b/addons/account_voucher/report/account_voucher.rml similarity index 100% rename from addons/account_voucher/report/report_voucher.rml rename to addons/account_voucher/report/account_voucher.rml diff --git a/addons/account_voucher/report/report_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py similarity index 97% rename from addons/account_voucher/report/report_voucher_print.py rename to addons/account_voucher/report/account_voucher_print.py index 6f405bbe975..0da644c6e4f 100644 --- a/addons/account_voucher/report/report_voucher_print.py +++ b/addons/account_voucher/report/account_voucher_print.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -37,7 +37,7 @@ class report_voucher_print(report_sxw.rml_parse): def convert(self, amount, cur): amt_en = amount_to_text_en.amount_to_text(amount, 'en', cur); return amt_en - + def get_lines(self,voucher): result = [] if voucher.type in ('payment','receipt'): @@ -67,13 +67,13 @@ class report_voucher_print(report_sxw.rml_parse): res['amount'] = amount result.append(res) return result - + def get_title(self, type): title = '' if type: title = type[0].swapcase() + type[1:] + " Voucher" return title - + def get_on_account(self, voucher): name = "" if voucher.type == 'receipt': @@ -85,10 +85,10 @@ class report_voucher_print(report_sxw.rml_parse): elif voucher.type == 'purchase': name = "Purchase from "+str(voucher.partner_id.name) return name - + report_sxw.report_sxw( 'report.voucher.print', 'account.voucher', - 'addons/account_voucher/report/report_voucher_print.rml', + 'addons/account_voucher/report/account_voucher_print.rml', parser=report_voucher_print,header="external" ) diff --git a/addons/account_voucher/report/report_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml similarity index 100% rename from addons/account_voucher/report/report_voucher_print.rml rename to addons/account_voucher/report/account_voucher_print.rml