diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 46d18515df4..8973a54ec17 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -688,11 +688,8 @@ class account_move_line(osv.osv):
         if ('journal_id' in vals):
             journal=self.pool.get('account.journal').browse(cr,uid,vals['journal_id'])
             journal_flag=True
-            if not journal.analytic_journal_id:
-                del_line=True
 
-        if ('analytic_account_id' in vals) and  (not vals['analytic_account_id']):
-            del_line=True
+        del_line=True
 
         if del_line:
             for obj in obj_line.analytic_lines:
@@ -875,6 +872,8 @@ class account_move_line(osv.osv):
                         'journal_id': journal.analytic_journal_id.id,
                         'ref': vals['ref'],
                     })]
+            else:
+                raise osv.except_osv(_('No analytic journal !'), _('Please set an analytic journal on this financial journal !'))
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
         if 'account_tax_id' in vals and vals['account_tax_id']:
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 88e6946ba17..dd478f3dca1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -962,7 +962,6 @@ class sale_config_picking_policy(osv.osv_memory):
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
-            ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
 
             if o.step=='one':