Merge branch 'catalog'

Conflicts:
	local/config/schema.xml

core/lib/Thelia/Core/Event/ProductSaleElement/ProductSaleElementUpdateEvent.php

@@ -41,7 +41,8 @@ class ProductSaleElementUpdateEvent extends ProductSaleElementEvent
     protected $isnew;
     protected $isdefault;
     protected $ean_code;
-    protected $taxrule;
+    protected $tax_rule_id;
+    protected $from_default_currency;
 
     public function __construct(Product $product, $product_sale_element_id)
     {
@@ -196,16 +197,27 @@ class ProductSaleElementUpdateEvent extends ProductSaleElementEvent
         return $this;
     }
 
-    public function getTaxrule()
+    public function getTaxRuleId()
     {
-        return $this->taxrule;
+        return $this->tax_rule_id;
     }
 
-    public function setTaxrule($taxrule)
+    public function setTaxRuleId($tax_rule_id)
     {
-        $this->taxrule = $taxrule;
+        $this->tax_rule_id = $tax_rule_id;
 
         return $this;
     }
 
+    public function getFromDefaultCurrency()
+    {
+        return $this->from_default_currency;
+    }
+
+    public function setFromDefaultCurrency($from_default_currency)
+    {
+        $this->from_default_currency = $from_default_currency;
+        return $this;
+    }
+
 }

core/lib/Thelia/Core/Template/Loop/Product.php

@@ -668,6 +668,7 @@ class Product extends BaseI18nLoop
                 ->set("PREVIOUS"         , $previous != null ? $previous->getId() : -1)
                 ->set("NEXT"             , $next != null ? $next->getId() : -1)
                 ->set("DEFAULT_CATEGORY" , $default_category_id)
+                ->set("TAX_RULE_ID"      , $product->getTaxRuleId())
 
                 ;