diff --git a/classes/Cart.php b/classes/Cart.php
index 62f8448ac..c43efbd2f 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -144,6 +144,7 @@ class CartCore extends ObjectModel
 	const ONLY_SHIPPING = 5;
 	const ONLY_WRAPPING = 6;
 	const ONLY_PRODUCTS_WITHOUT_SHIPPING = 7;
+	const ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING = 8;
 
 	public function __construct($id = null, $id_lang = null)
 	{
@@ -1187,6 +1188,7 @@ class CartCore extends ObjectModel
 	* Cart::ONLY_SHIPPING
 	* Cart::ONLY_WRAPPING
 	* Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING
+	* Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING
 	*
 	* @param boolean $withTaxes With or without taxes
 	* @param integer $type Total type
@@ -1205,7 +1207,8 @@ class CartCore extends ObjectModel
 			Cart::BOTH_WITHOUT_SHIPPING,
 			Cart::ONLY_SHIPPING,
 			Cart::ONLY_WRAPPING,
-			Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING
+			Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING,
+			Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING,
 		);
 		
 		// Define virtual context to prevent case where the cart is not the in the global context
@@ -1227,7 +1230,7 @@ class CartCore extends ObjectModel
 		if ($virtual && $type == Cart::BOTH)
 			$type = Cart::BOTH_WITHOUT_SHIPPING;
 
-		if ($type != Cart::BOTH_WITHOUT_SHIPPING && $type != Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING)
+		if (!in_array($type, array(Cart::BOTH_WITHOUT_SHIPPING, Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING, Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING)))
 		{
 			if (is_null($products) && is_null($id_carrier))
 				$shipping_fees = $this->getTotalShippingCost(null, (boolean)$with_taxes);
@@ -1242,6 +1245,14 @@ class CartCore extends ObjectModel
 
 		if (is_null($products))
 			$products = $this->getProducts();
+	
+		if ($type == Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING)
+		{
+			foreach ($products as $key => $product)
+				if ($product['is_virtual'])
+					unset($products[$key]);
+			$type = Cart::ONLY_PRODUCTS;
+		}
 
 		$order_total = 0;
 		if (Tax::excludeTaxeOption())
@@ -2152,7 +2163,7 @@ class CartCore extends ObjectModel
 			$products = $product_list;
 
 		// Order total in default currency without fees
-		$order_total = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS_WITHOUT_SHIPPING, $product_list);
+		$order_total = $this->getOrderTotal(true, Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING, $product_list);
 
 		// Start with shipping cost at 0
 		$shipping_cost = 0;
diff --git a/install-dev/upgrade/sql/1.5.0.6.sql b/install-dev/upgrade/sql/1.5.0.6.sql
index ce7a07f96..2b7bbc3ff 100644
--- a/install-dev/upgrade/sql/1.5.0.6.sql
+++ b/install-dev/upgrade/sql/1.5.0.6.sql
@@ -8,3 +8,5 @@ SET o.`current_state` = (
 	ORDER BY oh.`date_add` DESC
 	LIMIT 1
 );
+
+UPDATE `PREFIX_product` set is_virtual = 1 WHERE id_product IN (SELECT id_product FROM `PREFIX_product_download` WHERE active = 1);