diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 5ea8c59b848..65505a2884e 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -305,8 +305,15 @@ class account_analytic_line(osv.osv):
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
     }
+
+    def _get_default_datum(self, cr, uid, context=None):
+        import pprint; PP = pprint.PrettyPrinter()
+        import pdb; pdb.set_trace()
+        print 'dans analytic'
+        return fields.date.context_today()
+
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': _get_default_datum,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
         'amount': 0.00
     }
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index a28508be4db..56f71d624e2 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -210,4 +210,15 @@ class account_analytic_account(osv.osv):
 
 account_analytic_account()
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+
+    def _get_default_date(self, cr, uid, context=None):
+        print 'not called'
+        if context is None:
+            context = {}
+        if context.get('timesheet_date'):
+            return context.get('timesheet_date')
+        return super(account_analytic_line, self)._get_default_date(cr, uid, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 2d19704508d..1d6b295b3a1 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -22,7 +22,6 @@
     partner_id: base.res_partner_4
     partner_invoice_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
-    picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.sale_shop_1
 -