diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py
index b8245c12fcf..0939ed6c61e 100644
--- a/addons/account/__terp__.py
+++ b/addons/account/__terp__.py
@@ -41,6 +41,6 @@
 #	"translations" : {
 #		"fr": "i18n/french_fr.csv"
 #	},
-	"active": True,
+	"active": False,
 	"installable": True
 }
diff --git a/addons/account/account.py b/addons/account/account.py
index 85817d358db..9d3eca0a0c3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -901,7 +901,7 @@ class account_tax(osv.osv):
 				cur_price_unit+=amount2
 		return res
 
-	def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None):
+	def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product_id=None):
 		"""
 		Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4d46e253a14..2780b672899 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -304,7 +304,8 @@ class purchase_order_line(osv.osv):
 		'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
 		'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
 		'notes': fields.text('Notes'),
-		'order_id': fields.many2one('purchase.order', 'Order Ref', select=True)
+		# May be we can set this field as required ?
+		'order_id': fields.many2one('purchase.order', 'Order Ref', select=True, ondelete='cascade')
 	}
 	_defaults = {
 		'product_qty': lambda *a: 1.0