pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] Account: Partner balance report with common report object (Has to be improved)

Browse Source 
bzr revid: mra@mra-laptop-20100713073545-9tqik7x3jwd1ak15
This commit is contained in:
Mustufa Rangwala
2010-07-13 13:05:45 +05:30
parent 184cdc8372
commit a17fcf0751
3 changed files with 59 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/partner_balance.py
+19 -68
View File
@@ -18,18 +18,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import pooler
import time
import re
import datetime
from report import report_sxw
class partner_balance(report_sxw.rml_parse):
import pooler
from report import report_sxw
from account_journal_common_default import account_journal_common_default
class partner_balance(report_sxw.rml_parse, account_journal_common_default):
def __init__(self, cr, uid, name, context):
super(partner_balance, self).__init__(cr, uid, name, context=context)
self.date_lst = []
self.account_ids = ''
self.account_ids = False
self.localcontext.update( {
'time': time,
'lines': self.lines,
@@ -40,17 +41,16 @@ class partner_balance(report_sxw.rml_parse):
'sum_scredit': self._sum_scredit,
'solde_debit': self._solde_balance_debit,
'solde_credit': self._solde_balance_credit,
'get_company': self._get_company,
'get_currency': self._get_currency,
'comma_me' : self.comma_me,
'get_fiscalyear': self.get_fiscalyear,
'get_fiscalyear': self._get_fiscalyear,
'get_periods':self.get_periods,
})
## Compute account list one time
#
# Date Management
#
def get_periods(self, form):
result=''
if form.has_key('periods') and form['periods']:
@@ -71,7 +71,7 @@ class partner_balance(report_sxw.rml_parse):
else:
result+=r.name+", "
return str(result and result[:-1]) or 'ALL'
def date_range(self, start, end):
if not start or not end:
return []
@@ -103,44 +103,10 @@ class partner_balance(report_sxw.rml_parse):
def transform_date_into_date_array(self, data):
return_array = self.date_range(data['form']['date1'], data['form']['date2'])
return_array = self.date_range(data['form']['date_from'], data['form']['date_to'])
self.date_lst = return_array
self.date_lst.sort()
def transform_both_into_date_array(self, data):
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']
date_array = []
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]
if period_start_date<date_start_date:
start_date = period_start_date
else :
start_date = date_start_date
if date_stop_date<period_stop_date:
stop_date = period_stop_date
else :
stop_date = date_stop_date
final_date_array = final_date_array + self.date_range(start_date, stop_date)
self.date_lst = final_date_array
self.date_lst.sort()
else :
final_date_array = final_date_array + self.date_range(date_start_date, date_stop_date)
self.date_lst = final_date_array
self.date_lst.sort()
def transform_none_into_date_array(self, data):
sql = "SELECT min(date) as start_date from account_move_line"
@@ -151,13 +117,11 @@ class partner_balance(report_sxw.rml_parse):
self.cr.execute(sql)
stop_date = self.cr.fetchone()[0]
array = []
array = array + self.date_range(start_date, stop_date)
self.date_lst = array
self.date_lst.sort()
def comma_me(self, amount):
if type(amount) is float :
amount = str('%.2f'%amount)
@@ -176,18 +140,12 @@ class partner_balance(report_sxw.rml_parse):
# Transformation des date
#
#
if data['form']['state'] == 'none':
if data['form']['filter'] == 'filter_no':
self.transform_none_into_date_array(data)
elif data['form']['state'] == 'bydate':
elif data['form']['filter'] == 'filter_date':
self.transform_date_into_date_array(data)
elif data['form']['state'] == 'byperiod':
elif data['form']['filter'] == 'filter_period':
self.transform_period_into_date_array(data)
elif data['form']['state'] == 'all':
self.transform_both_into_date_array(data)
## Compute Code
@@ -204,12 +162,12 @@ class partner_balance(report_sxw.rml_parse):
"FROM account_account a " \
"LEFT JOIN account_account_type t " \
"ON (a.type = t.code) " \
"WHERE a.company_id = %s " \
"AND a.type IN %s " \
"AND a.active", (data['form']['company_id'], self.ACCOUNT_TYPE))
# "WHERE a.company_id = %s " \
"WHERE a.type IN %s " \
"AND a.active", (self.ACCOUNT_TYPE,))
self.account_ids = [a for (a,) in self.cr.fetchall()]
super(partner_balance, self).set_context(objects, data, ids, report_type)
return super(partner_balance, self).set_context(objects, data, ids, report_type)
def lines(self,data):
@@ -237,10 +195,10 @@ class partner_balance(report_sxw.rml_parse):
"JOIN account_account ac ON (l.account_id = ac.id)" \
"WHERE ac.type IN %s " \
"AND l.date IN %s " \
"AND ac.company_id = %s " \
# "AND ac.company_id = %s " \
"GROUP BY p.id, p.ref, p.name,l.account_id,ac.name,ac.code " \
"ORDER BY l.account_id,p.name",
(tuple(self.date_lst), self.ACCOUNT_TYPE, tuple(self.date_lst), data['form']['company_id']))
(tuple(self.date_lst), self.ACCOUNT_TYPE, tuple(self.date_lst)))
res = self.cr.dictfetchall()
for r in res:
full_account.append(r)
@@ -486,16 +444,9 @@ class partner_balance(report_sxw.rml_parse):
debit, credit = self._sum_debit(data), self._sum_credit(data)
return credit > debit and credit - debit
def _get_company(self, form):
return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).name
def _get_currency(self, form):
return pooler.get_pool(self.cr.dbname).get('res.company').browse(self.cr, self.uid, form['company_id']).currency_id.name
def get_fiscalyear(self,form):
print "ffffffffffffff",form
return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr,self.uid,form['fiscalyear']).name
report_sxw.report_sxw('report.account.partner.balance', 'res.partner',
'account/report/partner_balance.rml',parser=partner_balance,
header=0)
addons/account/wizard/account_partner_balance_report.py
+26 -58
View File
@@ -27,83 +27,51 @@ class account_partner_balance(osv.osv_memory):
"""
This wizard will provide the partner balance report by periods, between any two dates.
"""
_inherit = 'account.common.report'
_name = 'account.partner.balance'
_description = 'Account Partner Balance'
_description = 'Print 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'),
('Suppliers and Customers' ,'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, 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' : time.strftime('%Y-01-01'),
'date2' : time.strftime('%Y-%m-%d'),
'result_selection' : 'Suppliers and Customers',
'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 ! '))
def _check_date(self, cr, uid, data, context=None):
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']['date_from'],))
res = cr.dictfetchall()
if res:
if (data['form']['date_to'] > res[0]['date_stop'] or data['form']['date_to'] < 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 True
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
def _print_report(self, cr, uid, ids, data, query_line, context=None):
if context is None:
context = {}
data['form'].update(self.read(cr, uid, ids, ['company_id', 'result_selection', 'soldeinit'])[0])
if data['form']['filter'] == 'filter_date':
self._check_date(cr, uid, data, context)
data['form']['query_line'] = query_line
return {
'type': 'ir.actions.report.xml',
'report_name': 'account.partner.balance',
'datas': data,
'nodestroy':True,
}
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,
'nodestroy':True,
}
else:
raise osv.except_osv(_('UserError'),_('Date not in a defined fiscal year'))
'nodestroy': True,
}
account_partner_balance()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/account/wizard/account_partner_balance_report_view.xml
+14 -36
View File
@@ -2,44 +2,22 @@
<openerp>
<data>
<record id="account_partner_balance_view" model="ir.ui.view">
<field name="name">Select period</field>
<field name="model">account.partner.balance</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Date-Period">
<field name="company_id" groups="base.group_multi_company"/>
<field name="result_selection" required = "True"/>
<newline/>
<field name="fiscalyear"/>
<label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
<newline/>
<separator string="Filters" colspan="4"/>
<field name="state" required="True"/>
<newline/>
<group attrs="{'invisible':[('state','=','none')]}" colspan="4">
<group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
<separator string="Date Filter" colspan="4"/>
<field name="date1"/>
<field name="date2"/>
</group>
<group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
<separator string="Filter on Periods" colspan="4"/>
<field name="periods" colspan="4" nolabel="1"/>
</group>
</group>
<newline/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
<button name="check_state" string="Print" type="object" icon="gtk-print"/>
</group>
</form>
</field>
</record>
<record id="account_partner_balance_view" model="ir.ui.view">
<field name="name">Partner Balance</field>
<field name="model">account.partner.balance</field>
<field name="type">form</field>
<field name="inherit_id" ref="account_common_report_view" />
<field name="arch" type="xml">
<field name="fiscalyear_id" position="after">
<field name="result_selection"/>
<field name="soldeinit"/>
<newline/>
</field>
</field>
</record>
<record id="action_account_partner_balance" model="ir.actions.act_window">
<field name="name">Select Period</field>
<field name="name">Partner Balance</field>
<field name="res_model">account.partner.balance</field>
<field name="type">ir.actions.act_window</field>
<field name="view_type">form</field>