// Merge -> 8910

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:25 +00:00
parent 4b56fa5c68
commit 3620f0837f
28 changed files with 2046 additions and 118 deletions
@@ -364,7 +364,7 @@ abstract class PaymentModuleCore extends Module
 							ProductSale::addProductSale((int)$product['id_product'], (int)$product['cart_quantity']);
 				}

-				if (isset($outOfStock) AND $outOfStock)
+				if (isset($outOfStock) && $outOfStock && Configuration::get('PS_STOCK_MANAGEMENT'))
 				{
 					$history = new OrderHistory();
 					$history->id_order = (int)$order->id;