Merge lp:~openerp-dev/openobject-addons/trunk-bug-880797-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/880797 "Unable to filter Budget Lines".

I added a field in tree view, which is in search view and also added store=True in function field.

Thanks and Regards,

Divyesh Makwana(MDI)

[Raphael Collet (OpenERP) (rco-openerp)]

FYI, adding "store=True" is not enough. The value may have to be recomputed, and this does not work by magic :-( The value of field 'practical_amount' depends on the model account.analytic.line. So you have to specify which records of crossovered.budget.lines must be recomputed when the table account_analytic_line is touched.

Anyway, searching on practical_amount does not make much sense. I will merge without that change, only the view needs to be fixed.

Thanks,
Raphael

[Raphael Collet (OpenERP) (rco-openerp)]

I removed the select="1" on field practical_amount in the list view.

=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2011-07-05 13:31:35 +0000
+++ account_budget/account_budget.py	2011-11-02 05:10:28 +0000
@@ -111,7 +111,7 @@
     def _prac_amt(self, cr, uid, ids, context=None):
         res = {}
         result = 0.0
-        if context is None: 
+        if context is None:
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
@@ -141,7 +141,7 @@
 
     def _theo_amt(self, cr, uid, ids, context=None):
         res = {}
-        if context is None: 
+        if context is None:
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
             today = datetime.datetime.today()
@@ -196,7 +196,7 @@
         'date_to': fields.date('End Date', required=True),
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
-        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', store=True, digits_compute=dp.get_precision('Account')),
         'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
         'percentage':fields.function(_perc, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)

=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml	2011-09-17 13:03:09 +0000
+++ account_budget/account_budget_view.xml	2011-11-02 05:10:28 +0000
@@ -205,6 +205,7 @@
                 <tree string="Budget Lines">
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                     <field name="general_budget_id"/>
+                    <field name="crossovered_budget_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
                     <field name="paid_date"/>