From 00bf1f7d6673511803b95e0656449edd930cfd2d Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 27 Apr 2010 15:25:46 +0530 Subject: [PATCH] [add] account : convert account_analytic_balance wizard to osv_memory wizard bzr revid: psi@tinyerp.co.in-20100427095546-l7a4tn3tzzmwqfl1 --- addons/account/__openerp__.py | 3 +- addons/account/project/project_report.xml | 2 +- addons/account/project/wizard/__init__.py | 2 +- .../wizard/account_analytic_balance_report.py | 59 +++++++++++++++++++ .../account_analytic_balance_report_view.xml | 48 +++++++++++++++ .../wizard/account_analytic_check_view.xml | 46 +++++++++++++++ .../wizard_account_analytic_balance_report.py | 55 ----------------- 7 files changed, 157 insertions(+), 58 deletions(-) create mode 100644 addons/account/project/wizard/account_analytic_balance_report.py create mode 100644 addons/account/project/wizard/account_analytic_balance_report_view.xml create mode 100644 addons/account/project/wizard/account_analytic_check_view.xml delete mode 100644 addons/account/project/wizard/wizard_account_analytic_balance_report.py diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 3d63c8b7666..5a2d0e042ff 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -81,6 +81,7 @@ module named account_voucherss 'wizard/account_compare_account_balance_report_view.xml', 'wizard/account_third_party_ledger.xml', 'wizard/account_automatic_reconcile_view.xml', + 'project/wizard/project_account_analytic_line_view.xml', 'account_end_fy.xml', 'account_invoice_view.xml', 'partner_view.xml', @@ -89,8 +90,8 @@ module named account_voucherss 'account_invoice_workflow.xml', 'project/project_view.xml', 'project/project_report.xml', - 'project/wizard/project_account_analytic_line_view.xml', 'project/wizard/account_analytic_check_view.xml', + 'project/wizard/account_analytic_balance_report_view.xml', 'product_view.xml', 'account_assert_test.xml', 'process/statement_process.xml', diff --git a/addons/account/project/project_report.xml b/addons/account/project/project_report.xml index e9c4e880268..a929e99290e 100644 --- a/addons/account/project/project_report.xml +++ b/addons/account/project/project_report.xml @@ -8,7 +8,7 @@ - + diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py index 90b6bfc1c02..7b819980451 100644 --- a/addons/account/project/wizard/__init__.py +++ b/addons/account/project/wizard/__init__.py @@ -20,7 +20,7 @@ ############################################################################## import wizard_account_analytic_journal_report -import wizard_account_analytic_balance_report +import account_analytic_balance_report import wizard_account_analytic_inverted_balance_report import wizard_account_analytic_cost_ledger_report import wizard_account_analytic_cost_ledger_for_journal_report diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py new file mode 100644 index 00000000000..b751808ffb9 --- /dev/null +++ b/addons/account/project/wizard/account_analytic_balance_report.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 . +# +############################################################################## +import time + +from osv import osv, fields + +class account_analytic_balance(osv.osv_memory): + _name = 'account.analytic.balance' + _description = 'Account Analytic Balance' + + _columns = { + 'date1': fields.date('Start of period', required=True), + 'date2': fields.date('End of period', required=True), + 'empty_acc': fields.boolean('Empty Accounts ? ', help='Check if you want to display Accounts with 0 balance too.'), + } + + _defaults = { + 'date1':time.strftime('%Y-01-01'), + 'date2':time.strftime('%Y-%m-%d') + } + + def check_report(self, cr, uid, ids, context=None): + datas = {} + if context is None: + context = {} + data = self.read(cr, uid, ids)[0] + datas = { + 'ids': context.get('active_ids',[]), + 'model': 'account.analytic.account', + 'form': data + } + return { + 'type': 'ir.actions.report.xml', + 'report_name': 'account.analytic.account.balance', + 'datas': datas, + } + +account_analytic_balance() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account/project/wizard/account_analytic_balance_report_view.xml b/addons/account/project/wizard/account_analytic_balance_report_view.xml new file mode 100644 index 00000000000..5144ba8647a --- /dev/null +++ b/addons/account/project/wizard/account_analytic_balance_report_view.xml @@ -0,0 +1,48 @@ + + + + + + Account Analytic Balance + account.analytic.balance + form + +
+ + + + + + + + +