Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[pep8] - account_financial_report

pull/6/head
laetitia.gangloff@acsone.eu 2014-08-08 13:18:16 +02:00
parent 8ce2b82351
commit 4c518c56fa
8 changed files with 599 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
account_financial_report/__init__.py
View File

@ -3,7 +3,7 @@
# Module Writen to OpenERP, Open Source Management Solution # Module Writen to OpenERP, Open Source Management Solution
# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). # Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>).
# All Rights Reserved # All Rights Reserved
###############Credits###################################################### # Credits######################################################
# Coded by: Humberto Arocha humberto@openerp.com.ve # Coded by: Humberto Arocha humberto@openerp.com.ve
# Angelica Barrios angelicaisabelb@gmail.com # Angelica Barrios angelicaisabelb@gmail.com
# Jordi Esteve <jesteve@zikzakmedia.com> # Jordi Esteve <jesteve@zikzakmedia.com>
@ -25,6 +25,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
import model from . import model
import report from . import report
import wizard from . import wizard

8
account_financial_report/model/__init__.py
View File

@ -10,8 +10,8 @@
# Audited by: Nhomar Hernandez <nhomar@vauxoo.com> # Audited by: Nhomar Hernandez <nhomar@vauxoo.com>
############################################################################# #############################################################################
# This program is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU Affero General Public License as published
# the Free Software Foundation, either version 3 of the License, or # by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
@ -23,5 +23,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
########################################################################## ##########################################################################
import account_financial_report from . import account_financial_report
import res_company from . import res_company

111
account_financial_report/model/account_financial_report.py
View File

@ -26,10 +26,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
from osv import osv, fields from openerp.osv import osv, fields
import pooler
import time import time
from tools.translate import _ from openerp.tools.translate import _
class account_financial_report(osv.osv): class account_financial_report(osv.osv):
@ -38,45 +37,77 @@ class account_financial_report(osv.osv):
_columns = { _columns = {
'name': fields.char('Name', size=128, required=True), 'name': fields.char('Name', size=128, required=True),
'company_id': fields.many2one('res.company', 'Company', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True),
'currency_id': fields.many2one( 'currency_id': fields.many2one('res.currency', 'Currency',
'res.currency', 'Currency', help="Currency at which this report will be expressed. If not selected will be used the one set in the company"), help="Currency at which this report\
'inf_type': fields.selection( will be expressed. If not selected will\
[('BS', 'Balance Sheet'), ('IS', 'Income Statement')], 'Type', required=True), be used the one set in the company"),
'columns': fields.selection([('one', 'End. Balance'), ('two', 'Debit | Credit'), ('four', 'Initial | Debit | Credit | YTD'), 'inf_type': fields.selection([('BS', 'Balance Sheet'),
('five', 'Initial | Debit | Credit | Period | YTD'), ('qtr', "4 QTR's | YTD"), ('thirteen', '12 Months | YTD')], 'Columns', required=True), ('IS', 'Income Statement')],
'display_account': fields.selection([('all', 'All Accounts'), ('bal', 'With Balance'), 'Type',
('mov', 'With movements'), ('bal_mov', 'With Balance / Movements')], 'Display accounts'), required=True),
'display_account_level': fields.integer( 'columns': fields.selection(
'Up to level', help='Display accounts up to this level (0 to show all)'), [('one', 'End. Balance'),
'account_ids': fields.many2many( ('two', 'Debit | Credit'),
'account.account', 'afr_account_rel', 'afr_id', 'account_id', 'Root accounts', required=True), ('four', 'Initial | Debit | Credit | YTD'),
'fiscalyear_id': fields.many2one( ('five', 'Initial | Debit | Credit | Period | YTD'),
'account.fiscalyear', 'Fiscal year', help='Fiscal Year for this report', required=True), ('qtr', "4 QTR's | YTD"),
'period_ids': fields.many2many('account.period', 'afr_period_rel', 'afr_id', ('thirteen', '12 Months | YTD')], 'Columns', required=True),
'period_id', 'Periods', help='All periods in the fiscal year if empty'), 'display_account': fields.selection(
[('all', 'All Accounts'),
('bal', 'With Balance'),
('mov', 'With movements'),
('bal_mov', 'With Balance / Movements')], 'Display accounts'),
'display_account_level': fields.integer('Up to level',
help='Display accounts up to\
this level (0 to show all)'),
'account_ids': fields.many2many('account.account', 'afr_account_rel',
'afr_id', 'account_id',
'Root accounts', required=True),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year',
help='Fiscal Year for this report',
required=True),
'period_ids': fields.many2many(
'account.period', 'afr_period_rel', 'afr_id', 'period_id',
'Periods', help='All periods in the fiscal year if empty'),
'analytic_ledger': fields.boolean( 'analytic_ledger': fields.boolean('Analytic Ledger',
'Analytic Ledger', help="Allows to Generate an Analytic Ledger for accounts with moves. Available when Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), help="Allows to Generate an Analytic\
'journal_ledger': fields.boolean( Ledger for accounts with moves.\
'journal Ledger', help="Allows to Generate an journal Ledger for accounts with moves. Available when Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), Available when Balance Sheet and\
'partner_balance': fields.boolean('Partner Balance', help="Allows to " 'Initial | Debit | Credit | YTD'\
"Generate a Partner Balance for accounts with moves. Available when " are selected"),
"Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), 'journal_ledger': fields.boolean('journal Ledger',
help="Allows to Generate an journal\
Ledger for accounts with moves.\
Available when Balance Sheet and\
'Initial | Debit | Credit | YTD'\
are selected"),
'partner_balance': fields.boolean('Partner Balance',
help="Allows to Generate a Partner\
Balance for accounts with moves.\
Available when Balance Sheet and\
'Initial | Debit | Credit | YTD'\
are selected"),
'tot_check': fields.boolean( 'tot_check': fields.boolean(
'Summarize?', help='Checking will add a new line at the end of the Report which will Summarize Columns in Report'), 'Summarize?',
'lab_str': help='Checking will add a new line at the end of the Report which\
fields.char( will Summarize Columns in Report'),
'Description', 'lab_str': fields.char('Description',
help='Description for the Summary', help='Description for the Summary',
size=128), size=128),
'target_move': fields.selection([('posted', 'All Posted Entries'), 'target_move': fields.selection(
('all', 'All Entries'), [('posted', 'All Posted Entries'),
], 'Entries to Include', required=True, ('all', 'All Entries'), ],
help='Print All Accounting Entries or just Posted Accounting Entries'), 'Entries to Include', required=True,
help='Print All Accounting Entries or just Posted\
Accounting Entries'),
#~ Deprecated fields # ~ Deprecated fields
'filter': fields.selection([('bydate', 'By Date'), ('byperiod', 'By Period'), 'filter': fields.selection([('bydate', 'By Date'),
('all', 'By Date and Period'), ('none', 'No Filter')], 'Date/Period Filter'), ('byperiod', 'By Period'),
('all', 'By Date and Period'),
('none', 'No Filter')],
'Date/Period Filter'),
'date_to': fields.date('End date'), 'date_to': fields.date('End date'),
'date_from': fields.date('Start date'), 'date_from': fields.date('Start date'),
} }
@ -144,8 +175,10 @@ class account_financial_report(osv.osv):
if columns in ('qtr', 'thirteen'): if columns in ('qtr', 'thirteen'):
p_obj = self.pool.get("account.period") p_obj = self.pool.get("account.period")
period_ids = p_obj.search(cr, uid, [('fiscalyear_id', '=', fiscalyear_id), ( period_ids = p_obj.search(cr, uid,
'special', '=', False)], context=context) [('fiscalyear_id', '=', fiscalyear_id),
('special', '=', False)],
context=context)
res['value'].update({'period_ids': period_ids}) res['value'].update({'period_ids': period_ids})
else: else:
res['value'].update({'period_ids': []}) res['value'].update({'period_ids': []})

11
account_financial_report/model/res_company.py
View File

@ -10,8 +10,8 @@
# Audited by: Nhomar Hernandez <nhomar@vauxoo.com> # Audited by: Nhomar Hernandez <nhomar@vauxoo.com>
############################################################################# #############################################################################
# This program is free software: you can redistribute it and/or modify # 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 # it under the terms of the GNU Affero General Public License as published
# the Free Software Foundation, either version 3 of the License, or # by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
@ -23,12 +23,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
########################################################################## ##########################################################################
from osv import osv from openerp.osv import orm, fields
from osv import fields
from tools.translate import _
class res_company(osv.osv): class res_company(orm.Model):
_inherit = 'res.company' _inherit = 'res.company'
_columns = { _columns = {
'credit_account_ids': fields.many2many('account.account', 'credit_account_ids': fields.many2many('account.account',
@ -40,4 +38,3 @@ class res_company(osv.osv):
'company_id', 'account_id', 'company_id', 'account_id',
'Debitable Accounts'), 'Debitable Accounts'),
} }
res_company()

2
account_financial_report/report/__init__.py
View File

