diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php
index 095f2d32e..cecc1df39 100644
--- a/core/lib/Thelia/Action/Product.php
+++ b/core/lib/Thelia/Action/Product.php
@@ -56,7 +56,6 @@ use Thelia\Model\FeatureProductQuery;
 use Thelia\Model\ProductCategoryQuery;
 use Thelia\Core\Event\ProductSetTemplateEvent;
 use Thelia\Model\AttributeCombinationQuery;
-use Thelia\Core\Template\Loop\ProductSaleElements;
 use Thelia\Model\ProductSaleElementsQuery;
 use Propel\Runtime\ActiveQuery\PropelQuery;
 use Thelia\Core\Event\ProductDeleteCategoryEvent;
@@ -66,6 +65,9 @@ use Thelia\Model\AttributeCombination;
 use Thelia\Core\Event\ProductCreateCombinationEvent;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\ProductTableMap;
+use Thelia\Core\Event\ProductDeleteCombinationEvent;
+use Thelia\Model\ProductPrice;
+use Thelia\Model\ProductSaleElements;
 
 class Product extends BaseAction implements EventSubscriberInterface
 {
@@ -367,19 +369,31 @@ class Product extends BaseAction implements EventSubscriberInterface
         $con->beginTransaction();
 
         try {
+            $product = $event->getProduct();
 
-            if ($event->getUseDefaultPricing()) {
-                // Get the default pricing
-                $salesElement = ProductSaleElementsQuery::create()->filterByIsDefault(true)->findOne();
-            }
-            else {
-                // We have to create a new ProductSaleElement
-                echo "no default !!!!";
-                exit;
-            }
+            // Create an empty product sale element
+            $salesElement = new ProductSaleElements();
 
-            if (null == $salesElement)
-                throw new \LogicException("Cannot create or get the product sales element for this new combination.");
+            $salesElement
+                ->setProduct($product)
+                ->setRef($product->getRef())
+                ->setPromo(0)
+                ->setNewness(0)
+                ->setWeight(0)
+                ->setIsDefault(false)
+                ->save($con)
+            ;
+
+            // Create an empty product price in the default currency
+            $product_price = new ProductPrice();
+
+            $product_price
+                ->setProductSaleElements($salesElement)
+                ->setPromoPrice(0)
+                ->setPrice(0)
+                ->setCurrencyId($event->getCurrencyId())
+                ->save($con)
+            ;
 
             $combinationAttributes = $event->getAttributeAvList();
 
@@ -412,6 +426,13 @@ class Product extends BaseAction implements EventSubscriberInterface
         }
     }
 
