[MERGE] merge from dev3

bzr revid: ara@tinyerp.com-20110104133327-3bccwqfxuak4ckoo

addons/account/account_analytic_line.py

@@ -51,7 +51,6 @@ class account_analytic_line(osv.osv):
             context = {}
         if context.get('from_date',False):
             args.append(['date', '>=', context['from_date']])
-
         if context.get('to_date',False):
             args.append(['date','<=', context['to_date']])
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit,

addons/account/res_currency.py

@@ -21,6 +21,7 @@
 from osv import osv
 
 """Inherit res.currency to handle accounting date values when converting currencies"""
+
 class res_currency_account(osv.osv):
     _inherit = "res.currency"
 
@@ -41,4 +42,6 @@ class res_currency_account(osv.osv):
                 rate = float(tot2)/float(tot1)
         return rate
 
-res_currency_account()
+res_currency_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: