[IMP] account_analytic_analysis, account_analytic_default, account_analytic_plans: code cleaning

bzr revid: psi@tinyerp.co.in-20101011112550-ygkqmzmuhu1j7dm3

1 files changed, 35 insertions, 36 deletions

diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index dce86597a4c..ebc78956a93 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -21,13 +21,13 @@
 
 import time
 
-from osv import fields,osv
+from osv import fields, osv
 
 class account_analytic_default(osv.osv):
-    _name = 'account.analytic.default'
-    _description = 'Analytic Distribution'
-    _rec_name = 'analytic_id'
-    _order = 'sequence'
+    _name = "account.analytic.default"
+    _description = "Analytic Distribution"
+    _rec_name = "analytic_id"
+    _order = "sequence"
     _columns = {
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."),
         'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
@@ -38,50 +38,50 @@ class account_analytic_default(osv.osv):
         'date_start': fields.date('Start Date'),
         'date_stop': fields.date('End Date'),
     }
-    
+
     def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):
         domain = []
         if product_id:
-            domain += ['|',('product_id','=',product_id)]
-        domain += [('product_id','=',False)]
+            domain += ['|', ('product_id', '=', product_id)]
+        domain += [('product_id','=', False)]
         if partner_id:
-            domain += ['|',('partner_id','=',partner_id)]
-        domain += [('partner_id','=',False)]
+            domain += ['|', ('partner_id', '=', partner_id)]
+        domain += [('partner_id', '=', False)]
         if user_id:
-            domain += ['|',('user_id','=',user_id)]
-        domain += [('user_id','=',False)]
+            domain += ['|',('user_id', '=', user_id)]
+        domain += [('user_id','=', False)]
         if date:
-            domain += ['|',('date_start','<=',date),('date_start','=',False)]
-            domain += ['|',('date_stop','>=',date),('date_stop','=',False)]
+            domain += ['|', ('date_start', '<=', date), ('date_start', '=', False)]
+            domain += ['|', ('date_stop', '>=', date), ('date_stop', '=', False)]
         best_index = -1
         res = False
         for rec in self.browse(cr, uid, self.search(cr, uid, domain, context=context), context=context):
             index = 0
-            if rec.product_id: index+=1
-            if rec.partner_id: index+=1
-            if rec.user_id: index+=1
-            if rec.date_start: index+=1
-            if rec.date_stop: index+=1
-            if index>best_index:
+            if rec.product_id: index += 1
+            if rec.partner_id: index += 1
+            if rec.user_id: index += 1
+            if rec.date_start: index += 1
+            if rec.date_stop: index += 1
+            if index > best_index:
                 res = rec
                 best_index = index
         return res
-    
+
 account_analytic_default()
 
 class account_invoice_line(osv.osv):
-    _inherit = 'account.invoice.line'
-    _description = 'Invoice Line'
+    _inherit = "account.invoice.line"
+    _description = "Invoice Line"
 
     def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
-        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
+        res_prod = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+        rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context=context)
         if rec:
-            res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
+            res_prod['value'].update({'account_analytic_id': rec.analytic_id.id})
         else:
-            res_prod['value'].update({'account_analytic_id':False})
+            res_prod['value'].update({'account_analytic_id': False})
         return res_prod
-    
+
 account_invoice_line()
 
 
@@ -95,28 +95,27 @@ class stock_picking(osv.osv):
         if rec:
             return rec.analytic_id.id
 
-        return super(stock_picking, self)._get_account_analytic_invoice(cursor,
-                user, picking, move_line)
+        return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
 stock_picking()
 
 class sale_order_line(osv.osv):
-    _inherit = 'sale.order.line'
+    _inherit = "sale.order.line"
 
     # Method overridden to set the analytic account by default on criterion match
     def invoice_line_create(self, cr, uid, ids, context=None):
-        create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
+        create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context)
         if not ids:
             return create_ids
-        sale_line = self.browse(cr, uid, ids[0], context)
+        sale_line = self.browse(cr, uid, ids[0], context=context)
         inv_line_obj = self.pool.get('account.invoice.line')
         anal_def_obj = self.pool.get('account.analytic.default')
 
-        for line in inv_line_obj.browse(cr, uid, create_ids, context):
-            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context)
+        for line in inv_line_obj.browse(cr, uid, create_ids, context=context):
+            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, sale_line.order_id.user_id.id, time.strftime('%Y-%m-%d'), context=context)
 
             if rec:
-                inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
+                inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
         return create_ids
 
 sale_order_line()