+    public function deleteProductCombination(ProductDeleteCombinationEvent $event) {
+
+        if (null !== $pse = ProductSaleElementsQuery::create()->findPk($event->getProductSaleElementId())) {
+            $pse->delete();
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 6127b2160..0d7327e4c 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -190,7 +190,7 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::loadGeneralAjaxTabAction</default>
     </route>
 
-    <!-- Product associations, categories,  content and accessories -->
+    <!-- Product categories, content and accessories -->
 
     <route id="admin.products.related.tab" path="/admin/products/related/tab">
         <default key="_controller">Thelia\Controller\Admin\ProductController::loadRelatedAjaxTabAction</default>
@@ -278,6 +278,16 @@
         <default key="_controller">Thelia\Controller\Admin\ProductController::deleteCombinationAction</default>
     </route>
 
+    <route id="admin.product.combination.update" path="/admin/product/combination/update">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateCombinationAction</default>
+    </route>
+
+    <route id="admin.product.combination.defaut-price.update" path="/admin/product/default-price/update">
+        <default key="_controller">Thelia\Controller\Admin\ProductController::updateDefaultPriceAction</default>
+    </route>
+
+
+
 
     <!--  Folder routes management -->
 
diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 346f4b55f..fa505b5c3 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -42,6 +42,7 @@ use Thelia\Log\Tlog;
 use Symfony\Component\Routing\Router;
 use Thelia\Model\Admin;
 use Thelia\Core\Security\Token\CookieTokenProvider;
+use Thelia\Model\CurrencyQuery;
 
 class BaseAdminController extends BaseController
 {
@@ -258,7 +259,7 @@ class BaseAdminController extends BaseController
         // Return the new language if a change is required.
         if (null !== $edit_currency_id = $this->getRequest()->get('edit_currency_id', null)) {
 
-            if (null !== $edit_currency = LangQuery::create()->findOneById($edit_currency_id)) {
+            if (null !== $edit_currency = CurrencyQuery::create()->findOneById($edit_currency_id)) {
                 return $edit_currency;
             }
         }
diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php
index f46bda291..342af6b14 100644
--- a/core/lib/Thelia/Controller/Admin/ProductController.php
+++ b/core/lib/Thelia/Controller/Admin/ProductController.php
@@ -56,6 +56,7 @@ use Thelia\Model\ProductSaleElementsQuery;
 use Thelia\Model\AttributeCombination;
 use Thelia\Model\AttributeAv;
 use Thelia\Core\Event\ProductCreateCombinationEvent;
+use Thelia\Core\Event\ProductDeleteCombinationEvent;
 
 /**
  * Manages products
@@ -753,8 +754,8 @@ class ProductController extends AbstractCrudController
 
         $event = new ProductCreateCombinationEvent(
                 $this->getExistingObject(),
-                $this->getRequest()->get('use_default_princing', 0),
-                $this->getRequest()->get('combination_attributes', array())
+                $this->getRequest()->get('combination_attributes', array()),
+                $this->getCurrentEditionCurrency()->getId()
         );
 
         try {
@@ -764,8 +765,33 @@ class ProductController extends AbstractCrudController
             // Any error
             return $this->errorPage($ex);
         }
-echo "done!";
-exit;
+
         $this->redirectToEditionTemplate();
     }
+
+
+    /**
+     * A a new combination to a product
+     */
+    public function deleteCombinationAction() {
+
+        // Check current user authorization
+        if (null !== $response = $this->checkAuth("admin.products.update")) return $response;
+
+        $event = new ProductDeleteCombinationEvent(
+                $this->getExistingObject(),
+                $this->getRequest()->get('product_sale_element_id',0)
+        );
+
+        try {
+            $this->dispatch(TheliaEvents::PRODUCT_DELETE_COMBINATION, $event);
+        }
+        catch (\Exception $ex) {
+            // Any error
+            return $this->errorPage($ex);
+        }
+
+        $this->redirectToEditionTemplate();
+    }
+
 }
diff --git a/core/lib/Thelia/Core/Event/ProductCreateCombinationEvent.php b/core/lib/Thelia/Core/Event/ProductCreateCombinationEvent.php
index 092dc7f82..322451199 100644
--- a/core/lib/Thelia/Core/Event/ProductCreateCombinationEvent.php
+++ b/core/lib/Thelia/Core/Event/ProductCreateCombinationEvent.php
@@ -22,31 +22,19 @@
 /*************************************************************************************/
 
 namespace Thelia\Core\Event;
-
 use Thelia\Model\Product;
+
 class ProductCreateCombinationEvent extends ProductEvent
 {
-    protected $use_default_pricing;
     protected $attribute_av_list;
+    protected $currency_id;
 
-    public function __construct(Product $product, $use_default_pricing, $attribute_av_list)
+    public function __construct(Product $product, $attribute_av_list, $currency_id)
     {
         parent::__construct($product);
 
-        $this->use_default_pricing = $use_default_pricing;
         $this->attribute_av_list = $attribute_av_list;
-    }
-
-    public function getUseDefaultPricing()
-    {
-        return $this->use_default_pricing;
-    }
-
-    public function setUseDefaultPricing($use_default_pricing)
-    {
-        $this->use_default_pricing = $use_default_pricing;
-
-        return $this;
+        $this->currency_id = $currency_id;
     }
 
     public function getAttributeAvList()
@@ -60,4 +48,17 @@ class ProductCreateCombinationEvent extends ProductEvent
 
         return $this;
     }
+
+    public function getCurrencyId()
+    {
+        return $this->currency_id;
+    }
+
+    public function setCurrencyId($currency_id)
+    {
+        $this->currency_id = $currency_id;
+
+        return $this;
+    }
+
 }
diff --git a/core/lib/Thelia/Core/Event/ProductDeleteCombinationEvent.php b/core/lib/Thelia/Core/Event/ProductDeleteCombinationEvent.php
new file mode 100644
index 000000000..3cc9a25ce
--- /dev/null
+++ b/core/lib/Thelia/Core/Event/ProductDeleteCombinationEvent.php
@@ -0,0 +1,47 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Event;
+use Thelia\Model\Product;
+
+class ProductDeleteCombinationEvent extends ProductEvent
+{
+    protected $product_sale_element_id;
+
+    public function __construct(Product $product, $product_sale_element_id)
+    {
+        parent::__construct($product);
+
+        $this->product_sale_element_id = $product_sale_element_id;
+    }
+
+    public function getProductSaleElementId()
+    {
+        return $this->product_sale_element_id;
+    }
+
+    public function setProductSaleElementId($product_sale_element_id)
+    {
+        $this->product_sale_element_id = $product_sale_element_id;
+    }
+}
diff --git a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
index bf8ccf512..e25164456 100755
--- a/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
+++ b/core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
@@ -175,6 +175,7 @@ class ProductSaleElements extends BaseLoop
                 ->set("QUANTITY"          , $PSEValue->getQuantity())
                 ->set("IS_PROMO"          , $PSEValue->getPromo() === 1 ? 1 : 0)
                 ->set("IS_NEW"            , $PSEValue->getNewness() === 1 ? 1 : 0)
+                ->set("IS_DEFAULT"        , $PSEValue->getIsDefault() === 1 ? 1 : 0)
                 ->set("WEIGHT"            , $PSEValue->getWeight())
                 ->set("PRICE"             , $price)
                 ->set("PRICE_TAX"         , $taxedPrice - $price)
diff --git a/templates/admin/default/includes/product-details-tab.html b/templates/admin/default/includes/product-details-tab.html
index 238b7d987..13e241e59 100644
--- a/templates/admin/default/includes/product-details-tab.html
+++ b/templates/admin/default/includes/product-details-tab.html
@@ -1,259 +1,290 @@
 <div class="form-container">
 
-    {form name="thelia.admin.product.details.modification"}
-    <form method="POST" action="{url path='/admin/products/details/save'}" {form_enctype form=$form} class="clearfix">
+    {loop name="product.sales.elements.test" type="product_sale_elements" product=$product_id currency=$edit_currency_id backend_context="1"}
+    {/loop}
 
-	    {include
-	        file = "includes/inner-form-toolbar.html"
-            hide_submit_buttons = false
-            show_currencies = true
+    {elseloop rel="product.sales.elements.test"}
+	    {form name="thelia.admin.product.details.modification"}
+	    <form method="POST" action="{url path='/admin/product/default-price/update'}" {form_enctype form=$form} class="clearfix">
 
-	        page_url  = "{url path='/admin/products/update' product_id=$ID}"
-	        close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
-	    }
+		    {include
+		        file = "includes/inner-form-toolbar.html"
+	            hide_submit_buttons = false
+	            show_currencies = true
 
-        {* Be sure to get the product ID, even if the form could not be validated *}
-        <input type="hidden" name="product_id" value="{$product_id}" />
+		        page_url  = "{url path='/admin/products/update' product_id=$ID}"
+		        close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
+		    }
 
-        <input type="hidden" name="current_tab" value="details" />
+	        {* Be sure to get the product ID, even if the form could not be validated *}
+	        <input type="hidden" name="product_id" value="{$product_id}" />
 
-        {form_hidden_fields form=$form}
+	        <input type="hidden" name="current_tab" value="details" />
 
-        {form_field form=$form field='id'}
-            <input type="hidden" name="{$name}" value="{$value}" />
-        {/form_field}
+	        {form_hidden_fields form=$form}
 
-        {form_field form=$form field='success_url'}
-            <input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" />
-        {/form_field}
+	        {form_field form=$form field='id'}
+	            <input type="hidden" name="{$name}" value="{$value}" />
+	        {/form_field}
 
-        {loop type="currency" name="product-currency" id=$edit_currency_id backend_context="1"}
+	        {form_field form=$form field='success_url'}
+	            <input type="hidden" name="{$name}" value="{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}" />
+	        {/form_field}
 
-            {$currency_symbol = $SYMBOL}
-            {$currency_name = $NAME}
+	        {loop type="currency" name="product-currency" id=$edit_currency_id backend_context="1"}
 
-            {form_field form=$form field='currency'}
-                <input type="hidden" name="{$name}" value="{$ID}" />
-            {/form_field}
-        {/loop}
+	            {$currency_symbol = $SYMBOL}
+	            {$currency_name = $NAME}
 
-        <p class="title title-without-tabs">{intl l='Default pricing'}</p>
+	            {form_field form=$form field='currency'}
+	                <input type="hidden" name="{$name}" value="{$ID}" />
+	            {/form_field}
+	        {/loop}
 
-        <p>{intl l="The default pricing is used with product that do not have any combinations. It is also used for product with combinations which share the same pricing information"}</p>
+	        <p class="title title-without-tabs">{intl l='Default pricing'}</p>
 
-	    <div class="row">
+	        <p>{intl l="The default pricing is used with product that do not have any combinations. It is also used for product with combinations which share the same pricing information"}</p>
 
-	        {* -- Pricing ------------------------------------------------------- *}
+		    <div class="row">
 
-	        <div class="col-md-4">
-                <div class="well well-sm">
-		            <p class="title title-without-tabs">{intl l='Pricing'}</p>
+		        {* -- Pricing ------------------------------------------------------- *}
 
-		               <p></p> <!-- LAME !!! FIXME -->
+		        <div class="col-md-4">
+	                <div class="well well-sm">
+			            <p class="title title-without-tabs">{intl l='Pricing'}</p>
 
-		              {form_field form=$form field='price'}
-		                  <div class="form-group {if $error}has-error{/if}">
-		                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+			               <p></p> <!-- LAME !!! FIXME -->
 
-		                         <div class="input-group">
-		                             <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
-		                             <span class="input-group-addon">{$currency_symbol}</span>
-		                         </div>
-		                  </div>
-		              {/form_field}
+			              {form_field form=$form field='price'}
+			                  <div class="form-group {if $error}has-error{/if}">
+			                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
 
-		              {form_field form=$form field='tax_rule'}
-		                  <div class="form-group {if $error}has-error{/if}">
-		                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-		                      <div class="form-group">
-		                          <select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
-		                              <option value="">{intl l="Select a tax tule"}</option>
-		                              {loop name="tax" type="tax-rule" backend_context="1"}
-		                                  <option value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}>{$TITLE}</option>
-		                              {/loop}
-		                          </select>
-		                      </div>
+			                         <div class="input-group">
+			                             <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
+			                             <span class="input-group-addon">{$currency_symbol}</span>
+			                         </div>
+			                  </div>
+			              {/form_field}
 
-		                  </div>
-		              {/form_field}
+			              {form_field form=$form field='tax_rule'}
+			                  <div class="form-group {if $error}has-error{/if}">
+			                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+			                      <div class="form-group">
+			                          <select id="{$label_attr.for}" required="required" name="{$name}" class="form-control">
+			                              <option value="">{intl l="Select a tax tule"}</option>
+			                              {loop name="tax" type="tax-rule" backend_context="1"}
+			                                  <option value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}>{$TITLE}</option>
+			                              {/loop}
+			                          </select>
+			                      </div>
 
