From 3574db16161845130679c7a80cee59384ee30f6e Mon Sep 17 00:00:00 2001 From: "Vir(Open ERP),Psi(Open ERP)" <> Date: Wed, 21 Apr 2010 17:11:18 +0530 Subject: [PATCH] [ADD, MOD] account : wizard account_partner_balance converted to osv memory wizard bzr revid: vir@tinyerp.com-20100421114118-5oj4zl577ghn1028 --- addons/account/__openerp__.py | 1 + addons/account/account_wizard.xml | 4 +- addons/account/report/partner_balance.py | 53 ++++---- addons/account/wizard/__init__.py | 2 +- .../wizard/account_partner_balance_report.py | 109 +++++++++++++++ .../account_partner_balance_report_view.xml | 59 ++++++++ .../wizard/wizard_partner_balance_report.py | 127 ------------------ 7 files changed, 200 insertions(+), 155 deletions(-) create mode 100644 addons/account/wizard/account_partner_balance_report.py create mode 100644 addons/account/wizard/account_partner_balance_report_view.xml delete mode 100644 addons/account/wizard/wizard_partner_balance_report.py diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index d12ee4ec836..1ff58367b47 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -71,6 +71,7 @@ module named account_voucherss 'wizard/account_unreconcile_view.xml', 'wizard/account_invoice_state_view.xml', 'wizard/account_use_model_view.xml', + 'wizard/account_partner_balance_report_view.xml', 'project/wizard/project_account_analytic_line_view.xml', 'account_view.xml', 'account_end_fy.xml', diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index 69fc1ef5902..e5825f6b2da 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -76,8 +76,8 @@ - - + diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py index a5b746a0bde..f296475cb3f 100755 --- a/addons/account/report/partner_balance.py +++ b/addons/account/report/partner_balance.py @@ -67,10 +67,10 @@ class partner_balance(report_sxw.rml_parse): ## Get All Period Date # # If we have no period we will take all perdio in the FiscalYear. - if not data['form']['periods'][0][2] : + if not data['form']['periods']: periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])]) else: - periods_id = data['form']['periods'][0][2] + periods_id = data['form']['periods'] date_array = [] for period_id in periods_id: period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id) @@ -85,35 +85,38 @@ class partner_balance(report_sxw.rml_parse): self.date_lst.sort() def transform_both_into_date_array(self,data): - if not data['form']['periods'][0][2] : + final_date_array = [] + date_start_date = data['form']['date1'] + date_stop_date = data['form']['date2'] + if not data['form']['periods']: periods_id = self.pool.get('account.period').search(self.cr, self.uid, [('fiscalyear_id','=',data['form']['fiscalyear'])]) else: - periods_id = data['form']['periods'][0][2] + periods_id = data['form']['periods'] date_array = [] - for period_id in periods_id: - period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id) - date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop) + if periods_id: + for period_id in periods_id: + period_obj = self.pool.get('account.period').browse(self.cr, self.uid, period_id) + date_array = date_array + self.date_range(period_obj.date_start,period_obj.date_stop) + period_start_date = date_array[0] + period_stop_date = date_array[-1] - period_start_date = date_array[0] - date_start_date = data['form']['date1'] - period_stop_date = date_array[-1] - date_stop_date = data['form']['date2'] + if period_start_date). +# +# 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 tools.translate import _ +from osv import fields, osv + +class account_partner_balance(osv.osv_memory): + """ + This wizard will provide the partner balance report by periods, between any two dates. + """ + _name = 'account.partner.balance' + _description = 'Account Partner Balance' + _columns = { + 'company_id': fields.many2one('res.company', 'Company', required=True), + 'state': fields.selection([('bydate','By Date'), + ('byperiod','By Period'), + ('all','By Date and Period'), + ('none','No Filter') + ],'Date/Period Filter'), + 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'), + 'periods': fields.many2many('account.period', 'period_report_rel', 'report_id', 'period_id', 'Periods', help='All periods if empty'), + 'result_selection': fields.selection([('customer','Receivable Accounts'), + ('supplier','Payable Accounts'), + ('all','Receivable and Payable Accounts')], + 'Partner', required=True), + 'soldeinit': fields.boolean('Include initial balances'), + 'date1': fields.date('Start date', required=True), + 'date2': fields.date('End date', required=True), + } + + def _get_company(self, cr, uid, ids, context=None): + user_obj = self.pool.get('res.users') + company_obj = self.pool.get('res.company') + user = user_obj.browse(cr, uid, uid, context=context) + if user.company_id: + return user.company_id.id + else: + return company_obj.search(cr, uid, [('parent_id', '=', False)])[0] + + _defaults={ + 'state' : 'none', + 'date1' : lambda *a: time.strftime('%Y-01-01'), + 'date2' : lambda *a: time.strftime('%Y-%m-%d'), + 'result_selection' : lambda *a: 'all', + 'soldeinit' : True, + 'company_id' : _get_company, + 'fiscalyear' : False, + } + + def check_state(self, cr, uid, ids, context=None): + data = { + 'ids':[], + 'model': 'res.partner', + 'form': self.read(cr, uid, ids, [])[0], + } + + if data['form']['state'] == 'bydate' : + return self._check_date(cr, uid, data, context) + if data['form']['state'] == 'byperiod': + if not data['form']['periods']: + raise osv.except_osv(_('Warning'),_('Please Enter Periods ! ')) + + return { + 'type': 'ir.actions.report.xml', + 'report_name': 'account.partner.balance', + 'datas': data, + } + + def _check_date(self, cr, uid, data, context): + sql = """ + SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f Where %s between f.date_start and f.date_stop """ + cr.execute(sql,(data['form']['date1'],)) + res = cr.dictfetchall() + if res: + if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']): + raise osv.except_osv(_('UserError'),_('Date to must be set between %s and %s') % (str(res[0]['date_start']), str(res[0]['date_stop']))) + else: + return { + 'type': 'ir.actions.report.xml', + 'report_name': 'account.partner.balance', + 'datas': data, + } + else: + raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year')) + +account_partner_balance() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml new file mode 100644 index 00000000000..02c2ec03a25 --- /dev/null +++ b/addons/account/wizard/account_partner_balance_report_view.xml @@ -0,0 +1,59 @@ + + + + + + Select period + account.partner.balance + form + +
+ + + + +