From c3bf1349b2c20aad996259e8ed01681873882140 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 14 Jul 2010 11:06:41 +0530 Subject: [PATCH 01/26] [REF]: base_report_designer: Code improvement + typos bzr revid: rpa@tinyerp.com-20100714053641-5ezd3ziwzquauq65 --- addons/base_report_designer/__openerp__.py | 4 +-- .../base_report_designer/base_report_data.xml | 1 + .../base_report_designer.py | 32 ++++++++++-------- .../base_report_designer_wizard.xml | 33 +++++++------------ 4 files changed, 33 insertions(+), 37 deletions(-) diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index f19d179a1ed..efdf6cd5a00 100644 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -25,11 +25,11 @@ 'version': '0.1', 'category': 'Generic Modules/Base', 'description': """ -This module is used along with openerp OpenOffice plugin. +This module is used along with OpenERP OpenOffice plugin. You have to first install the plugin which is available at http://www.openerp.com -This module adds wizards to import/export .SXW report that +This module adds wizards to Import/Export .sxw report that you can modify in OpenOffice.Once you have modified it you can upload the report using the same wizard. """, diff --git a/addons/base_report_designer/base_report_data.xml b/addons/base_report_designer/base_report_data.xml index 7e5ec4335ee..bd3854ebdba 100644 --- a/addons/base_report_designer/base_report_data.xml +++ b/addons/base_report_designer/base_report_data.xml @@ -7,6 +7,7 @@ + diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py index 311449fd46c..a4a135c4299 100644 --- a/addons/base_report_designer/base_report_designer.py +++ b/addons/base_report_designer/base_report_designer.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,11 +15,11 @@ # 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 . # ############################################################################## -from osv import fields,osv +from osv import osv from wizard.tiny_sxw2rml import sxw2rml from StringIO import StringIO from report import interface @@ -27,49 +27,53 @@ import base64 import pooler import tools + class report_xml(osv.osv): _inherit = 'ir.actions.report.xml' - def sxwtorml(self,cr, uid, file_sxw,file_type): + def sxwtorml(self, cr, uid, file_sxw, file_type): ''' The use of this function is to get rml file from sxw file. ''' sxwval = StringIO(base64.decodestring(file_sxw)) if file_type=='sxw': - fp = tools.file_open('normalized_oo2rml.xsl', + fp = tools.file_open('normalized_oo2rml.xsl', subdir='addons/base_report_designer/wizard/tiny_sxw2rml') if file_type=='odt': - fp = tools.file_open('normalized_odt2rml.xsl', + fp = tools.file_open('normalized_odt2rml.xsl', subdir='addons/base_report_designer/wizard/tiny_sxw2rml') - + return {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))} - def upload_report(self, cr, uid, report_id, file_sxw,file_type, context): + def upload_report(self, cr, uid, report_id, file_sxw, file_type, context): ''' Untested function ''' pool = pooler.get_pool(cr.dbname) sxwval = StringIO(base64.decodestring(file_sxw)) if file_type=='sxw': - fp = tools.file_open('normalized_oo2rml.xsl', + fp = tools.file_open('normalized_oo2rml.xsl', subdir='addons/base_report_designer/wizard/tiny_sxw2rml') if file_type=='odt': - fp = tools.file_open('normalized_odt2rml.xsl', + fp = tools.file_open('normalized_odt2rml.xsl', subdir='addons/base_report_designer/wizard/tiny_sxw2rml') report = pool.get('ir.actions.report.xml').write(cr, uid, [report_id], { - 'report_sxw_content': base64.decodestring(file_sxw), - 'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), + 'report_sxw_content': base64.decodestring(file_sxw), + 'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), }) db = pooler.get_db_only(cr.dbname) interface.register_all(db) return True + def report_get(self, cr, uid, report_id, context={}): report = self.browse(cr, uid, report_id, context) return { - 'file_type' : report.report_type, - 'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False, + 'file_type' : report.report_type, + 'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False, 'report_rml_content': report.report_rml_content and base64.encodestring(report.report_rml_content) or False } + report_xml() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml index 713dab37d48..c1bb7c35270 100644 --- a/addons/base_report_designer/base_report_designer_wizard.xml +++ b/addons/base_report_designer/base_report_designer_wizard.xml @@ -1,31 +1,22 @@ - + - + - - - + + + - + From cc9cc1b9233ce0c5b335d6d0f6734b2bde5dde8a Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Wed, 14 Jul 2010 11:21:50 +0530 Subject: [PATCH 02/26] [FIX/IMP]: fix and improve the accounting entries through voucher bzr revid: mga@tinyerp.com-20100714055150-6134qxfy7jwg1zza --- addons/account/account_invoice_view.xml | 2 +- addons/account_voucher/voucher.py | 12 ++++++------ addons/account_voucher/voucher_view.xml | 19 +++++++++++++------ .../account_voucher_payment.py | 3 ++- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 99d1181fb7b..7c8f64ff659 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -147,7 +147,7 @@ -