-		              {form_field form=$form field='price_with_tax'}
-		                  <div class="form-group {if $error}has-error{/if}">
-		                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-		                      <div class="input-group">
-		                          <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
-		                          <span class="input-group-addon">{$currency_symbol}</span>
-		                      </div>
-		                  </div>
-		              {/form_field}
+			                  </div>
+			              {/form_field}
 
-		              {module_include location='product_details_pricing_form'}
-		          </div>
+			              {form_field form=$form field='price_with_tax'}
+			                  <div class="form-group {if $error}has-error{/if}">
+			                      <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+			                      <div class="input-group">
+			                          <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
+			                          <span class="input-group-addon">{$currency_symbol}</span>
+			                      </div>
+			                  </div>
+			              {/form_field}
+
+			              {module_include location='product_details_pricing_form'}
+			          </div>
+		        </div>
+
+
+		        {* -- Promotion ------------------------------------------------- *}
+
+		        <div class="col-md-4">
+	                <div class="well well-sm">
+			            <p class="title title-without-tabs">{intl l='Promotion'}</p>
+
+			            {form_field form=$form field='sale_price'}
+			                <div class="form-group {if $error}has-error{/if}">
+			                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+			                    <div class="input-group">
+			                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
+			                        <span class="input-group-addon">{$currency_symbol}</span>
+			                    </div>
+			               </div>
+			            {/form_field}
+
+						{form_field form=$form field='onsale'}
+						<div class="form-group {if $error}has-error{/if}">
+						    <div class="checkbox">
+						        <label>
+						            <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+						            {$label}
+						        </label>
+						    </div>
+						</div>
+						{/form_field}
+
+			            {form_field form=$form field='isnew'}
+			            <div class="form-group {if $error}has-error{/if}">
+			                <div class="checkbox">
+			                    <label>
+			                        <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
+			                        {$label}
+			                    </label>
+			                </div>
+			            </div>
+			            {/form_field}
+
+			            {module_include location='product_details_promotion_form'}
+			        </div>
+		         </div>
+
+
+		         {* -- Shipping -------------------------------------------------- *}
+
+		         <div class="col-md-4">
+		             <div class="well well-sm">
+			             <p class="title title-without-tabs">{intl l='Shipping'}</p>
+
+			             {form_field form=$form field='weight'}
+			                <div class="form-group {if $error}has-error{/if}">
+			                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+			                    <div class="input-group">
+			                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product weight'}">
+			                        <span class="input-group-addon">{intl l="Kg"}</span>
+			                    </div>
+			                </div>
+			             {/form_field}
+
+		                {module_include location='product_details_shipping_form'}
+
+		                 <p class="title title-without-tabs">{intl l='Quantity'}</p>
+
+		                 {form_field form=$form field='quantity'}
+		                    <div class="form-group {if $error}has-error{/if}">
+		                        <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+
+		                        <div class="form-group">
+		                            <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Current quantity'}">
+		                        </div>
+		                    </div>
+		                 {/form_field}
+
+			             {module_include location='product_details_quantity_form'}
+			        </div>
+			    </div>
 	        </div>
-
-
-	        {* -- Promotion ------------------------------------------------- *}
-
-	        <div class="col-md-4">
-                <div class="well well-sm">
-		            <p class="title title-without-tabs">{intl l='Promotion'}</p>
-
-		            {form_field form=$form field='sale_price'}
-		                <div class="form-group {if $error}has-error{/if}">
-		                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-
-		                    <div class="input-group">
-		                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product price'}">
-		                        <span class="input-group-addon">{$currency_symbol}</span>
-		                    </div>
-		               </div>
-		            {/form_field}
-
-					{form_field form=$form field='onsale'}
-					<div class="form-group {if $error}has-error{/if}">
-					    <div class="checkbox">
-					        <label>
-					            <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
-					            {$label}
-					        </label>
-					    </div>
-					</div>
-					{/form_field}
-
-		            {form_field form=$form field='isnew'}
-		            <div class="form-group {if $error}has-error{/if}">
-		                <div class="checkbox">
-		                    <label>
-		                        <input type="checkbox" id="{$label_attr.for}" name="{$name}" value="1" {if $value != 0}checked="checked"{/if}>
-		                        {$label}
-		                    </label>
-		                </div>
-		            </div>
-		            {/form_field}
-
-		            {module_include location='product_details_promotion_form'}
-		        </div>
-	         </div>
-
-
-	         {* -- Shipping -------------------------------------------------- *}
-
-	         <div class="col-md-4">
-	             <div class="well well-sm">
-		             <p class="title title-without-tabs">{intl l='Shipping'}</p>
-
-		             {form_field form=$form field='weight'}
-		                <div class="form-group {if $error}has-error{/if}">
-		                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-
-		                    <div class="input-group">
-		                        <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Product weight'}">
-		                        <span class="input-group-addon">{intl l="Kg"}</span>
-		                    </div>
-		                </div>
-		             {/form_field}
-
-	                {module_include location='product_details_shipping_form'}
-
-	                 <p class="title title-without-tabs">{intl l='Quantity'}</p>
-
-	                 {form_field form=$form field='quantity'}
-	                    <div class="form-group {if $error}has-error{/if}">
-	                        <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-
-	                        <div class="form-group">
-	                            <input type="text" id="{$label_attr.for}" required="required" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Current quantity'}">
-	                        </div>
-	                    </div>
-	                 {/form_field}
-
-		             {module_include location='product_details_quantity_form'}
-		        </div>
-		    </div>
-        </div>
-    </form>
-    {/form}
-
+	    </form>
+	    {/form}
+    {/elseloop}
 
     {* -- Attribute combinations -------------------------------------------- *}
 
