Bugfixed Float div error and modified wizard for budget report
bzr revid: jvo@tinyerp.com-20080927083827-5e2bu2h8077ix9oz
This commit is contained in:
parent
3d1ed61e8c
commit
7070102e99
|
@ -54,7 +54,10 @@ class budget_report(report_sxw.rml_parse):
|
|||
i = interval(d.period_id.date_start, d.period_id.date_stop)
|
||||
total_days = reduce(lambda x,d: x+interval(d.period_id.date_start, d.period_id.date_stop), post_obj.dotation_ids, 0)
|
||||
achievements = reduce(lambda x,l: x+l['achievements'], self.lines(post_obj, date1, date2), 0.0)
|
||||
return [{'prev': prev, 'prev_period': prev * period_days / total_days, 'achievements': achievements}]
|
||||
prev_1=1.00
|
||||
if total_days<>0.00:
|
||||
prev_1=prev * period_days / total_days
|
||||
return [{'prev': prev, 'prev_period': prev_1, 'achievements': achievements}]
|
||||
|
||||
def budget_total(self, post_objs, date1, date2):
|
||||
res = {'prev': 0.0, 'prev_period': 0.0, 'achievements': 0.0}
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
|
||||
import time
|
||||
import wizard
|
||||
import datetime
|
||||
import pooler
|
||||
|
||||
dates_form = '''<?xml version="1.0"?>
|
||||
<form string="Select period">
|
||||
|
@ -43,9 +45,16 @@ dates_fields = {
|
|||
}
|
||||
|
||||
class wizard_report(wizard.interface):
|
||||
def _default(self, cr, uid, data, context):
|
||||
pool_obj = pooler.get_pool(cr.dbname)
|
||||
data_model = pool_obj.get(data['model']).browse(cr,uid,data['id'])
|
||||
if not data_model.dotation_ids:
|
||||
raise wizard.except_wizard('Insufficient Data!',"No Dotations or Master Budget Expenses Found on Budget '"+ data_model.name +"'!")
|
||||
return data['form']
|
||||
|
||||
states = {
|
||||
'init': {
|
||||
'actions': [],
|
||||
'actions': [_default],
|
||||
'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]}
|
||||
},
|
||||
'report': {
|
||||
|
|
Loading…
Reference in New Issue