diff --git a/account_financial_report_horizontal/__openerp__.py b/account_financial_report_horizontal/__openerp__.py index 7cf2c65e..f658d1b8 100644 --- a/account_financial_report_horizontal/__openerp__.py +++ b/account_financial_report_horizontal/__openerp__.py @@ -4,7 +4,7 @@ # OpenERP, Open Source Management Solution # This module copyright (C) 2012 Therp BV (). # Copyright (C) 2013 Agile Business Group sagl -# () +# () () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -32,16 +32,15 @@ This is a port of the horizontal financial reports 'Balance sheet' and """, 'website': 'http://therp.nl', 'images' : [], - 'init_xml': [], "depends" : ["account"], - 'update_xml': [ + 'data': [ 'menu.xml', 'account_report.xml', 'wizard/account_report_common_view.xml', 'wizard/account_report_balance_sheet_view.xml', 'wizard/account_report_profit_loss_view.xml', ], - 'demo_xml': [], + 'demo': [], 'test': [ ], 'installable': True, 'active': False, diff --git a/account_financial_report_horizontal/wizard/account_report_balance_sheet.py b/account_financial_report_horizontal/wizard/account_report_balance_sheet.py index 91468576..c4f6eaef 100644 --- a/account_financial_report_horizontal/wizard/account_report_balance_sheet.py +++ b/account_financial_report_horizontal/wizard/account_report_balance_sheet.py @@ -3,6 +3,8 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2013 Agile Business Group sagl +# () () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,10 +21,10 @@ # ############################################################################## -from osv import osv, fields +from osv import orm, fields from tools.translate import _ -class account_bs_report(osv.osv_memory): +class account_bs_report(orm.TransientModel): """ This wizard will provide the account balance sheet report by periods, between any two dates. """ @@ -50,7 +52,7 @@ class account_bs_report(osv.osv_memory): context = {} data['form'].update(self.read(cr, uid, ids, ['display_type','reserve_account_id'])[0]) if not data['form']['reserve_account_id']: - raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) + raise orm.except_orm(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !')) data = self.pre_print_report(cr, uid, ids, data, context=context) if data['form']['display_type']: return { @@ -64,7 +66,3 @@ class account_bs_report(osv.osv_memory): 'report_name': 'account.balancesheet', 'datas': data, } - -account_bs_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_financial_report_horizontal/wizard/account_report_common.py b/account_financial_report_horizontal/wizard/account_report_common.py index c1627042..8b2e59ac 100644 --- a/account_financial_report_horizontal/wizard/account_report_common.py +++ b/account_financial_report_horizontal/wizard/account_report_common.py @@ -3,6 +3,8 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2013 Agile Business Group sagl +# () () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -22,10 +24,10 @@ import time from lxml import etree -from osv import fields, osv +from osv import fields, orm from tools.translate import _ -class account_common_report(osv.osv_memory): +class account_common_report(orm.TransientModel): _name = "account_financial_report_horizontal.common.report" _description = "Account Common Report" @@ -139,6 +141,3 @@ class account_common_report(osv.osv_memory): data['form']['used_context'] = used_context return self._print_report(cr, uid, ids, data, context=context) -account_common_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_financial_report_horizontal/wizard/account_report_common_account.py b/account_financial_report_horizontal/wizard/account_report_common_account.py index 6209cf9f..56cadaee 100644 --- a/account_financial_report_horizontal/wizard/account_report_common_account.py +++ b/account_financial_report_horizontal/wizard/account_report_common_account.py @@ -3,6 +3,8 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2013 Agile Business Group sagl +# () () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,9 +21,9 @@ # ############################################################################## -from osv import osv, fields +from osv import orm, fields -class account_common_account_report(osv.osv_memory): +class account_common_account_report(orm.TransientModel): _name = 'account_financial_report_horizontal.common.account.report' _description = 'Account Common Account Report' _inherit = "account_financial_report_horizontal.common.report" @@ -41,6 +43,3 @@ class account_common_account_report(osv.osv_memory): data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0]) return data -account_common_account_report() - -#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/account_financial_report_horizontal/wizard/account_report_profit_loss.py b/account_financial_report_horizontal/wizard/account_report_profit_loss.py index fe5f33ef..c118c5cd 100644 --- a/account_financial_report_horizontal/wizard/account_report_profit_loss.py +++ b/account_financial_report_horizontal/wizard/account_report_profit_loss.py @@ -3,6 +3,8 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). +# Copyright (C) 2013 Agile Business Group sagl +# () () # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -19,9 +21,9 @@ # ############################################################################## -from osv import osv, fields +from osv import orm, fields -class account_pl_report(osv.osv_memory): +class account_pl_report(orm.TransientModel): """ This wizard will provide the account profit and loss report by periods, between any two dates. """ @@ -56,6 +58,3 @@ class account_pl_report(osv.osv_memory): 'datas': data, } -account_pl_report() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: