generate css from last commit

[odoo/odoo.git] / addons / account_budget / account_budget.py

diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 590b431..af9f9cb 100644 (file)
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -111,11 +111,12 @@ class crossovered_budget_lines(osv.osv):
     def _prac_amt(self, cr, uid, ids, context=None):
         res = {}
         result = 0.0
-        if context is None: context = {}
+        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]
             if not acc_ids:
-                raise osv.except_osv(_('Error!'),_("The General Budget '%s' has no Accounts!") % str(line.general_budget_id.name))
+                raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % str(line.general_budget_id.name))
             date_to = line.date_to
             date_from = line.date_from
             if context.has_key('wizard_date_from'):
@@ -134,14 +135,14 @@ class crossovered_budget_lines(osv.osv):
 
     def _prac(self, cr, uid, ids, name, args, context=None):
         res={}
-        if context is None: context = {}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = self._prac_amt(cr, uid, [line.id], context=context)[line.id]
         return res
 
     def _theo_amt(self, cr, uid, ids, context=None):
         res = {}
-        if context is None: context = {}
+        if context is None: 
+            context = {}
         for line in self.browse(cr, uid, ids, context=context):
             today = datetime.datetime.today()
             date_to = today.strftime("%Y-%m-%d")
@@ -172,7 +173,6 @@ class crossovered_budget_lines(osv.osv):
 
     def _theo(self, cr, uid, ids, name, args, context=None):
         res = {}
-        if context is None: context = {}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = self._theo_amt(cr, uid, [line.id], context=context)[line.id]
         return res
@@ -181,7 +181,7 @@ class crossovered_budget_lines(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             if line.theoritical_amount <> 0.00:
-                res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
+                res[line.id] = float((line.practical_amount or 0.0) / line.theoritical_amount) * 100
             else:
                 res[line.id] = 0.00
         return res
@@ -190,15 +190,15 @@ class crossovered_budget_lines(osv.osv):
     _description = "Budget Line"
     _columns = {
         'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True),
-        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=False),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account',required=True),
         'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True),
         'date_from': fields.date('Start Date', required=True),
         '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, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, method=True, string='Theoritical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
+        'practical_amount':fields.function(_prac, string='Practical Amount', type='float', 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)
     }