-    {module_include location='product_before_combinations'}
-
 	<div class="row">
 	    <div class="col-md-12">
-            <div class="well well-sm">
 
-				<table class="table table-striped table-condensed" id="category_list">
-				    <caption>
-				        {intl l='Attribute Combinations'}
+	        {ifloop rel="product.sales.elements"}
+		        <form method="POST" action="{url path='/admin/product/combinations/update'}">
 
-				        {module_include location='product_combinations_list_caption'}
+			        {include
+			            file = "includes/inner-form-toolbar.html"
+			            hide_submit_buttons = false
+			            show_currencies = true
+			            page_url  = "{url path='/admin/products/update' product_id=$ID}"
+			            close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
+			        }
 
-				        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.products.update"}
-				        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new combination'}" href="#combination_creation_dialog" data-toggle="modal">
-				            <span class="glyphicon glyphicon-plus-sign"></span>
-				        </a>
-				        {/loop}
-				    </caption>
+	                {module_include location='product_before_combinations'}
 
-				    <thead>
-				        <tr>
-				            <th>{intl l='Attributes'}</th>
-							<th class="text-center">{intl l='Quantity'}</th>
-							<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
-							<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
-							<th class="text-center">{intl l='Weight (Kg)'}</th>
-							<th class="text-center">{intl l='Is new'}</th>
-							<th class="text-center">{intl l='On sale'}</th>
-							<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
-							<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
-							<th class="actions">{intl l='Actions'}</th>
-				        </tr>
-				    </thead>
+					<table class="table table-striped table-condensed" id="category_list">
+					    <caption>
+					        {intl l='Attribute Combinations'}
 