@ -25,4 +25,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
import parser from . import parser

472
account_financial_report/report/parser.py
View File

@ -26,16 +26,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
import xml
import copy
from operator import itemgetter
import time import time
import datetime from openerp.report import report_sxw
from report import report_sxw from openerp.tools.translate import _
from tools import config from openerp.osv import osv
from tools.translate import _
from osv import osv
from openerp.tools.safe_eval import safe_eval as eval
class account_balance(report_sxw.rml_parse): class account_balance(report_sxw.rml_parse):
@ -68,14 +62,17 @@ class account_balance(report_sxw.rml_parse):
""" """
rc_obj = self.pool.get('res.company') rc_obj = self.pool.get('res.company')
country_code = rc_obj.browse(self.cr, self.uid, country_code = rc_obj.browse(self.cr, self.uid,
form['company_id'][0]).partner_id.country_id.code or '' form['company_id'][0]).partner_id.\
country_id.code or ''
string_vat = rc_obj.browse(self.cr, self.uid, string_vat = rc_obj.browse(self.cr, self.uid,
form['company_id'][0]).partner_id.vat or '' form['company_id'][0]).partner_id.vat or ''
if string_vat: if string_vat:
if country_code == 'MX': if country_code == 'MX':
return '%s' % (string_vat[2:]) return '%s' % (string_vat[2:])
elif country_code == 'VE': elif country_code == 'VE':
return '- %s-%s-%s' % (string_vat[2:3], string_vat[3:11], string_vat[11:12]) return '- %s-%s-%s' % (string_vat[2:3],
string_vat[3:11],
string_vat[11:12])
else: else:
return string_vat return string_vat
else: else:
@ -85,7 +82,7 @@ class account_balance(report_sxw.rml_parse):
""" """
Returns the fiscal year text used on the report. Returns the fiscal year text used on the report.
""" """
fiscalyear_obj = self.pool.get('account.fiscalyear') fiscalyear_obj = self.pool['account.fiscalyear']
fiscalyear = None fiscalyear = None
if form.get('fiscalyear'): if form.get('fiscalyear'):
fiscalyear = fiscalyear_obj.browse( fiscalyear = fiscalyear_obj.browse(
@ -104,7 +101,8 @@ class account_balance(report_sxw.rml_parse):
list, tuple) and form['afr_id'][0] or form['afr_id'] list, tuple) and form['afr_id'][0] or form['afr_id']
if afr_id: if afr_id:
name = self.pool.get('afr').browse(self.cr, self.uid, afr_id).name name = self.pool.get('afr').browse(self.cr, self.uid, afr_id).name
elif form['analytic_ledger'] and form['columns'] == 'four' and form['inf_type'] == 'BS': elif form['analytic_ledger'] and form['columns'] == 'four'\
and form['inf_type'] == 'BS':
name = _('Analytic Ledger') name = _('Analytic Ledger')
elif form['inf_type'] == 'BS': elif form['inf_type'] == 'BS':
name = _('Balance Sheet') name = _('Balance Sheet')
@ -118,41 +116,43 @@ class account_balance(report_sxw.rml_parse):
return day, year and month return day, year and month
''' '''
if form['filter'] in ['bydate', 'all']: if form['filter'] in ['bydate', 'all']:
months = ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", return _('From ') + self.formatLang(form['date_from'], date=True)\
"Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"] + _(' to ') + self.formatLang(form['date_to'], date=True)
mes = months[time.strptime(form['date_to'], "%Y-%m-%d")[1] - 1]
ano = time.strptime(form['date_to'], "%Y-%m-%d")[0]
dia = time.strptime(form['date_to'], "%Y-%m-%d")[2]
return _('From ') + self.formatLang(form['date_from'], date=True) + _(' to ') + self.formatLang(form['date_to'], date=True)
elif form['filter'] in ['byperiod', 'all']: elif form['filter'] in ['byperiod', 'all']:
aux = [] aux = []
period_obj = self.pool.get('account.period') period_obj = self.pool.get('account.period')
for period in period_obj.browse(self.cr, self.uid, form['periods']): for period in period_obj.browse(self.cr, self.uid,
form['periods']):
aux.append(period.date_start) aux.append(period.date_start)
aux.append(period.date_stop) aux.append(period.date_stop)
sorted(aux) sorted(aux)
return _('From ') + self.formatLang(aux[0], date=True) + _(' to ') + self.formatLang(aux[-1], date=True) return _('From ') + self.formatLang(aux[0], date=True) + _(' to ')\
+ self.formatLang(aux[-1], date=True)
def get_periods_and_date_text(self, form): def get_periods_and_date_text(self, form):
""" """
Returns the text with the periods/dates used on the report. Returns the text with the periods/dates used on the report.
""" """
period_obj = self.pool.get('account.period') period_obj = self.pool['account.period']
periods_str = None fiscalyear_obj = self.pool['account.fiscalyear']
fiscalyear_id = form[ fiscalyear_id = form[
'fiscalyear'] or fiscalyear_obj.find(self.cr, self.uid) 'fiscalyear'] or fiscalyear_obj.find(self.cr, self.uid)
period_ids = period_obj.search(self.cr, self.uid, [( period_ids = period_obj.search(self.cr, self.uid, [(
'fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)]) 'fiscalyear_id', '=', fiscalyear_id), ('special', '=', False)])
if form['filter'] in ['byperiod', 'all']: if form['filter'] in ['byperiod', 'all']:
period_ids = form['periods'] period_ids = form['periods']
periods_str = ', '.join([period.name or period.code for period in period_obj.browse( periods_str = ', '.join([period.name or period.code
self.cr, self.uid, period_ids)]) for period in period_obj.browse(self.cr,
self.uid,
period_ids)])
dates_str = None dates_str = None
if form['filter'] in ['bydate', 'all']: if form['filter'] in ['bydate', 'all']:
dates_str = self.formatLang(form[ dates_str = self.formatLang(form[
'date_from'], date=True) + ' - ' + self.formatLang(form['date_to'], date=True) + ' ' 'date_from'], date=True) + ' - ' +\
self.formatLang(form['date_to'],
date=True) + ' '
return {'periods': periods_str, 'date': dates_str} return {'periods': periods_str, 'date': dates_str}
def special_period(self, periods): def special_period(self, periods):
@ -164,20 +164,26 @@ class account_balance(report_sxw.rml_parse):
return False return False
def exchange_name(self, form): def exchange_name(self, form):
self.from_currency_id = self.get_company_currency(form['company_id'] and type(form[ self.from_currency_id = self.\
'company_id']) in (list, tuple) and form['company_id'][0] or form['company_id']) get_company_currency(form['company_id']
and type(form['company_id']) in (list, tuple)
and form['company_id'][0]
or form['company_id'])
if not form['currency_id']: if not form['currency_id']:
self.to_currency_id = self.from_currency_id self.to_currency_id = self.from_currency_id
else: else:
self.to_currency_id = form['currency_id'] and type(form['currency_id']) in ( self.to_currency_id = form['currency_id']\
list, tuple) and form['currency_id'][0] or form['currency_id'] and type(form['currency_id']) in (list, tuple)\
return self.pool.get('res.currency').browse(self.cr, self.uid, self.to_currency_id).name and form['currency_id'][0] or form['currency_id']
return self.pool.get('res.currency').browse(self.cr, self.uid,
self.to_currency_id).name
def exchange(self, from_amount): def exchange(self, from_amount):
if self.from_currency_id == self.to_currency_id: if self.from_currency_id == self.to_currency_id:
return from_amount return from_amount
curr_obj = self.pool.get('res.currency') curr_obj = self.pool.get('res.currency')
return curr_obj.compute(self.cr, self.uid, self.from_currency_id, self.to_currency_id, from_amount) return curr_obj.compute(self.cr, self.uid, self.from_currency_id,
self.to_currency_id, from_amount)
def get_company_currency(self, company_id): def get_company_currency(self, company_id):
rc_obj = self.pool.get('res.company') rc_obj = self.pool.get('res.company')
@ -186,12 +192,15 @@ class account_balance(report_sxw.rml_parse):
def get_company_accounts(self, company_id, acc='credit'): def get_company_accounts(self, company_id, acc='credit'):
rc_obj = self.pool.get('res.company') rc_obj = self.pool.get('res.company')
if acc == 'credit': if acc == 'credit':
return [brw.id for brw in rc_obj.browse(self.cr, self.uid, company_id).credit_account_ids] return [brw.id for brw in rc_obj.browse(
self.cr, self.uid,
company_id).credit_account_ids]
else: else:
return [brw.id for brw in rc_obj.browse(self.cr, self.uid, company_id).debit_account_ids] return [brw.id for brw in rc_obj.browse(
self.cr, self.uid,
company_id).debit_account_ids]
def _get_partner_balance(self, account, init_period, ctx=None): def _get_partner_balance(self, account, init_period, ctx=None):
rp_obj = self.pool.get('res.partner')
res = [] res = []
ctx = ctx or {} ctx = ctx or {}
if account['type'] in ('other', 'liquidity', 'receivable', 'payable'): if account['type'] in ('other', 'liquidity', 'receivable', 'payable'):
@ -199,7 +208,9 @@ class account_balance(report_sxw.rml_parse):
SELECT SELECT
CASE CASE
WHEN aml.partner_id IS NOT NULL WHEN aml.partner_id IS NOT NULL
THEN (SELECT name FROM res_partner WHERE aml.partner_id = id) THEN (SELECT name
FROM res_partner
WHERE aml.partner_id = id)
ELSE 'UNKNOWN' ELSE 'UNKNOWN'
END AS partner_name, END AS partner_name,
CASE CASE
@ -255,7 +266,8 @@ class account_balance(report_sxw.rml_parse):
SUM(init_dr)-SUM(init_cr) AS balanceinit, SUM(init_dr)-SUM(init_cr) AS balanceinit,
SUM(bal_dr) AS debit, SUM(bal_dr) AS debit,
SUM(bal_cr) AS credit, SUM(bal_cr) AS credit,
SUM(init_dr) - SUM(init_cr) + SUM(bal_dr) - SUM(bal_cr) AS balance SUM(init_dr) - SUM(init_cr)
+ SUM(bal_dr) - SUM(bal_cr) AS balance
FROM ( FROM (
SELECT SELECT
* *
@ -292,29 +304,50 @@ class account_balance(report_sxw.rml_parse):
res = [] res = []
if account['type'] in ('other', 'liquidity', 'receivable', 'payable'): if account['type'] in ('other', 'liquidity', 'receivable', 'payable'):
#~ TODO: CUANDO EL PERIODO ESTE VACIO LLENARLO CON LOS PERIODOS DEL EJERCICIO # ~ TODO: CUANDO EL PERIODO ESTE VACIO LLENARLO CON LOS PERIODOS
#~ FISCAL, SIN LOS PERIODOS ESPECIALES # DEL EJERCICIO
# ~ FISCAL, SIN LOS PERIODOS ESPECIALES
periods = ', '.join([str(i) for i in ctx['periods']]) periods = ', '.join([str(i) for i in ctx['periods']])
#~ periods = str(tuple(ctx['periods'])) # ~ periods = str(tuple(ctx['periods']))
where = """where aml.period_id in (%s) and aa.id = %s and aml.state <> 'draft'""" % ( where = """where aml.period_id in (%s)
periods, account['id']) and aa.id = %s
and aml.state <> 'draft'""" % (periods, account['id'])
if ctx.get('state', 'posted') == 'posted': if ctx.get('state', 'posted') == 'posted':
where += "AND am.state = 'posted'" where += "AND am.state = 'posted'"
sql_detalle = """select aml.id as id, aj.name as diario, aa.name as descripcion, sql_detalle = """select aml.id as id,
(select name from res_partner where aml.partner_id = id) as partner, aj.name as diario,
aa.code as cuenta, aml.name as name, aa.name as descripcion,
(select name
from res_partner
where aml.partner_id = id) as partner,
aa.code as cuenta,
aml.name as name,
aml.ref as ref, aml.ref as ref,
case when aml.debit is null then 0.00 else aml.debit end as debit, case when aml.debit is null
case when aml.credit is null then 0.00 else aml.credit end as credit, then 0.00
(select code from account_analytic_account where aml.analytic_account_id = id) as analitica, else aml.debit
aml.date as date, ap.name as periodo, end as debit,
case when aml.credit is null
then 0.00
else aml.credit
end as credit,
(select code
from account_analytic_account
where aml.analytic_account_id = id)
as analitica,
aml.date as date,
ap.name as periodo,
am.name as asiento am.name as asiento
from account_move_line aml from account_move_line aml
inner join account_journal aj on aj.id = aml.journal_id inner join account_journal aj
inner join account_account aa on aa.id = aml.account_id on aj.id = aml.journal_id
inner join account_period ap on ap.id = aml.period_id inner join account_account aa
inner join account_move am on am.id = aml.move_id """ + where +\ on aa.id = aml.account_id
""" order by date, am.name""" inner join account_period ap
on ap.id = aml.period_id
inner join account_move am
on am.id = aml.move_id """\
+ where + """ order by date, am.name"""
self.cr.execute(sql_detalle) self.cr.execute(sql_detalle)
resultat = self.cr.dictfetchall() resultat = self.cr.dictfetchall()
@ -342,12 +375,14 @@ class account_balance(report_sxw.rml_parse):
am_obj = self.pool.get('account.move') am_obj = self.pool.get('account.move')
print 'AM OBJ ', am_obj print 'AM OBJ ', am_obj
if account['type'] in ('other', 'liquidity', 'receivable', 'payable'): if account['type'] in ('other', 'liquidity', 'receivable', 'payable'):
#~ TODO: CUANDO EL PERIODO ESTE VACIO LLENARLO CON LOS PERIODOS DEL EJERCICIO # ~ TODO: CUANDO EL PERIODO ESTE VACIO LLENARLO CON LOS PERIODOS
#~ FISCAL, SIN LOS PERIODOS ESPECIALES # DEL EJERCICIO
# ~ FISCAL, SIN LOS PERIODOS ESPECIALES
periods = ', '.join([str(i) for i in ctx['periods']]) periods = ', '.join([str(i) for i in ctx['periods']])
#~ periods = str(tuple(ctx['periods'])) # ~ periods = str(tuple(ctx['periods']))
where = """where aml.period_id in (%s) and aa.id = %s and aml.state <> 'draft'""" % ( where = """where aml.period_id in (%s)
periods, account['id']) and aa.id = %s
and aml.state <> 'draft'""" % (periods, account['id'])
if ctx.get('state', 'posted') == 'posted': if ctx.get('state', 'posted') == 'posted':
where += "AND am.state = 'posted'" where += "AND am.state = 'posted'"
sql_detalle = """SELECT sql_detalle = """SELECT
@ -360,8 +395,8 @@ class account_balance(report_sxw.rml_parse):
inner join account_journal aj on aj.id = aml.journal_id inner join account_journal aj on aj.id = aml.journal_id
inner join account_account aa on aa.id = aml.account_id inner join account_account aa on aa.id = aml.account_id
inner join account_period ap on ap.id = aml.period_id inner join account_period ap on ap.id = aml.period_id
inner join account_move am on am.id = aml.move_id """ + where +\ inner join account_move am on am.id = aml.move_id """\
""" order by date, am.name""" + where + """ order by date, am.name"""
self.cr.execute(sql_detalle) self.cr.execute(sql_detalle)
resultat = self.cr.dictfetchall() resultat = self.cr.dictfetchall()
@ -374,7 +409,8 @@ class account_balance(report_sxw.rml_parse):
'period': det['periodo'], 'period': det['periodo'],
'obj': am_obj.browse(self.cr, self.uid, det['am_id']) 'obj': am_obj.browse(self.cr, self.uid, det['am_id'])
}) })
print 'ACCOUNT NAME', am_obj.browse(self.cr, self.uid, det['am_id']).name print 'ACCOUNT NAME', am_obj.browse(self.cr, self.uid,
det['am_id']).name
return res return res
def lines(self, form, level=0): def lines(self, form, level=0):
@ -387,15 +423,18 @@ class account_balance(report_sxw.rml_parse):
period_obj = self.pool.get('account.period') period_obj = self.pool.get('account.period')
fiscalyear_obj = self.pool.get('account.fiscalyear') fiscalyear_obj = self.pool.get('account.fiscalyear')
def _get_children_and_consol(cr, uid, ids, level, context={}, change_sign=False): def _get_children_and_consol(cr, uid, ids, level, context={},
change_sign=False):
aa_obj = self.pool.get('account.account') aa_obj = self.pool.get('account.account')
ids2 = [] ids2 = []
for aa_brw in aa_obj.browse(cr, uid, ids, context): for aa_brw in aa_obj.browse(cr, uid, ids, context):
if aa_brw.child_id and aa_brw.level < level and aa_brw.type != 'consolidation': if aa_brw.child_id and aa_brw.level < level\
and aa_brw.type != 'consolidation':
if not change_sign: if not change_sign:
ids2.append([aa_brw.id, True, False, aa_brw]) ids2.append([aa_brw.id, True, False, aa_brw])
ids2 += _get_children_and_consol(cr, uid, [ ids2 += _get_children_and_consol(
x.id for x in aa_brw.child_id], level, context, change_sign=change_sign) cr, uid, [x.id for x in aa_brw.child_id], level,
context, change_sign=change_sign)
if change_sign: if change_sign:
ids2.append(aa_brw.id) ids2.append(aa_brw.id)
else: else:
@ -414,7 +453,9 @@ class account_balance(report_sxw.rml_parse):
ctx_end = ctx ctx_end = ctx
ctx_end['filter'] = form.get('filter', 'all') ctx_end['filter'] = form.get('filter', 'all')
ctx_end['fiscalyear'] = fiscalyear.id ctx_end['fiscalyear'] = fiscalyear.id
#~ ctx_end['periods'] = period_obj.search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),('special','=',False)]) # ~ ctx_end['periods'] = period_obj.\
# search(self.cr, self.uid, [('fiscalyear_id','=',fiscalyear.id),
# ('special','=',False)])
if ctx_end['filter'] not in ['bydate', 'none']: if ctx_end['filter'] not in ['bydate', 'none']:
special = self.special_period(form['periods']) special = self.special_period(form['periods'])
@ -423,11 +464,16 @@ class account_balance(report_sxw.rml_parse):
if form['filter'] in ['byperiod', 'all']: if form['filter'] in ['byperiod', 'all']:
if special: if special:
ctx_end['periods'] = period_obj.search(self.cr, self.uid, [( ctx_end['periods'] = period_obj.search(
'id', 'in', form['periods'] or ctx_end.get('periods', False))]) self.cr, self.uid,
[('id', 'in', form['periods'] or ctx_end.get('periods',
False))])
else: else:
ctx_end['periods'] = period_obj.search(self.cr, self.uid, [('id', 'in', form[ ctx_end['periods'] = period_obj.search(
'periods'] or ctx_end.get('periods', False)), ('special', '=', False)]) self.cr, self.uid,
[('id', 'in', form['periods'] or ctx_end.get('periods',
False)),
('special', '=', False)])
if form['filter'] in ['bydate', 'all', 'none']: if form['filter'] in ['bydate', 'all', 'none']:
ctx_end['date_from'] = form['date_from'] ctx_end['date_from'] = form['date_from']
@ -437,11 +483,19 @@ class account_balance(report_sxw.rml_parse):
def missing_period(ctx_init): def missing_period(ctx_init):
ctx_init['fiscalyear'] = fiscalyear_obj.search(self.cr, self.uid, [('date_stop', '<', fiscalyear.date_start)], order='date_stop') and \ ctx_init['fiscalyear'] = \
fiscalyear_obj.search(self.cr, self.uid, [( fiscalyear_obj.search(self.cr, self.uid,
'date_stop', '<', fiscalyear.date_start)], order='date_stop')[-1] or [] [('date_stop', '<',
ctx_init['periods'] = period_obj.search(self.cr, self.uid, [( fiscalyear.date_start)],
'fiscalyear_id', '=', ctx_init['fiscalyear']), ('date_stop', '<', fiscalyear.date_start)]) order='date_stop')\
and fiscalyear_obj.search(self.cr, self.uid,
[('date_stop', '<',
fiscalyear.date_start)],
order='date_stop')[-1] or []
ctx_init['periods'] = period_obj.search(
self.cr, self.uid,
[('fiscalyear_id', '=', ctx_init['fiscalyear']),
('date_stop', '<', fiscalyear.date_start)])
return ctx_init return ctx_init
####################################################################### #######################################################################
# CONTEXT FOR INITIAL BALANCE # # CONTEXT FOR INITIAL BALANCE #
@ -456,22 +510,30 @@ class account_balance(report_sxw.rml_parse):
ctx_init['periods'] = form['periods'] ctx_init['periods'] = form['periods']
if not ctx_init['periods']: if not ctx_init['periods']:
ctx_init = missing_period(ctx_init.copy()) ctx_init = missing_period(ctx_init.copy())
date_start = min([period.date_start for period in period_obj.browse( date_start = min([period.date_start for period in period_obj.
self.cr, self.uid, ctx_init['periods'])]) browse(self.cr, self.uid,
ctx_init['periods'] = period_obj.search(self.cr, self.uid, [( ctx_init['periods'])])
'fiscalyear_id', '=', fiscalyear.id), ('date_stop', '<=', date_start)]) ctx_init['periods'] = period_obj.search(
self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
('date_stop', '<=', date_start)])
elif form['filter'] in ['bydate']: elif form['filter'] in ['bydate']:
ctx_init['date_from'] = fiscalyear.date_start ctx_init['date_from'] = fiscalyear.date_start
ctx_init['date_to'] = form['date_from'] ctx_init['date_to'] = form['date_from']
ctx_init['periods'] = period_obj.search(self.cr, self.uid, [( ctx_init['periods'] = period_obj.search(
'fiscalyear_id', '=', fiscalyear.id), ('date_stop', '<=', ctx_init['date_to'])]) self.cr, self.uid,
[('fiscalyear_id', '=', fiscalyear.id),
('date_stop', '<=', ctx_init['date_to'])])
elif form['filter'] == 'none': elif form['filter'] == 'none':
ctx_init['periods'] = period_obj.search(self.cr, self.uid, [( ctx_init['periods'] = period_obj.search(
'fiscalyear_id', '=', fiscalyear.id), ('special', '=', True)]) self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
date_start = min([period.date_start for period in period_obj.browse( ('special', '=', True)])
self.cr, self.uid, ctx_init['periods'])]) date_start = min([period.date_start for period in period_obj.
ctx_init['periods'] = period_obj.search(self.cr, self.uid, [( browse(self.cr, self.uid,
'fiscalyear_id', '=', fiscalyear.id), ('date_start', '<=', date_start), ('special', '=', True)]) ctx_init['periods'])])
ctx_init['periods'] = period_obj.search(
self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
('date_start', '<=', date_start),
('special', '=', True)])
return ctx_init.copy() return ctx_init.copy()
@ -480,24 +542,35 @@ class account_balance(report_sxw.rml_parse):
self.context['state'] = form['target_move'] or 'posted' self.context['state'] = form['target_move'] or 'posted'
self.from_currency_id = self.get_company_currency(form['company_id'] and type(form[ self.from_currency_id = self.\
'company_id']) in (list, tuple) and form['company_id'][0] or form['company_id']) get_company_currency(form['company_id']
and type(form['company_id']) in (list, tuple)
and form['company_id'][0]
or form['company_id'])
if not form['currency_id']: if not form['currency_id']:
self.to_currency_id = self.from_currency_id self.to_currency_id = self.from_currency_id
else: else:
self.to_currency_id = form['currency_id'] and type(form['currency_id']) in ( self.to_currency_id = form['currency_id']\
list, tuple) and form['currency_id'][0] or form['currency_id'] and type(form['currency_id']) in (list, tuple)\
and form['currency_id'][0]\
or form['currency_id']
if 'account_list' in form and form['account_list']: if 'account_list' in form and form['account_list']:
account_ids = form['account_list'] account_ids = form['account_list']
account_list = form['account_list'] account_list = form['account_list']
del form['account_list'] del form['account_list']
credit_account_ids = self.get_company_accounts(form['company_id'] and type(form[ credit_account_ids = self.\
'company_id']) in (list, tuple) and form['company_id'][0] or form['company_id'], 'credit') get_company_accounts(form['company_id']
and type(form['company_id']) in (list, tuple)
and form['company_id'][0]
or form['company_id'], 'credit')
debit_account_ids = self.get_company_accounts(form['company_id'] and type(form[ debit_account_ids = self.\
'company_id']) in (list, tuple) and form['company_id'][0] or form['company_id'], 'debit') get_company_accounts(form['company_id']
and type(form['company_id']) in (list, tuple)
and form['company_id'][0]
or form['company_id'], 'debit')
if form.get('fiscalyear'): if form.get('fiscalyear'):
if type(form.get('fiscalyear')) in (list, tuple): if type(form.get('fiscalyear')) in (list, tuple):
@ -512,14 +585,19 @@ class account_balance(report_sxw.rml_parse):
all_account_ids = _get_children_and_consol( all_account_ids = _get_children_and_consol(
self.cr, self.uid, account_ids, 100, self.context) self.cr, self.uid, account_ids, 100, self.context)
account_ids = _get_children_and_consol(self.cr, self.uid, account_ids, form[ account_ids = _get_children_and_consol(
'display_account_level'] and form['display_account_level'] or 100, self.context) self.cr, self.uid, account_ids,
form['display_account_level']
and form['display_account_level']
or 100, self.context)
credit_account_ids = _get_children_and_consol( credit_account_ids = _get_children_and_consol(
self.cr, self.uid, credit_account_ids, 100, self.context, change_sign=True) self.cr, self.uid, credit_account_ids, 100, self.context,
change_sign=True)
debit_account_ids = _get_children_and_consol( debit_account_ids = _get_children_and_consol(
self.cr, self.uid, debit_account_ids, 100, self.context, change_sign=True) self.cr, self.uid, debit_account_ids, 100, self.context,
change_sign=True)
credit_account_ids = list(set( credit_account_ids = list(set(
credit_account_ids) - set(debit_account_ids)) credit_account_ids) - set(debit_account_ids))
@ -530,15 +608,19 @@ class account_balance(report_sxw.rml_parse):
tot_check = False tot_check = False
if not form['periods']: if not form['periods']:
form['periods'] = period_obj.search(self.cr, self.uid, [( form['periods'] = period_obj.search(
'fiscalyear_id', '=', fiscalyear.id), ('special', '=', False)], order='date_start asc') self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
('special', '=', False)],
order='date_start asc')
if not form['periods']: if not form['periods']:
raise osv.except_osv(_('UserError'), _( raise osv.except_osv(_('UserError'), _(
'The Selected Fiscal Year Does not have Regular Periods')) 'The Selected Fiscal Year Does not have Regular Periods'))
if form['columns'] == 'qtr': if form['columns'] == 'qtr':
period_ids = period_obj.search(self.cr, self.uid, [( period_ids = period_obj.search(
'fiscalyear_id', '=', fiscalyear.id), ('special', '=', False)], order='date_start asc') self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
('special', '=', False)],
order='date_start asc')
a = 0 a = 0
l = [] l = []
p = [] p = []
@ -557,8 +639,10 @@ class account_balance(report_sxw.rml_parse):
tot_bal4 = 0.0 tot_bal4 = 0.0
tot_bal5 = 0.0 tot_bal5 = 0.0
elif form['columns'] == 'thirteen': elif form['columns'] == 'thirteen':
period_ids = period_obj.search(self.cr, self.uid, [( period_ids = period_obj.search(
'fiscalyear_id', '=', fiscalyear.id), ('special', '=', False)], order='date_start asc') self.cr, self.uid, [('fiscalyear_id', '=', fiscalyear.id),
('special', '=', False)],
order='date_start asc')
tot_bal1 = 0.0 tot_bal1 = 0.0
tot_bal1 = 0.0 tot_bal1 = 0.0
tot_bal2 = 0.0 tot_bal2 = 0.0
@ -590,19 +674,21 @@ class account_balance(report_sxw.rml_parse):
# without repeating operations. # without repeating operations.
############################################################### ###############################################################
account_black_ids = account_obj.search(self.cr, self.uid, ( account_black_ids = account_obj.search(
self.cr, self.uid, (
[('id', 'in', [i[0] for i in all_account_ids]), [('id', 'in', [i[0] for i in all_account_ids]),
('type', 'not in', ('type', 'not in', ('view', 'consolidation'))]))
('view', 'consolidation'))]))
account_not_black_ids = account_obj.search(self.cr, self.uid, ([('id', 'in', [ account_not_black_ids = account_obj.search(
i[0] for i in all_account_ids]), ('type', '=', 'view')])) self.cr, self.uid, ([('id', 'in', [i[0] for i in all_account_ids]),
('type', '=', 'view')]))
acc_cons_ids = account_obj.search(self.cr, self.uid, ([('id', 'in', [ acc_cons_ids = account_obj.search(
i[0] for i in all_account_ids]), ('type', 'in', ('consolidation',))])) self.cr, self.uid, ([('id', 'in', [i[0] for i in all_account_ids]),
('type', 'in', ('consolidation',))]))
account_consol_ids = acc_cons_ids and account_obj._get_children_and_consol( account_consol_ids = acc_cons_ids and account_obj.\
self.cr, self.uid, acc_cons_ids) or [] _get_children_and_consol(self.cr, self.uid, acc_cons_ids) or []
account_black_ids += account_obj.search(self.cr, self.uid, ( account_black_ids += account_obj.search(self.cr, self.uid, (
[('id', 'in', account_consol_ids), [('id', 'in', account_consol_ids),
@ -612,8 +698,7 @@ class account_balance(report_sxw.rml_parse):
account_black_ids = list(set(account_black_ids)) account_black_ids = list(set(account_black_ids))
c_account_not_black_ids = account_obj.search(self.cr, self.uid, ([ c_account_not_black_ids = account_obj.search(self.cr, self.uid, ([
('id', 'in', ('id', 'in', account_consol_ids),
account_consol_ids),
('type', '=', 'view')])) ('type', '=', 'view')]))
delete_cons = False delete_cons = False
if c_account_not_black_ids: if c_account_not_black_ids:
@ -684,7 +769,7 @@ class account_balance(report_sxw.rml_parse):
account_black_init = account_obj.browse( account_black_init = account_obj.browse(
self.cr, self.uid, account_black_ids, ctx_i) self.cr, self.uid, account_black_ids, ctx_i)
#~ Black # ~ Black
dict_black = {} dict_black = {}
for i in account_black: for i in account_black:
d = i.debit d = i.debit
@ -704,7 +789,7 @@ class account_balance(report_sxw.rml_parse):
for i in account_black_init: for i in account_black_init:
dict_black.get(i.id)['balanceinit'] = i.balance dict_black.get(i.id)['balanceinit'] = i.balance
#~ Not black # ~ Not black
dict_not_black = {} dict_not_black = {}
for i in account_not_black: for i in account_not_black:
dict_not_black[i.id] = { dict_not_black[i.id] = {
@ -716,7 +801,8 @@ class account_balance(report_sxw.rml_parse):
) # It makes a copy because they modify ) # It makes a copy because they modify
for acc_id in account_not_black_ids: for acc_id in account_not_black_ids:
acc_childs = dict_not_black.get(acc_id).get('obj').type == 'view' \ acc_childs = dict_not_black.get(acc_id).get('obj').\
type == 'view' \
and dict_not_black.get(acc_id).get('obj').child_id \ and dict_not_black.get(acc_id).get('obj').child_id \
or dict_not_black.get(acc_id).get('obj').child_consol_ids or dict_not_black.get(acc_id).get('obj').child_consol_ids
for child_id in acc_childs: for child_id in acc_childs:
@ -729,8 +815,8 @@ class account_balance(report_sxw.rml_parse):
dict_not_black.get(acc_id)['balance'] += all_account.get( dict_not_black.get(acc_id)['balance'] += all_account.get(
child_id.id).get('balance') child_id.id).get('balance')
if form['inf_type'] == 'BS': if form['inf_type'] == 'BS':
dict_not_black.get(acc_id)['balanceinit'] += all_account.get( dict_not_black.get(acc_id)['balanceinit'] +=\
child_id.id).get('balanceinit') all_account.get(child_id.id).get('balanceinit')
all_account[acc_id] = dict_not_black[acc_id] all_account[acc_id] = dict_not_black[acc_id]
if p_act == limit - 1: if p_act == limit - 1:
@ -753,17 +839,21 @@ class account_balance(report_sxw.rml_parse):
# #
# Check if we need to include this level # Check if we need to include this level
# #
if not form['display_account_level'] or aa_id[3].level <= form['display_account_level']: if not form['display_account_level']\
or aa_id[3].level <= form['display_account_level']:
res = { res = {
'id': id, 'id': id,
'type': aa_id[3].type, 'type': aa_id[3].type,
'code': aa_id[3].code, 'code': aa_id[3].code,
'name': (aa_id[2] and not aa_id[1]) and 'TOTAL %s' % (aa_id[3].name.upper()) or aa_id[3].name, 'name': (aa_id[2] and not aa_id[1])
and 'TOTAL %s' % (aa_id[3].name.upper())
or aa_id[3].name,
'parent_id': aa_id[3].parent_id and aa_id[3].parent_id.id, 'parent_id': aa_id[3].parent_id and aa_id[3].parent_id.id,
'level': aa_id[3].level, 'level': aa_id[3].level,
'label': aa_id[1], 'label': aa_id[1],
'total': aa_id[2], 'total': aa_id[2],
'change_sign': credit_account_ids and (id in credit_account_ids and -1 or 1) or 1 'change_sign': credit_account_ids
and (id in credit_account_ids and -1 or 1) or 1
} }
if form['columns'] == 'qtr': if form['columns'] == 'qtr':
@ -771,7 +861,12 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period.get(pn - 1).get(id).get('debit', 0.0), all_account_period.get(pn - 1).get(id).get('credit', 0.0), all_account_period.get(pn - 1).get(id).get('balance', 0.0)]) all_account_period.get(pn - 1).
get(id).get('debit', 0.0),
all_account_period.get(pn - 1).
get(id).get('credit', 0.0),
all_account_period.get(pn - 1).
get(id).get('balance', 0.0)])
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
'cdr%s' % pn: self.exchange(c), 'cdr%s' % pn: self.exchange(c),
@ -779,7 +874,12 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period.get(pn - 1).get(id).get('balanceinit', 0.0), all_account_period.get(pn - 1).get(id).get('debit', 0.0), all_account_period.get(pn - 1).get(id).get('credit', 0.0)]) all_account_period.get(pn - 1).
get(id).get('balanceinit', 0.0),
all_account_period.get(pn - 1).
get(id).get('debit', 0.0),
all_account_period.get(pn - 1).
get(id).get('credit', 0.0)])
b = z(i + d - c) b = z(i + d - c)
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
@ -789,7 +889,12 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0), all_account_period.get('all').get(id).get('balance')]) all_account_period.get('all').get(id).
get('debit', 0.0),
all_account_period.get('all').get(id).
get('credit', 0.0),
all_account_period.get('all').get(id).
get('balance')])
res.update({ res.update({
'dbr5': self.exchange(d), 'dbr5': self.exchange(d),
'cdr5': self.exchange(c), 'cdr5': self.exchange(c),
@ -797,7 +902,12 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0)]) all_account_period.get('all').get(id).
get('balanceinit', 0.0),
all_account_period.get('all').get(id).
get('debit', 0.0),
all_account_period.get('all').get(id).
get('credit', 0.0)])
b = z(i + d - c) b = z(i + d - c)
res.update({ res.update({
'dbr5': self.exchange(d), 'dbr5': self.exchange(d),
@ -811,7 +921,12 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period.get(p_num).get(id).get('debit', 0.0), all_account_period.get(p_num).get(id).get('credit', 0.0), all_account_period.get(p_num).get(id).get('balance', 0.0)]) all_account_period.get(p_num).
get(id).get('debit', 0.0),
all_account_period.get(p_num).
get(id).get('credit', 0.0),
all_account_period.get(p_num).
get(id).get('balance', 0.0)])
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
'cdr%s' % pn: self.exchange(c), 'cdr%s' % pn: self.exchange(c),
@ -819,7 +934,12 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period.get(p_num).get(id).get('balanceinit', 0.0), all_account_period.get(p_num).get(id).get('debit', 0.0), all_account_period.get(p_num).get(id).get('credit', 0.0)]) all_account_period.get(p_num).
get(id).get('balanceinit', 0.0),
all_account_period.get(p_num).
get(id).get('debit', 0.0),
all_account_period.get(p_num).
get(id).get('credit', 0.0)])
b = z(i + d - c) b = z(i + d - c)
res.update({ res.update({
'dbr%s' % pn: self.exchange(d), 'dbr%s' % pn: self.exchange(d),
@ -831,7 +951,12 @@ class account_balance(report_sxw.rml_parse):
if form['inf_type'] == 'IS': if form['inf_type'] == 'IS':
d, c, b = map(z, [ d, c, b = map(z, [
all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0), all_account_period.get('all').get(id).get('balance', 0.0)]) all_account_period.get('all').get(id).
get('debit', 0.0),
all_account_period.get('all').get(id).
get('credit', 0.0),
all_account_period.get('all').get(id).
get('balance', 0.0)])
res.update({ res.update({
'dbr13': self.exchange(d), 'dbr13': self.exchange(d),
'cdr13': self.exchange(c), 'cdr13': self.exchange(c),
@ -839,7 +964,12 @@ class account_balance(report_sxw.rml_parse):
}) })
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0)]) all_account_period.get('all').get(id).
get('balanceinit', 0.0),
all_account_period.get('all').get(id).
get('debit', 0.0),
all_account_period.get('all').get(id).
get('credit', 0.0)])
b = z(i + d - c) b = z(i + d - c)
res.update({ res.update({
'dbr13': self.exchange(d), 'dbr13': self.exchange(d),
@ -849,7 +979,12 @@ class account_balance(report_sxw.rml_parse):
else: else:
i, d, c = map(z, [ i, d, c = map(z, [
all_account_period.get('all').get(id).get('balanceinit', 0.0), all_account_period.get('all').get(id).get('debit', 0.0), all_account_period.get('all').get(id).get('credit', 0.0)]) all_account_period.get('all').get(id).
get('balanceinit', 0.0),
all_account_period.get('all').get(id).
get('debit', 0.0),
all_account_period.get('all').get(id).
get('credit', 0.0)])
b = z(i + d - c) b = z(i + d - c)
res.update({ res.update({
'balanceinit': self.exchange(i), 'balanceinit': self.exchange(i),
@ -884,7 +1019,8 @@ class account_balance(report_sxw.rml_parse):
if any(to_test): if any(to_test):
to_include = True to_include = True
elif form['display_account'] == 'bal' and aa_id[3].parent_id: elif form['display_account'] == 'bal' and aa_id[3].\
parent_id:
# Include accounts with balance # Include accounts with balance
for x in range(pn - 1): for x in range(pn - 1):
to_test.append(res.get( to_test.append(res.get(
@ -892,7 +1028,8 @@ class account_balance(report_sxw.rml_parse):
if any(to_test): if any(to_test):
to_include = True to_include = True
elif form['display_account'] == 'bal_mov' and aa_id[3].parent_id: elif form['display_account'] == 'bal_mov' and aa_id[3].\
parent_id:
# Include accounts with balance or movements # Include accounts with balance or movements
for x in range(pn - 1): for x in range(pn - 1):
to_test.append(res.get( to_test.append(res.get(
@ -913,24 +1050,40 @@ class account_balance(report_sxw.rml_parse):
# Include accounts with movements # Include accounts with movements
if abs(d) >= 0.005 or abs(c) >= 0.005: if abs(d) >= 0.005 or abs(c) >= 0.005:
to_include = True to_include = True
elif form['display_account'] == 'bal' and aa_id[3].parent_id: elif form['display_account'] == 'bal' and aa_id[3].\
parent_id:
# Include accounts with balance # Include accounts with balance
if abs(b) >= 0.005: if abs(b) >= 0.005:
to_include = True to_include = True
elif form['display_account'] == 'bal_mov' and aa_id[3].parent_id: elif form['display_account'] == 'bal_mov' and aa_id[3].\
parent_id:
# Include accounts with balance or movements # Include accounts with balance or movements
if abs(b) >= 0.005 or abs(d) >= 0.005 or abs(c) >= 0.005: if abs(b) >= 0.005\
or abs(d) >= 0.005\
or abs(c) >= 0.005:
to_include = True to_include = True
else: else:
# Include all accounts # Include all accounts
to_include = True to_include = True
#~ ANALYTIC LEDGER # ~ ANALYTIC LEDGER
if to_include and form['analytic_ledger'] and form['columns'] == 'four' and form['inf_type'] == 'BS' and res['type'] in ('other', 'liquidity', 'receivable', 'payable'): if to_include and form['analytic_ledger']\
and form['columns'] == 'four'\
and form['inf_type'] == 'BS'\
and res['type'] in ('other', 'liquidity',
'receivable', 'payable'):
res['mayor'] = self._get_analytic_ledger(res, ctx=ctx_end) res['mayor'] = self._get_analytic_ledger(res, ctx=ctx_end)
elif to_include and form['journal_ledger'] and form['columns'] == 'four' and form['inf_type'] == 'BS' and res['type'] in ('other', 'liquidity', 'receivable', 'payable'): elif to_include and form['journal_ledger']\
and form['columns'] == 'four'\
and form['inf_type'] == 'BS'\
and res['type'] in ('other', 'liquidity',
'receivable', 'payable'):
res['journal'] = self._get_journal_ledger(res, ctx=ctx_end) res['journal'] = self._get_journal_ledger(res, ctx=ctx_end)
elif to_include and form['partner_balance'] and form['columns'] == 'four' and form['inf_type'] == 'BS' and res['type'] in ('other', 'liquidity', 'receivable', 'payable'): elif to_include and form['partner_balance']\
and form['columns'] == 'four'\
and form['inf_type'] == 'BS'\
and res['type'] in ('other', 'liquidity',
'receivable', 'payable'):
res['partner'] = self._get_partner_balance( res['partner'] = self._get_partner_balance(
res, ctx_i['periods'], ctx=ctx_end) res, ctx_i['periods'], ctx=ctx_end)
else: else:
@ -939,9 +1092,11 @@ class account_balance(report_sxw.rml_parse):
if to_include: if to_include:
result_acc.append(res) result_acc.append(res)
# #
# Check whether we must sumarize this line in the report or not # Check whether we must sumarize this line in the report
# or not
# #
if form['tot_check'] and (res['id'] in account_list) and (res['id'] not in tot): if form['tot_check'] and (res['id'] in account_list)\
and (res['id'] not in tot):
if form['columns'] == 'qtr': if form['columns'] == 'qtr':
tot_check = True tot_check = True
tot[res['id']] = True tot[res['id']] = True
@ -1019,55 +1174,64 @@ class account_balance(report_sxw.rml_parse):
result_acc.append(res2) result_acc.append(res2)
return result_acc return result_acc
report_sxw.report_sxw('report.afr.1cols', report_sxw.report_sxw(
'report.afr.1cols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full.rml', 'account_financial_report/report/balance_full.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.2cols', report_sxw.report_sxw(
'report.afr.2cols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_2_cols.rml', 'account_financial_report/report/balance_full_2_cols.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.4cols', report_sxw.report_sxw(
'report.afr.4cols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_4_cols.rml', 'account_financial_report/report/balance_full_4_cols.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.analytic.ledger', report_sxw.report_sxw(
'report.afr.analytic.ledger',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_4_cols_analytic_ledger.rml', 'account_financial_report/report/balance_full_4_cols_analytic_ledger.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.partner.balance', report_sxw.report_sxw(
'report.afr.partner.balance',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_4_cols_partner_balance.rml', 'account_financial_report/report/balance_full_4_cols_partner_balance.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.journal.ledger', report_sxw.report_sxw(
'report.afr.journal.ledger',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_4_cols_journal_ledger.rml', 'account_financial_report/report/balance_full_4_cols_journal_ledger.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.5cols', report_sxw.report_sxw(
'report.afr.5cols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_5_cols.rml', 'account_financial_report/report/balance_full_5_cols.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.qtrcols', report_sxw.report_sxw(
'report.afr.qtrcols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_qtr_cols.rml', 'account_financial_report/report/balance_full_qtr_cols.rml',
parser=account_balance, parser=account_balance,
header=False) header=False)
report_sxw.report_sxw('report.afr.13cols', report_sxw.report_sxw(
'report.afr.13cols',
'wizard.report', 'wizard.report',
'account_financial_report/report/balance_full_13_cols.rml', 'account_financial_report/report/balance_full_13_cols.rml',
parser=account_balance, parser=account_balance,

2
account_financial_report/wizard/__init__.py
View File

@ -25,4 +25,4 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
import wizard from . import wizard

187
account_financial_report/wizard/wizard.py
View File

@ -26,43 +26,94 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
from osv import osv, fields from openerp.osv import osv, fields
import pooler
import time import time
from tools.translate import _ from openerp.tools.translate import _
class wizard_report(osv.osv_memory): class wizard_report(osv.osv_memory):
_name = "wizard.report" _name = "wizard.report"
_columns = { _columns = {
'afr_id': fields.many2one('afr', 'Custom Report', help='If you have already set a Custom Report, Select it Here.'), 'afr_id': fields.many2one(
'afr', 'Custom Report',
help='If you have already set a Custom Report, Select it Here.'),
'company_id': fields.many2one('res.company', 'Company', required=True), 'company_id': fields.many2one('res.company', 'Company', required=True),
'currency_id': fields.many2one('res.currency', 'Currency', help="Currency at which this report will be expressed. If not selected will be used the one set in the company"), 'currency_id': fields.many2one('res.currency', 'Currency',
'inf_type': fields.selection([('BS', 'Balance Sheet'), ('IS', 'Income Statement')], 'Type', required=True), help="Currency at which this report\
'columns': fields.selection([('one', 'End. Balance'), ('two', 'Debit | Credit'), ('four', 'Initial | Debit | Credit | YTD'), ('five', 'Initial | Debit | Credit | Period | YTD'), ('qtr', "4 QTR's | YTD"), ('thirteen', '12 Months | YTD')], 'Columns', required=True), will be expressed. If not selected will\
'display_account': fields.selection([('all', 'All Accounts'), ('bal', 'With Balance'), ('mov', 'With movements'), ('bal_mov', 'With Balance / Movements')], 'Display accounts'), be used the one set in the company"),
'display_account_level': fields.integer('Up to level', help='Display accounts up to this level (0 to show all)'), 'inf_type': fields.selection([('BS', 'Balance Sheet'),
('IS', 'Income Statement')],
'Type',
required=True),
'columns': fields.selection(
[('one', 'End. Balance'),
('two', 'Debit | Credit'),
('four', 'Initial | Debit | Credit | YTD'),
('five', 'Initial | Debit | Credit | Period | YTD'),
('qtr', "4 QTR's | YTD"), ('thirteen', '12 Months | YTD')],
'Columns', required=True),
'display_account': fields.selection(
[('all', 'All Accounts'),
('bal', 'With Balance'),
('mov', 'With movements'),
('bal_mov', 'With Balance / Movements')],
'Display accounts'),
'display_account_level': fields.integer(
'Up to level',
help='Display accounts up to this level (0 to show all)'),
'account_list': fields.many2many('account.account', 'rel_wizard_account', 'account_list', 'account_id', 'Root accounts', required=True), 'account_list': fields.many2many('account.account',
'rel_wizard_account',
'account_list',
'account_id',
'Root accounts',
required=True),
'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year', help='Fiscal Year for this report', required=True), 'fiscalyear': fields.many2one('account.fiscalyear', 'Fiscal year',
'periods': fields.many2many('account.period', 'rel_wizard_period', 'wizard_id', 'period_id', 'Periods', help='All periods in the fiscal year if empty'), help='Fiscal Year for this report',
required=True),
'periods': fields.many2many(
'account.period', 'rel_wizard_period',
'wizard_id', 'period_id', 'Periods',
help='All periods in the fiscal year if empty'),
'analytic_ledger': fields.boolean('Analytic Ledger', help="Allows to Generate an Analytic Ledger for accounts with moves. Available when Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), 'analytic_ledger': fields.boolean(
'journal_ledger': fields.boolean('Journal Ledger', help="Allows to Generate an Journal Ledger for accounts with moves. Available when Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), 'Analytic Ledger',
'partner_balance': fields.boolean('Partner Balance', help="Allows to " help="Allows to Generate an Analytic Ledger for accounts with\
"Generate a Partner Balance for accounts with moves. Available when " moves. Available when Balance Sheet and 'Initial | Debit | Credit\
"Balance Sheet and 'Initial | Debit | Credit | YTD' are selected"), | YTD' are selected"),
'tot_check': fields.boolean('Summarize?', help='Checking will add a new line at the end of the Report which will Summarize Columns in Report'), 'journal_ledger': fields.boolean(
'lab_str': fields.char('Description', help='Description for the Summary', size=128), 'Journal Ledger',
help="Allows to Generate an Journal Ledger for accounts with\
moves. Available when Balance Sheet and 'Initial | Debit | Credit\
| YTD' are selected"),
'partner_balance': fields.boolean(
'Partner Balance',
help="Allows to Generate a Partner Balance for accounts with\
moves. Available when Balance Sheet and 'Initial | Debit | Credit\
| YTD' are selected"),
'tot_check': fields.boolean('Summarize?',
help='Checking will add a new line at the\
end of the Report which will Summarize\
Columns in Report'),
'lab_str': fields.char('Description',
help='Description for the Summary', size=128),
'target_move': fields.selection([('posted', 'All Posted Entries'), 'target_move': fields.selection(
[('posted', 'All Posted Entries'),
('all', 'All Entries'), ('all', 'All Entries'),
], 'Entries to Include', required=True, ], 'Entries to Include',
help='Print All Accounting Entries or just Posted Accounting Entries'), required=True,
#~ Deprecated fields help='Print All Accounting Entries or just Posted Accounting\
'filter': fields.selection([('bydate', 'By Date'), ('byperiod', 'By Period'), ('all', 'By Date and Period'), ('none', 'No Filter')], 'Date/Period Filter'), Entries'),
# ~ Deprecated fields
'filter': fields.selection([('bydate', 'By Date'),
('byperiod', 'By Period'),
('all', 'By Date and Period'),
('none', 'No Filter')],
'Date/Period Filter'),
'date_to': fields.date('End date'), 'date_to': fields.date('End date'),
'date_from': fields.date('Start date'), 'date_from': fields.date('Start date'),
} }
@ -73,8 +124,10 @@ class wizard_report(osv.osv_memory):
'filter': lambda *a: 'byperiod', 'filter': lambda *a: 'byperiod',
'display_account_level': lambda *a: 0, 'display_account_level': lambda *a: 0,
'inf_type': lambda *a: 'BS', 'inf_type': lambda *a: 'BS',
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c), 'company_id': lambda self, cr, uid, c: self.pool['res.company'].
'fiscalyear': lambda self, cr, uid, c: self.pool.get('account.fiscalyear').find(cr, uid), _company_default_get(cr, uid, 'account.invoice', context=c),
'fiscalyear': lambda self, cr, uid, c: self.
pool['account.fiscalyear'].find(cr, uid),
'display_account': lambda *a: 'bal_mov', 'display_account': lambda *a: 'bal_mov',
'columns': lambda *a: 'five', 'columns': lambda *a: 'five',
'target_move': 'posted', 'target_move': 'posted',
@ -90,14 +143,16 @@ class wizard_report(osv.osv_memory):
return res return res
def onchange_columns(self, cr, uid, ids, columns, fiscalyear, periods, context=None): def onchange_columns(self, cr, uid, ids, columns, fiscalyear, periods,
context=None):
if context is None: if context is None:
context = {} context = {}
res = {'value': {}} res = {'value': {}}
p_obj = self.pool.get("account.period") p_obj = self.pool.get("account.period")
all_periods = p_obj.search(cr, uid, [('fiscalyear_id', '=', fiscalyear), ( all_periods = p_obj.search(cr, uid,
'special', '=', False)], context=context) [('fiscalyear_id', '=', fiscalyear),
('special', '=', False)], context=context)
s = set(periods[0][2]) s = set(periods[0][2])
t = set(all_periods) t = set(all_periods)
go = periods[0][2] and s.issubset(t) or False go = periods[0][2] and s.issubset(t) or False
@ -114,7 +169,8 @@ class wizard_report(osv.osv_memory):
res['value'].update({'periods': []}) res['value'].update({'periods': []})
return res return res
def onchange_analytic_ledger(self, cr, uid, ids, company_id, analytic_ledger, context=None): def onchange_analytic_ledger(self, cr, uid, ids, company_id,
analytic_ledger, context=None):
if context is None: if context is None:
context = {} context = {}
context['company_id'] = company_id context['company_id'] = company_id
@ -152,20 +208,26 @@ class wizard_report(osv.osv_memory):
return res return res
afr_brw = self.pool.get('afr').browse(cr, uid, afr_id, context=context) afr_brw = self.pool.get('afr').browse(cr, uid, afr_id, context=context)
res['value'].update({ res['value'].update({
'currency_id': afr_brw.currency_id and afr_brw.currency_id.id or afr_brw.company_id.currency_id.id}) 'currency_id': afr_brw.currency_id
and afr_brw.currency_id.id
or afr_brw.company_id.currency_id.id})
res['value'].update({'inf_type': afr_brw.inf_type or 'BS'}) res['value'].update({'inf_type': afr_brw.inf_type or 'BS'})
res['value'].update({'columns': afr_brw.columns or 'five'}) res['value'].update({'columns': afr_brw.columns or 'five'})
res['value'].update({ res['value'].update({
'display_account': afr_brw.display_account or 'bal_mov'}) 'display_account': afr_brw.display_account
or 'bal_mov'})
res['value'].update({ res['value'].update({
'display_account_level': afr_brw.display_account_level or 0}) 'display_account_level': afr_brw.
display_account_level or 0})
res['value'].update({ res['value'].update({
'fiscalyear': afr_brw.fiscalyear_id and afr_brw.fiscalyear_id.id}) 'fiscalyear': afr_brw.fiscalyear_id
and afr_brw.fiscalyear_id.id})
res['value'].update({'account_list': [ res['value'].update({'account_list': [
acc.id for acc in afr_brw.account_ids]}) acc.id for acc in afr_brw.account_ids]})
res['value'].update({'periods': [p.id for p in afr_brw.period_ids]}) res['value'].update({'periods': [p.id for p in afr_brw.period_ids]})
res['value'].update({ res['value'].update({
'analytic_ledger': afr_brw.analytic_ledger or False}) 'analytic_ledger':
afr_brw.analytic_ledger or False})
res['value'].update({'tot_check': afr_brw.tot_check or False}) res['value'].update({'tot_check': afr_brw.tot_check or False})
res['value'].update({'lab_str': afr_brw.lab_str or _( res['value'].update({'lab_str': afr_brw.lab_str or _(
'Write a Description for your Summary Total')}) 'Write a Description for your Summary Total')})
@ -174,15 +236,14 @@ class wizard_report(osv.osv_memory):
def _get_defaults(self, cr, uid, data, context=None): def _get_defaults(self, cr, uid, data, context=None):
if context is None: if context is None:
context = {} context = {}
user = pooler.get_pool(cr.dbname).get( user = self.pool['res.users'].browse(cr, uid, uid, context=context)
'res.users').browse(cr, uid, uid, context=context)
if user.company_id: if user.company_id:
company_id = user.company_id.id company_id = user.company_id.id
else: else:
company_id = pooler.get_pool(cr.dbname).get( company_id = self.pool['res.company'].search(
'res.company').search(cr, uid, [('parent_id', '=', False)])[0] cr, uid, [('parent_id', '=', False)])[0]
data['form']['company_id'] = company_id data['form']['company_id'] = company_id
fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear') fiscalyear_obj = self.pool['account.fiscalyear']
data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid) data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
data['form']['context'] = context data['form']['context'] = context
return data['form'] return data['form']
@ -209,9 +270,12 @@ class wizard_report(osv.osv_memory):
res = cr.dictfetchall() res = cr.dictfetchall()
if res: if res:
if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_from'] < res[0]['date_start']): if (data['form']['date_to'] > res[0]['date_stop']
raise osv.except_osv(_('UserError'), 'Las fechas deben estar entre %s y %s' % ( or data['form']['date_from'] < res[0]['date_start']):
res[0]['date_start'], res[0]['date_stop'])) raise osv.except_osv(_('UserError'),
'Las fechas deben estar entre %s y %s'
% (res[0]['date_start'],
res[0]['date_stop']))
else: else:
return 'report' return 'report'
else: else:
@ -223,14 +287,20 @@ class wizard_report(osv.osv_memory):
ap_obj = self.pool.get('account.period') ap_obj = self.pool.get('account.period')
fy_id = fy_id and type(fy_id) in (list, tuple) and fy_id[0] or fy_id fy_id = fy_id and type(fy_id) in (list, tuple) and fy_id[0] or fy_id
if not ids: if not ids:
#~ No hay periodos # ~ No hay periodos
return ap_obj.search(cr, uid, [('fiscalyear_id', '=', fy_id), ('special', '=', False)], order='date_start asc') return ap_obj.search(cr, uid, [('fiscalyear_id', '=', fy_id),
('special', '=', False)],
order='date_start asc')
ap_brws = ap_obj.browse(cr, uid, ids, context=context) ap_brws = ap_obj.browse(cr, uid, ids, context=context)
date_start = min([period.date_start for period in ap_brws]) date_start = min([period.date_start for period in ap_brws])
date_stop = max([period.date_stop for period in ap_brws]) date_stop = max([period.date_stop for period in ap_brws])
return ap_obj.search(cr, uid, [('fiscalyear_id', '=', fy_id), ('special', '=', False), ('date_start', '>=', date_start), ('date_stop', '<=', date_stop)], order='date_start asc') return ap_obj.search(cr, uid, [('fiscalyear_id', '=', fy_id),
('special', '=', False),
('date_start', '>=', date_start),
('date_stop', '<=', date_stop)],
order='date_start asc')
def print_report(self, cr, uid, ids, data, context=None): def print_report(self, cr, uid, ids, data, context=None):
if context is None: if context is None:
@ -245,8 +315,10 @@ class wizard_report(osv.osv_memory):
del data['form']['date_from'] del data['form']['date_from']
del data['form']['date_to'] del data['form']['date_to']
data['form']['periods'] = self.period_span(cr, uid, data[ data['form']['periods'] = self.period_span(
'form']['periods'], data['form']['fiscalyear']) cr, uid,
data['form']['periods'],
data['form']['fiscalyear'])
elif data['form']['filter'] == 'bydate': elif data['form']['filter'] == 'bydate':
self._check_date(cr, uid, data) self._check_date(cr, uid, data)
@ -259,13 +331,15 @@ class wizard_report(osv.osv_memory):
self._check_date(cr, uid, data) self._check_date(cr, uid, data)
lis2 = str(data['form']['periods']).replace( lis2 = str(data['form']['periods']).replace(
"[", "(").replace("]", ")") "[", "(").replace("]", ")")
sqlmm = """select min(p.date_start) as inicio, max(p.date_stop) as fin sqlmm = """select min(p.date_start) as inicio,
max(p.date_stop) as fin
from account_period p from account_period p
where p.id in %s""" % lis2 where p.id in %s""" % lis2
cr.execute(sqlmm) cr.execute(sqlmm)
minmax = cr.dictfetchall() minmax = cr.dictfetchall()
if minmax: if minmax:
if (data['form']['date_to'] < minmax[0]['inicio']) or (data['form']['date_from'] > minmax[0]['fin']): if (data['form']['date_to'] < minmax[0]['inicio'])\
or (data['form']['date_from'] > minmax[0]['fin']):
raise osv.except_osv(_('Error !'), _( raise osv.except_osv(_('Error !'), _(
'La interseccion entre el periodo y fecha es vacio')) 'La interseccion entre el periodo y fecha es vacio'))
@ -274,11 +348,14 @@ class wizard_report(osv.osv_memory):
if data['form']['columns'] == 'two': if data['form']['columns'] == 'two':
name = 'afr.2cols' name = 'afr.2cols'
if data['form']['columns'] == 'four': if data['form']['columns'] == 'four':
if data['form']['analytic_ledger'] and data['form']['inf_type'] == 'BS': if data['form']['analytic_ledger']\
and data['form']['inf_type'] == 'BS':
name = 'afr.analytic.ledger' name = 'afr.analytic.ledger'
elif data['form']['journal_ledger'] and data['form']['inf_type'] == 'BS': elif data['form']['journal_ledger']\
and data['form']['inf_type'] == 'BS':
name = 'afr.journal.ledger' name = 'afr.journal.ledger'
elif data['form']['partner_balance'] and data['form']['inf_type'] == 'BS': elif data['form']['partner_balance']\
and data['form']['inf_type'] == 'BS':
name = 'afr.partner.balance' name = 'afr.partner.balance'
else: else:
name = 'afr.4cols' name = 'afr.4cols'
@ -289,6 +366,8 @@ class wizard_report(osv.osv_memory):
if data['form']['columns'] == 'thirteen': if data['form']['columns'] == 'thirteen':
name = 'afr.13cols' name = 'afr.13cols'
return {'type': 'ir.actions.report.xml', 'report_name': name, 'datas': data} return {'type': 'ir.actions.report.xml',
'report_name': name,
'datas': data}
wizard_report() wizard_report()