// Fix shop association on new object + some strict standard for Franck

modules/paypal/paypal.php

@@ -476,7 +476,7 @@ class PayPal extends PaymentModule
 		
 	}
 	
-	public function validateOrder($id_cart, $id_order_state, $amountPaid, $paymentMethod = 'Unknown', $message = NULL, $extraVars = array(), $currency_special = NULL, $dont_touch_amount = false, $secure_key = false)
+	public function validateOrder($id_cart, $id_order_state, $amountPaid, $paymentMethod = 'Unknown', $message = NULL, $extraVars = array(), $currency_special = NULL, $dont_touch_amount = false, $secure_key = false, $id_group_shop = false, $id_shop = false)
 	{
 		if (!$this->active)
 			return;

modules/shopimporter/shopimporter.php

@@ -1109,16 +1109,16 @@ class shopimporter extends ImportModule
 		return true;
 	}
 
-	public function cleanPositions($table)
+	public function cleanPositions($table, $shopList = null)
 	{
-		if($table == 'category')
+		if ($table == 'category')
 		{
 			//clean category position
 			$cat = Category::getCategories(1, false, false);
 			foreach($cat AS $i => $categ)
 				Category::cleanPositions((int)($categ['id_category']));
 		}
-		if($table == 'product')
+		if ($table == 'product')
 		{
 			//clean products position
 			$cat = Category::getCategories(1, false, false);

modules/vatnumber/vatnumber.php

@@ -53,13 +53,13 @@ class VatNumber extends Module
 		return (parent::uninstall() AND Configuration::updateValue('VATNUMBER_MANAGEMENT', 0));
 	}
 	
-	public function enable()
+	public function enable($forceAll = false)
 	{
 		parent::enable();
 		Configuration::updateValue('VATNUMBER_MANAGEMENT', 1);
 	}
 	
-	public function disable()
+	public function disable($forceAll = false)
 	{
 		parent::disable();
 		Configuration::updateValue('VATNUMBER_MANAGEMENT', 0);