-				    <tbody>
-                        {loop name="product.sales.elements" type="product_sale_elements" product=$product_id currency=$edit_currency_id}
-				        <tr>
-							<td>
-							{loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$ID}
-							    {$ATTRIBUTE_TITLE}&nbsp;
-							{/loop}
-							</td>
+					        {module_include location='product_combinations_list_caption'}
 
-							<td><input class="form-control text-right" type="text" name="quantity[{$ID}]" value="{format_number number=$QUANTITY}" /></td>
-							<td><input class="form-control text-right" type="text" name="price_wo_taxes[{$ID}]" value="{format_number number=$PRICE_TAX}" /></td>
-							<td><input class="form-control text-right" type="text" name="price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PRICE}" /></td>
-							<td><input class="form-control text-right" type="text" name="weight[{$ID}]" value="{format_number number=$WEIGHT}" /></td>
+					        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.products.update"}
+					        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new combination'}" href="#combination_creation_dialog" data-toggle="modal">
+					            <span class="glyphicon glyphicon-plus-sign"></span>
+					        </a>
+					        {/loop}
+					    </caption>
 
-							<td>
-							    <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-							        <input class="change-default" type="radio" name="on_sale[{$ID}]" value="{$ID}" {if $IS_PROMO}checked="checked"{/if}/>
-							    </div>
-							</td>
+					    <thead>
+					        <tr>
+					            <th>{intl l='Attributes'}</th>
+								<th class="text-center">{intl l='Quantity'}</th>
+								<th class="text-center">{intl l='Price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Weight (Kg)'}</th>
+                                <th class="text-center">{intl l='Default'}</th>
+                                <th class="text-center">{intl l='Is new'}</th>
+								<th class="text-center">{intl l='On sale'}</th>
+								<th class="text-center">{intl l='Sale price<br />w/o taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="text-center">{intl l='Sale price<br />w/ taxes (%currency)' currency=$currency_symbol}</th>
+								<th class="actions">{intl l='Actions'}</th>
+					        </tr>
+					    </thead>
 
-							<td>
-							 <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
-							     <input class="change-default" type="radio" name="is_new[{$ID}]" value="{$ID}" {if $IS_NEW}checked="checked"{/if}/>
-							 </div>
-							</td>
+					    <tbody>
+	                        {loop name="product.sales.elements" type="product_sale_elements" product=$product_id currency=$edit_currency_id backend_context="1"}
+					        <tr>
+								<td>
+								{loop name="product.sales.elements.combinations" type="attribute_combination" product_sale_elements=$ID backend_context="1"}
+								    {$ATTRIBUTE_TITLE}&nbsp;
+								{/loop}
+								</td>
 
-							<td><input class="form-control text-right" type="text" name="sale_price_wo_taxes[{$ID}]" value="{format_number number=$PROMO_PRICE_TAX}" /></td>
-							<td><input class="form-control text-right" type="text" name="sale_price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PROMO_PRICE}" /></td>
+								<td><input class="form-control text-right" type="text" name="quantity[{$ID}]" value="{$QUANTITY}" /></td>
+								<td><input class="form-control text-right" type="text" name="price_wo_taxes[{$ID}]" value="{format_number number=$PRICE}" /></td>
+								<td><input class="form-control text-right" type="text" name="price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PRICE}" /></td>
+								<td><input class="form-control text-right" type="text" name="weight[{$ID}]" value="{$WEIGHT}" /></td>
+
+                                <td class="text-center">
+                                    <input class="form-control" type="radio" name="default" value="{$ID}" {if $IS_DEFAULT}checked="checked"{/if}/>
+                                </td>
+
+								<td class="text-center">
+								    <input class="form-control" type="checkbox" name="on_sale[{$ID}]" value="{$ID}" {if $IS_PROMO}checked="checked"{/if}/>
+								</td>
+
+								<td class="text-center">
+							         <input class="form-control" type="checkbox" name="is_new[{$ID}]" value="{$ID}" {if $IS_NEW}checked="checked"{/if}/>
+								</td>
+
+								<td><input class="form-control text-right" type="text" name="sale_price_wo_taxes[{$ID}]" value="{format_number number=$PROMO_PRICE}" /></td>
+								<td><input class="form-control text-right" type="text" name="sale_price_w_taxes[{$ID}]" value="{format_number number=$TAXED_PROMO_PRICE}" /></td>
+
+								<td class="actions">
+								    <a class="btn btn-default btn-xs combination-delete" title="{intl l='Delete this combination'}"  href="#combination_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
+								</td>
+					        </tr>
+	                        {/loop}
+					    </tbody>
+					</table>
+
+                    {module_include location='product_after_combinations'}
+                   </form>
+
+		        {/ifloop}
+
+		        {elseloop rel="product.sales.elements"}
+	                <p class="title title-without-tabs">{intl l='Attribute Combinations'}</p>
+
+	                <div class="alert alert-info">
+	                    {intl
+	                     l='This product has no combination. The default price is used. <a data-toggle="modal" href="%url">Click here to create a new combination</a>'
+	                       url='#combination_creation_dialog'
+	                    }
+	                </div>
+			    {/elseloop}
+
+			    {module_include location='product_after_combinations'}
 
-							<td class="actions">
-							    <a class="btn btn-default btn-xs combination-delete" title="{intl l='Delete this combination'}"  href="#combination_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
-							</td>
-				        </tr>
-                        {/loop}
-				    </tbody>
-				</table>
 			</div>
 		 </div>
 	</div>
 
-	{module_include location='product_after_combinations'}
-</div>
-
 {* -- Adding a new combination ------------------------------------------------- *}
 
 {* Capture the dialog body, to pass it to the generic dialog *}
@@ -314,17 +345,6 @@
 	    </div>
 	</div>
 
-    {form_field form=$form field='isnew'}
-    <div class="form-group {if $error}has-error{/if}">
-        <div class="checkbox">
-            <label>
-                <input type="checkbox" id="use_default_princing" name="use_default_princing" value="1">
-                {intl l="Use default princing for this combination (you can change this later)"}
-            </label>
-        </div>
-    </div>
-    {/form_field}
-
 {/capture}
 
 {include
@@ -351,7 +371,7 @@
     <input type="hidden" name="product_id" value="{$product_id}" />
     <input type="hidden" name="current_tab" value="details" />
 
-    <input type="hidden" name="combination_id" id="combination_delete_id" value="" />
+    <input type="hidden" name="product_sale_element_id" id="combination_delete_id" value="" />
 
     {module_include location='category_delete_form'}
 
@@ -364,6 +384,6 @@
     dialog_title    = {intl l="Delete a combunation"}
     dialog_message  = {intl l="Do you really want to delete this combination ?"}
 
-    form_action         = {url path='/admin/product/combination/delete'}
-    form_content        = {$smarty.capture.combination_delete_dialog nofilter}
+    form_action     = {url path='/admin/product/combination/delete'}
+    form_content    = {$smarty.capture.combination_delete_dialog nofilter}
 }