[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination

modules/loyalty/config.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
         <module>
             <name>loyalty</name>
-            <displayName><![CDATA[Programme de fid&eacute;lit&eacute;]]></displayName>
+            <displayName><![CDATA[Customer loyalty and rewards]]></displayName>
             <version><![CDATA[1.9]]></version>
-            <description><![CDATA[Propose un programme de fid&eacute;lit&eacute; &agrave; vos clients]]></description>
+            <description><![CDATA[Provide a loyalty program to your customers.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[pricing_promotion]]></tab>
-	<confirmUninstall>Cette action effacera tous les points de fidélité et l'historique des points de tous vos clients, êtes vous sûr ?</confirmUninstall>
+	<confirmUninstall>Are you sure you want to delete all loyalty points and customer history?</confirmUninstall>
             <is_configurable>1</is_configurable>
             <need_instance>0</need_instance>
 	<limited_countries></limited_countries>

modules/productcomments/config.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
         <module>
             <name>productcomments</name>
-            <displayName><![CDATA[Commentaires produits]]></displayName>
+            <displayName><![CDATA[Product Comments]]></displayName>
             <version><![CDATA[2.4]]></version>
-            <description><![CDATA[Permet aux client de commenter les produits.]]></description>
+            <description><![CDATA[Allows users to post reviews.]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>
             <is_configurable>1</is_configurable>

themes/default/js/product.js

@@ -375,8 +375,16 @@ function updateDisplay()
 		productPriceDisplay = ps_round(productPriceDisplay * group_reduction, 2);
 
 		var ecotaxAmount = !displayPrice ? ps_round(selectedCombination['ecotax'] * (1 + ecotaxTax_rate / 100), 2) : selectedCombination['ecotax'];
-		productPriceDisplay += ecotaxAmount;
-		productPriceWithoutReductionDisplay += ecotaxAmount;
+
+		if (ecotaxAmount != default_eco_tax)
+			productPriceDisplay += ecotaxAmount - default_eco_tax;
+		else
+			productPriceDisplay += ecotaxAmount;
+
+		if (ecotaxAmount != default_eco_tax)
+			productPriceWithoutReductionDisplay += ecotaxAmount - default_eco_tax;
+		else
+			productPriceWithoutReductionDisplay += ecotaxAmount;
 
 		var our_price = '';
 		if (productPriceDisplay > 0) {