Merge lp:~openerp-dev/openobject-addons/trunk-bug-1100396-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello,

I have checked the branch lp:~openerp-community/openobject-addons/fix-1100396-account_budget-date_range by Niels Huylebroeck and removed some of his unused code and applied in this branch.

Thanks & Regards,
Devnani Bharat R.

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

By "unused code" you mean "useful comments", right?
Why do you do this?

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-1100396-bde]

9026. By Bharat Devnani (Open ERP) on 2014-01-31

[ADD] added comment

[Bharat Devnani (Open ERP) (bde-openerp)]

I have added useful comments

Unmerged revisions

9026. By Bharat Devnani (Open ERP) on 2014-01-31

[ADD] added comment

9025. By Niels Huylebroeck on 2013-12-24

[ACCOUNT BUDGET] [IMP] improved date values in context in order to get correct practical amount

=== modified file 'account_budget/report/crossovered_budget_report.py'
--- account_budget/report/crossovered_budget_report.py	2013-10-27 12:31:04 +0000
+++ account_budget/report/crossovered_budget_report.py	2014-01-31 11:32:21 +0000
@@ -71,7 +71,6 @@
             self.cr.execute('SELECT DISTINCT(analytic_account_id) FROM crossovered_budget_lines WHERE id = ANY(%s)',(budget_ids,))
             an_ids = self.cr.fetchall()
 
-            context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
             for i in range(0, len(an_ids)):
                 if not an_ids[i][0]:
                     continue
@@ -96,8 +95,17 @@
                 for line in line_id:
                     if line.id in budget_ids:
                         theo = pract = 0.00
-                        theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id]
-                        pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id]
+                        # When fetching theoretical/practical amounts we
+                        # want to use the date as closely related to the
+                        # period defined on the budget line, however
+                        # if the user has entered a date which intersects
+                        # the budget_line dates we take that in preference.
+                        ctx = {
+                            'wizard_date_from': max(line.date_from, d_from),
+                            'wizard_date_to': min(line.date_to, d_to),
+                        }
+                        theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], ctx)[line.id]
+                        pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], ctx)[line.id]
                         if line.general_budget_id.id in done_budget:
                             for record in result:
                                 if record['b_id'] == line.general_budget_id.id  and record['a_id'] == line.analytic_account_id.id: