diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py index 05c92fb1746..76d95bfe575 100644 --- a/addons/account_budget/report/budget_report.py +++ b/addons/account_budget/report/budget_report.py @@ -59,12 +59,11 @@ class budget_report(report_sxw.rml_parse): prev_1=prev * period_days / total_days return [{'prev': prev, 'prev_period': prev_1, 'achievements': achievements}] - def budget_total(self, post_objs, date1, date2): + def budget_total(self, post_obj, date1, date2): res = {'prev': 0.0, 'prev_period': 0.0, 'achievements': 0.0} - for post_obj in post_objs: - r = self.post_total(post_obj, date1, date2)[0] - for k in r: - res[k] += r[k] + r = self.post_total(post_obj, date1, date2)[0] + for k in r: + res[k] += r[k] return [res] def lines(self, post_obj, date1, date2): diff --git a/addons/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml index 520fed1df2f..175cd17b1d6 100644 --- a/addons/account_budget/report/budget_report.rml +++ b/addons/account_budget/report/budget_report.rml @@ -10,233 +10,293 @@ + + + + - - - - - - + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - Budget Analysis - - - From [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + Budget Analysis + + + + + - [[ company.name ]] + [[ company.name ]] - - - + From [[ data['form']['date1'] ]] to [[ data['form']['date2'] ]] - Currency: [[ company.currency_id.name ]] + Currency: [[ company.currency_id.name ]] - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - + - + Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] + + + + + + + - Budget item detail + Budget Item Detail - Account Number + A/c No. - Budget - - - + Budget - Period Budget - - - + Period Budget - Performance + Performance - Spread + Spread - % performance + % performance - + + [[ repeatIn(objects,'o') ]]
- [[ repeatIn(objects, 'o') ]] - [[ o.code ]] + [[ o.code ]] - [[ o.name ]] + [[ o.name ]] - + - - [[ repeatIn(lines(o, data['form']['date1'], data['form']['date2']), 'a') ]] - [[ a['name'] ]] - + [[ repeatIn(lines(o, data['form']['date1'], data['form']['date2']), 'a') ]][[ a['name'] ]] - [[ a['code'] ]] + [[ a['code'] ]] - + - + - [[ '%.2f' % a['achievements'] ]] + [[ '%.2f' % a['achievements'] ]] - + - + - + + + + - Total [[ o.code ]] + Total : [[ o.code ]] [[ repeatIn( post_total(o, data['form']['date1'], data['form']['date2']), 'total') ]] - [[ '%.2f' % total['prev'] ]] + [[ '%.2f' % total['prev'] ]] - [[ '%.2f' % total['prev_period'] ]] + [[ '%.2f' % total['prev_period'] ]] - [[ '%.2f' % total['achievements'] ]] + [[ '%.2f' % total['achievements'] ]] - [[ '%.2f' % (total['prev_period'] - total['achievements']) ]] + [[ '%.2f' % (total['prev_period'] - total['achievements']) ]] - [[ total['prev_period'] and ('%.2f' % (total['achievements'] / total['prev_period'] * 100.0)) or 0.0]] % + [[ total['prev_period'] and ('%.2f' % (total['achievements'] / total['prev_period'] * 100.0)) or 0.0]] % + + +
- + - Results - [[ repeatIn( budget_total(objects, data['form']['date1'], data['form']['date2']), 'total') ]] + Results + [[ repeatIn( budget_total(o, data['form']['date1'], data['form']['date2']), 'total') ]] - [[ '%.2f' % total['prev'] ]] + [[ '%.2f' % total['prev'] ]] - [[ '%.2f' % total['prev_period'] ]] + [[ '%.2f' % total['prev_period'] ]] - [[ '%.2f' % total['achievements'] ]] + [[ '%.2f' % total['achievements'] ]] - [[ '%.2f' % (total['prev_period'] - total['achievements']) ]] + [[ '%.2f' % (total['prev_period'] - total['achievements']) ]] - [[ '%.2f' % (total['achievements'] / total['prev_period'] * 100.0) ]] % + [[ '%.2f' % (total['achievements'] / total['prev_period'] * 100.0) ]] % @@ -244,5 +304,4 @@ - - + \ No newline at end of file