// MERGE with trunk revision 7754

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
parent 4ade3a0ea0
commit e159c925d8
182 changed files with 6179 additions and 1333 deletions
@@ -293,7 +293,14 @@ class OrderCore extends ObjectModel
 		/* Update order */
 		$shippingDiff = $this->total_shipping - $cart->getOrderShippingCost();
 		$this->total_products -= $productPriceWithoutTax;
+		
+		// After upgrading from old version
+		// total_products_wt is null
+		// removing a product made order total negative
+		// and don't recalculating totals (on getTotalProductsWithTaxes)
+		if ($this->total_products_wt != 0)
 		$this->total_products_wt -= $productPrice;
+		
 		$this->total_shipping = $cart->getOrderShippingCost();

 		/* It's temporary fix for 1.3 version... */