[-] BO : fixed bug loading wrong root category in AdminCategoriesController

Fix wrong root category being loaded.
There's an issue if you activate multishop and create a new root category which loads the wrong category and causes, at least, 'Add new Category' and 'Export' in AdminCategories to redirect back to the category list (e.g. impossible to add/remove categories).

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 Contributing
 ------------
 
-PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the development branch.  
+PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the bootstrap branch.  
 If you need some help to make a [pull-request][1]  
 All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request.  
 All core files you commit in your pull request must have Open Software License (OSL 3.0)  

admin-dev/themes/default/template/controllers/localization/content.tpl

@@ -23,10 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<div class="width4">
+{if isset($localization_form)}{$localization_form}{/if}
-	{if isset($localization_form)}{$localization_form}{/if}
-</div>
 <br />
-<div class="width4">
+{if isset($localization_options)}{$localization_options}{/if}
-	{if isset($localization_options)}{$localization_options}{/if}
-</div>

admin-dev/themes/default/template/controllers/products/textarea_lang.tpl

@@ -28,7 +28,7 @@
 <div class="lang_{$language.id_lang}" style="{if !$language.is_default}display:none;{/if}float: left;">
 	<textarea cols="100" rows="10" id="{$input_name}_{$language.id_lang}" 
 		name="{$input_name}_{$language.id_lang}" 
-		class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8}{/if}</textarea>
+		class="autoload_rte" >{if isset($input_value[$language.id_lang])}{$input_value[$language.id_lang]|htmlentitiesUTF8|replace:'\r\n':''|replace:'\&quot;':'&quot;'}{/if}</textarea>
 	<span class="counter" max="{if isset($max)}{$max}{else}none{/if}"></span>
 	<span class="hint">{$hint|default:''}<span class="hint-pointer">&nbsp;</span></span>
 </div>

classes/CartRule.php

@@ -132,7 +132,12 @@ class CartRuleCore extends ObjectModel
 	public function update($null_values = false)
 	{
 		Cache::clean('getContextualValue_'.$this->id.'_*');
-		return parent::update($null_values);	
+		if (!parent::update($null_values))
+			return false;
+
+		Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', CartRule::isCurrentlyUsed($this->def['table'], true));
+
+		return true;
 	}
 
 	/**

classes/Mail.php

@@ -372,11 +372,11 @@ class MailCore
 
 		$file_core = _PS_ROOT_DIR_.'/mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_core) && empty($_LANGMAIL))
-			include_once($file_core);
+			include($file_core);
 
 		$file_theme = _PS_THEME_DIR_.'mails/'.$iso_code.'/lang.php';
 		if (Tools::file_exists_cache($file_theme))
-			include_once($file_theme);
+			include($file_theme);
 
 		if (!is_array($_LANGMAIL))
 			return (str_replace('"', '"', $string));

classes/RequestSql.php

@@ -245,9 +245,10 @@ class RequestSqlCore extends ObjectModel
 	 */
 	public function cutAttribute($attr, $from)
 	{
-		if (preg_match('#^((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))\.((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))$#i', $attr))
+		$matches = array();
+		if (preg_match('/((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))\.((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))$/i', $attr, $matches, PREG_OFFSET_CAPTURE))
 		{
-			$tab = explode('.', str_replace(array('`', '(', ')'), '', $attr));
+			$tab = explode('.', str_replace(array('`', '(', ')'), '', $matches[0][0]));
 			if (!$table = $this->returnNameTable($tab[0], $from))
 				return false;
 			else
@@ -256,9 +257,9 @@ class RequestSqlCore extends ObjectModel
 							'attribut' => $tab[1],
 							'string' => $attr);
 		}
-		elseif (preg_match('#^((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))$#i', $attr))
+		elseif (preg_match('/((`(\()?([a-z0-9_])+`(\))?)|((\()?([a-z0-9_])+(\))?))$/i', $attr, $matches, PREG_OFFSET_CAPTURE))
 		{
-			$attribut = str_replace(array('`', '(', ')'), '', $attr);
+			$attribut = str_replace(array('`', '(', ')'), '', $matches[0][0]);
 			if (!$table = $this->returnNameTable(false, $from))
 				return false;
 			else

classes/Tools.php

@@ -344,7 +344,7 @@ class ToolsCore
 		}
 
 		/* Automatically detect language if not already defined, detect_language is set in Cookie::update */
-		if ((!$cookie->id_lang || isset($cookie->detect_language)) && isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		if ((!$cookie->id_lang && (isset($cookie->detect_language)) && isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])))
 		{
 			$array  = explode(',', Tools::strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']));
 			$string = $array[0];
@@ -397,6 +397,7 @@ class ToolsCore
 			|| (($id_lang == $configuration_id_lang) && Validate::isUnsignedId($id_lang) && $id_lang != $cookie_id_lang))
 		{
 			$context->cookie->id_lang = $id_lang;
+
 			$language = new Language($id_lang);
 			if (Validate::isLoadedObject($language) && $language->active)
 				$context->language = $language;
@@ -675,10 +676,8 @@ class ToolsCore
 	public static function htmlentitiesDecodeUTF8($string)
 	{
 		if (is_array($string))
-		{
+			return array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string);
-			$string = array_map(array('Tools', 'htmlentitiesDecodeUTF8'), $string);
+
-			return (string)array_shift($string);
-		}
 		return html_entity_decode((string)$string, ENT_QUOTES, 'utf-8');
 	}
 

classes/controller/AdminController.php

@@ -1547,7 +1547,7 @@ class AdminControllerCore extends Controller
 		if (!empty($country_module_list) && is_string($country_module_list) && $country_module_list_xml = simplexml_load_string($country_module_list))
 		{
 			$country_module_list_array = array();
-			if (is_array($country_module_list_xml->module))
+			if (isset($country_module_list_xml->module))
 				foreach ($country_module_list_xml->module as $k => $m)
 					$country_module_list_array[] = (string)$m->name;
 			$this->tab_modules_list['slider_list'] = array_intersect($this->tab_modules_list['slider_list'], $country_module_list_array);

classes/helper/Helper.php

@@ -86,9 +86,9 @@ class HelperCore
 				$override_tpl_path = _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/_configure/'.$this->override_folder.$this->base_folder.$tpl_name;
 			else
 			{
-				if (file_exists($this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name))
+				if (file_exists($this->context->smarty->getTemplateDir(1).$this->override_folder.$this->base_folder.$tpl_name))
-					$override_tpl_path = $this->context->smarty->getTemplateDir(1).DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name;
+					$override_tpl_path = $this->context->smarty->getTemplateDir(1).$this->override_folder.$this->base_folder.$tpl_name;
-				else if (file_exists($this->context->smarty->getTemplateDir(0).DIRECTORY_SEPARATOR.'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name))
+				else if (file_exists($this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name))
 					$override_tpl_path = $this->context->smarty->getTemplateDir(0).'controllers'.DIRECTORY_SEPARATOR.$this->override_folder.$this->base_folder.$tpl_name;
 
 			}

controllers/admin/AdminCategoriesController.php

@@ -105,7 +105,7 @@ class AdminCategoriesControllerCore extends AdminController
 			$this->_category = new Category($id_category);
 		else
 		{
-			if (Shop::isFeatureActive() && Shop::getContext() == Shop::CONTEXT_SHOP)
+			if (Shop::getContext() == Shop::CONTEXT_SHOP)
 				$this->_category = new Category($this->context->shop->id_category);
 			elseif (count(Category::getCategoriesWithoutParent()) > 1 && Configuration::get('PS_MULTISHOP_FEATURE_ACTIVE') && count(Shop::getShops(true, null, true)) != 1)
 				$this->_category = Category::getTopCategory();

controllers/admin/AdminCmsCategoriesController.php

@@ -71,6 +71,7 @@ class AdminCmsCategoriesControllerCore extends AdminController
 	{
 		$this->initToolbar();
         $this->toolbar_btn['new']['href'] .= '&id_parent='.(int)Tools::getValue('id_cms_category');
+        $this->initTabModuleList();
 		return parent::renderList();
 	}
 

controllers/admin/AdminDeliverySlipController.php

@@ -120,6 +120,7 @@ class AdminDeliverySlipControllerCore extends AdminController
 
 	public function initContent()
 	{
+		$this->initTabModuleList();
 		$this->content .= $this->renderForm().'<br />';
 		$this->show_toolbar = false;
 		$this->content .= $this->renderOptions();

controllers/admin/AdminEmployeesController.php

@@ -347,15 +347,15 @@ class AdminEmployeesControllerCore extends AdminController
 
 	public function postProcess()
 	{
-		if (Tools::isSubmit('deleteemployee') || Tools::isSubmit('status') || Tools::isSubmit('statusemployee'))
+		/* PrestaShop demo mode */
+		if ((Tools::isSubmit('deleteemployee') || Tools::isSubmit('status') || Tools::isSubmit('statusemployee') || Tools::isSubmit('submitAddemployee')) && _PS_MODE_DEMO_)
 		{
-			/* PrestaShop demo mode */
-			if (_PS_MODE_DEMO_ && $id_employee = Tools::getValue('id_employee') && (int)$id_employee == _PS_DEMO_MAIN_BO_ACCOUNT_)
-			{
 				$this->errors[] = Tools::displayError('This functionality has been disabled.');
 				return;
-			}
+		}
 
+		if (Tools::isSubmit('deleteemployee') || Tools::isSubmit('status') || Tools::isSubmit('statusemployee'))
+		{
 			if ($this->context->employee->id == Tools::getValue('id_employee'))
 			{
 				$this->errors[] = Tools::displayError('You cannot disable or delete your own account.');

controllers/admin/AdminLocalizationController.php

@@ -304,7 +304,7 @@ class AdminLocalizationControllerCore extends AdminController
 			'download_updated_pack' => 1
 		);
 
-		$this->show_toolbar = false;
+		$this->show_toolbar = true;
 		return parent::renderForm();
 	}
 
@@ -315,7 +315,6 @@ class AdminLocalizationControllerCore extends AdminController
 
 		// toolbar (save, cancel, new, ..)
 		$this->initToolbar();
-
 		$this->context->smarty->assign(array(
 			'localization_form' => $this->renderForm(),
 			'localization_options' => $this->renderOptions(),
@@ -323,9 +322,15 @@ class AdminLocalizationControllerCore extends AdminController
 		));
 	}
 	
+	public function initToolbar()
+	{
+		$this->toolbar_btn = array();
+		$this->initTabModuleList();
+	}
+	
 	public function display()
 	{
-		$this->initContent();
+		$this->initContent();		
 		parent::display();
 	}
 

controllers/admin/AdminManufacturersController.php

@@ -638,6 +638,7 @@ class AdminManufacturersControllerCore extends AdminController
 	{
 		// toolbar (save, cancel, new, ..)
 		$this->initToolbar();
+		$this->initTabModuleList();
 		if ($this->display == 'editaddresses' || $this->display == 'addaddress')
 			$this->content .= $this->renderFormAddress();
 		else if ($this->display == 'edit' || $this->display == 'add')

controllers/front/GetFileController.php

@@ -276,7 +276,7 @@ class GetFileControllerCore extends FrontController
 		/* Set headers for download */
 		header('Content-Transfer-Encoding: binary');
 		header('Content-Type: '.$mimeType);
-		header('Content-Length: '.filesize($file));
+		header('Content-Length: '.sprintf('%u', filesize($file)));
 		header('Content-Disposition: attachment; filename="'.$filename.'"');
 		$fp = fopen($file, 'rb');
 		while (!feof($fp))

controllers/front/GuestTrackingController.php

@@ -58,7 +58,7 @@ class GuestTrackingControllerCore extends FrontController
 				{
 					$order = new Order((int)$id_order);
 					if (Validate::isLoadedObject($order))
-						$order_collection[] = $order;
+						$order_collection = Order::getByReference($order->reference);
 				}
 				else
 					$order_collection = Order::getByReference($id_order);

install-dev/upgrade/php/migrate_orders.php

@@ -86,11 +86,9 @@ function migrate_orders()
 			SELECT od.*
 			FROM `'._DB_PREFIX_.'order_detail` od
 			WHERE od.`id_order` = '.(int)$order['id_order']);
+
 			while ($order_details = Db::getInstance()->nextRow($order_details_list))
 			{
-				$values_order_detail = array();
-				$values_order = array();
-				$col_order_detail = array();
 				// we don't want to erase order_details data in order to create the insert query
 				$products = mo_setProductPrices($order_details, $price_display_method);
 				$tax_rate = 1 + ((float)$products['tax_rate'] / 100);
@@ -107,6 +105,7 @@ function migrate_orders()
 				$order_details['total_price_tax_excl'] = (float)$products['total_price'];
 				$order_details['unit_price_tax_incl'] = (float)$products['product_price_wt'];
 				$order_details['unit_price_tax_excl'] = (float)$products['product_price'];
+
 				foreach (array_keys($order_details) as $k)
 					if (!in_array($k, $col_order_detail))
 						unset($order_details[$k]);
@@ -121,7 +120,7 @@ function migrate_orders()
 					$values_order_detail[] = '(\''.implode('\', \'', $order_details).'\')';
 				unset($order_details);
 			}
-	
+
 			$average_tax_used = 1;
 			if ($sum_total_products > 0)
 				$average_tax_used +=  $sum_tax_amount / $sum_total_products;
@@ -187,6 +186,10 @@ function migrate_orders()
 		$res = false;
 		$array_errors[] = '[insert order 4] - '.Db::getInstance()->getMsgError();
 	}
+	if (isset($values_order))
+		unset($values_order);
+	if (isset($values_order_detail))
+		unset($values_order_detail);
 	if (!mo_renameTables())
 	{
 		$res = false;

js/fileuploader.js

@@ -1072,7 +1072,8 @@ qq.extend(qq.UploadHandlerXhr.prototype, {
         var queryString = qq.obj2url(params, this._options.action);
 
         xhr.open("POST", queryString, true);
-        xhr.setRequestHeader("Content-type","application/x-www-form-urlencoded");
+        xhr.setRequestHeader("Content-Type", "application/octet-stream");
+        xhr.setRequestHeader("processData", false);
         xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
         xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
         xhr.send(file);

localization/it.xml

@@ -7,11 +7,11 @@
 		<language iso_code="it" />
 	</languages>
 	<taxes>
-		<tax id="1" name="IVA IT 21%" rate="21" />
+		<tax id="1" name="IVA IT 22%" rate="22" />
 		<tax id="2" name="IVA IT 10%" rate="10" />
 		<tax id="3" name="IVA IT 4%" rate="4" />
 		
-		<taxRulesGroup name="IT Standard Rate (21%)">
+		<taxRulesGroup name="IT Standard Rate (22%)">
 			<taxRule iso_code_country="be" id_tax="1" />
 			<taxRule iso_code_country="bg" id_tax="1" />
 			<taxRule iso_code_country="cz" id_tax="1" />

localization/je.xml

@@ -8,9 +8,9 @@
 		<language iso_code="en" />
 	</languages>
 	<taxes>
-		<tax id="1" name="GST JE 3%" rate="3" />
+		<tax id="1" name="GST JE 5%" rate="5" />
 		
-		<taxRulesGroup name="JE Standard Rate (3%)">
+		<taxRulesGroup name="JE Standard Rate (5%)">
 			<taxRule iso_code_country="je" id_tax="1" />
 		</taxRulesGroup>
 	</taxes>

localization/ke.xml

@@ -10,14 +10,10 @@
     <taxRulesGroup name="Kenya VAT 16%">
       <taxRule iso_code_country="ke" behavior="0" id_tax="76"/>
     </taxRulesGroup>
-    <taxRulesGroup name="Kenya VAT 12%">
-      <taxRule iso_code_country="ke" behavior="0" id_tax="77"/>
-    </taxRulesGroup>
     <taxRulesGroup name="Kenya VAT 0%">
       <taxRule iso_code_country="ke" behavior="0" id_tax="78"/>
     </taxRulesGroup>
     <tax id="76" name="Kenya VAT 16%" rate="16.000"/>
-    <tax id="77" name="Kenya VAT 12%" rate="12.000"/>
     <tax id="78" name="Kenya VAT 0%" rate="0.000"/>
   </taxes>
   <units>

localization/li.xml

@@ -7,19 +7,19 @@
 		<language iso_code="de" />
 	</languages>
 	<taxes>
-		<tax id="1" name="TVA CH 7.6%" rate="7.6" />
+		<tax id="1" name="TVA CH 8%" rate="8" />
-		<tax id="2" name="TVA CH 3.6%" rate="3.6" />
+		<tax id="2" name="TVA CH 3.8%" rate="3.8" />
-		<tax id="3" name="TVA CH 2.4%" rate="2.4" />
+		<tax id="3" name="TVA CH 2.5%" rate="2.5" />
 		
-		<taxRulesGroup name="CH Standard Rate (7.6%)">
+		<taxRulesGroup name="CH Standard Rate (8%)">
 			<taxRule iso_code_country="li" id_tax="1" />
 		</taxRulesGroup>
 		
-		<taxRulesGroup name="CH Reduced Rate (3.6%)">
+		<taxRulesGroup name="CH Reduced Rate (3.8%)">
 			<taxRule iso_code_country="li" id_tax="2" />
 		</taxRulesGroup>
 		
-		<taxRulesGroup name="CH Super Reduced Rate (2.4%)">
+		<taxRulesGroup name="CH Super Reduced Rate (2.5%)">
 			<taxRule iso_code_country="li" id_tax="3" />
 		</taxRulesGroup>
 	</taxes>

localization/lv.xml

@@ -8,7 +8,7 @@
 	</languages>
 	<taxes>
 		<tax id="1" name="PVN LV 21%" rate="21" />
-		<tax id="2" name="PVN LV 10%" rate="10" />
+		<tax id="2" name="PVN LV 12%" rate="12" />
 		
 		<taxRulesGroup name="LV Standard Rate (21%)">
 			<taxRule iso_code_country="be" id_tax="1" />
@@ -40,7 +40,7 @@
 			<taxRule iso_code_country="uk" id_tax="1" />
 		</taxRulesGroup>
 
-		<taxRulesGroup name="LV Reduced Rate (10%)">
+		<taxRulesGroup name="LV Reduced Rate (12%)">
 			<taxRule iso_code_country="be" id_tax="2" />
 			<taxRule iso_code_country="bg" id_tax="2" />
 			<taxRule iso_code_country="cz" id_tax="2" />
@@ -100,7 +100,7 @@
 			<taxRule iso_code_country="uk" id_tax="1" />
 		</taxRulesGroup>
 
-		<taxRulesGroup name="LV Books Rate (10%)">
+		<taxRulesGroup name="LV Books Rate (12%)">
 			<taxRule iso_code_country="be" id_tax="2" />
 			<taxRule iso_code_country="bg" id_tax="2" />
 			<taxRule iso_code_country="cz" id_tax="2" />

localization/no.xml

@@ -8,14 +8,14 @@
 	</languages>
 	<taxes>
 		<tax id="1" name="MVA NO 25%" rate="25" />
-		<tax id="2" name="MVA NO 14%" rate="14" />
+		<tax id="2" name="MVA NO 15%" rate="15" />
 		<tax id="3" name="MVA NO 8%" rate="8" />
 		
 		<taxRulesGroup name="NO Standard Rate (25%)">
 			<taxRule iso_code_country="no" id_tax="1" />
 		</taxRulesGroup>
 		
-		<taxRulesGroup name="NO Reduced Rate (14%)">
+		<taxRulesGroup name="NO Reduced Rate (15%)">
 			<taxRule iso_code_country="no" id_tax="2" />
 		</taxRulesGroup>
 		

localization/pa.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<localizationPack name="PA">
+<localizationPack name="Panama">
   <currencies>
     <currency name="Dollar" iso_code="USD" iso_code_num="840" sign="$" blank="0" conversion_rate="1.000000" format="1" decimals="1"/>
   </currencies>

localization/pe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<localizationPack name="PE">
+<localizationPack name="Peru">
   <currencies>
     <currency name="Nuevo Sol" iso_code="PEN" iso_code_num="604" sign="S/." blank="1" conversion_rate="2.784499" format="1" decimals="0"/>
   </currencies>

localization/ph.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<localizationPack name="PH">
+<localizationPack name="Philippines">
   <currencies>
     <currency name="Philippine Peso" iso_code="PHP" iso_code_num="608" sign="PHP" blank="1" conversion_rate="1.000000" format="1" decimals="1"/>
   </currencies>

localization/pl.xml

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <localizationPack name="Poland" version="1.0">
 	<currencies>
-		<currency name="Zloty" iso_code="PLN" iso_code_num="985" sign="zł" blank="1" conversion_rate="3.84510" format="2" decimals="1" />
+		<currency name="Złoty" iso_code="PLN" iso_code_num="985" sign="zł" blank="1" conversion_rate="3.84510" format="2" decimals="1" />
 	</currencies>
 	<languages>
 		<language iso_code="pl" />
 	</languages>
 	<taxes>
 		<tax id="1" name="PTU PL 23%" rate="23" />
-
 		<tax id="2" name="PTU PL 8%" rate="8" />
-		<tax id="3" name="PTU PL 7%" rate="7" />
 		<tax id="4" name="PTU PL 5%" rate="5" />
-		<tax id="5" name="PTU PL 4%" rate="4" />
 		<tax id="6" name="PTU PL 0" rate="0" />
 		
 		<taxRulesGroup name="PL Standard Rate (23%)">
@@ -82,39 +79,6 @@
 
 		</taxRulesGroup>
 
-		<taxRulesGroup name="PL Reduced Rate (7%)">
-			<taxRule iso_code_country="be" id_tax="3" />
-			<taxRule iso_code_country="bg" id_tax="3" />
-			<taxRule iso_code_country="cz" id_tax="3" />
-			<taxRule iso_code_country="dk" id_tax="3" />
-			<taxRule iso_code_country="de" id_tax="3" />
-			<taxRule iso_code_country="ee" id_tax="3" />
-
-			<taxRule iso_code_country="gr" id_tax="3" />
-			<taxRule iso_code_country="es" id_tax="3" />
-			<taxRule iso_code_country="fr" id_tax="3" />
-			<taxRule iso_code_country="ie" id_tax="3" />
-			<taxRule iso_code_country="it" id_tax="3" />
-			<taxRule iso_code_country="cy" id_tax="3" />
-			<taxRule iso_code_country="lv" id_tax="3" />
-			<taxRule iso_code_country="lt" id_tax="3" />
-			<taxRule iso_code_country="lu" id_tax="3" />
-
-			<taxRule iso_code_country="hu" id_tax="3" />
-			<taxRule iso_code_country="mt" id_tax="3" />
-			<taxRule iso_code_country="nl" id_tax="3" />
-			<taxRule iso_code_country="at" id_tax="3" />
-			<taxRule iso_code_country="pl" id_tax="3" />
-			<taxRule iso_code_country="pt" id_tax="3" />
-			<taxRule iso_code_country="ro" id_tax="3" />
-			<taxRule iso_code_country="si" id_tax="3" />
-			<taxRule iso_code_country="sk" id_tax="3" />
-
-			<taxRule iso_code_country="fi" id_tax="3" />
-			<taxRule iso_code_country="se" id_tax="3" />
-			<taxRule iso_code_country="uk" id_tax="3" />
-		</taxRulesGroup>
-
 		<taxRulesGroup name="PL Reduced Rate (5%)">
 			<taxRule iso_code_country="be" id_tax="4" />
 			<taxRule iso_code_country="bg" id_tax="4" />
@@ -147,38 +111,6 @@
 			<taxRule iso_code_country="uk" id_tax="4" />
 		</taxRulesGroup>
 		
-		<taxRulesGroup name="PL Reduced Rate (4%)">
-			<taxRule iso_code_country="be" id_tax="5" />
-			<taxRule iso_code_country="bg" id_tax="5" />
-
-			<taxRule iso_code_country="cz" id_tax="5" />
-			<taxRule iso_code_country="dk" id_tax="5" />
-			<taxRule iso_code_country="de" id_tax="5" />
-			<taxRule iso_code_country="ee" id_tax="5" />
-			<taxRule iso_code_country="gr" id_tax="5" />
-			<taxRule iso_code_country="es" id_tax="5" />
-			<taxRule iso_code_country="fr" id_tax="5" />
-			<taxRule iso_code_country="it" id_tax="5" />
-			<taxRule iso_code_country="cy" id_tax="5" />
-
-			<taxRule iso_code_country="lv" id_tax="5" />
-			<taxRule iso_code_country="lt" id_tax="5" />
-			<taxRule iso_code_country="lu" id_tax="5" />
-			<taxRule iso_code_country="hu" id_tax="5" />
-			<taxRule iso_code_country="mt" id_tax="5" />
-			<taxRule iso_code_country="nl" id_tax="5" />
-			<taxRule iso_code_country="at" id_tax="5" />
-			<taxRule iso_code_country="pl" id_tax="5" />
-			<taxRule iso_code_country="pt" id_tax="5" />
-
-			<taxRule iso_code_country="ro" id_tax="5" />
-			<taxRule iso_code_country="si" id_tax="5" />
-			<taxRule iso_code_country="sk" id_tax="5" />
-			<taxRule iso_code_country="fi" id_tax="5" />
-			<taxRule iso_code_country="se" id_tax="5" />
-			<taxRule iso_code_country="uk" id_tax="5" />
-		</taxRulesGroup>
-		
 		<taxRulesGroup name="PL Exempted Rate (0%)">
 			<taxRule iso_code_country="be" id_tax="6" />
 
@@ -210,7 +142,6 @@
 			<taxRule iso_code_country="se" id_tax="6" />
 			<taxRule iso_code_country="uk" id_tax="6" />
 		</taxRulesGroup>
-		
 	</taxes>
 
 	<units>

localization/sa.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<localizationPack name="Saoudi Arabie" version="1.0">
+<localizationPack name="Saudi Arabia" version="1.0">
 	<currencies>
 		<currency name="Riyal" iso_code="SAR" iso_code_num="682" sign="﷼" blank="1" conversion_rate="5.10682" format="2" decimals="1" />
 	</currencies>

localization/sg.xml

@@ -5,7 +5,7 @@
 	</currencies>
 	<languages>
 		<language iso_code="en" />
-		<language iso_code="tw" />
+		<language iso_code="ms" />
 		<language iso_code="zh" />
 	</languages>
 	<taxes>
@@ -16,10 +16,10 @@
 		</taxRulesGroup>
 	</taxes>
 	<units>
-		<unit type="weight" value="市制" />
+		<unit type="weight" value="kg"/>
-		<unit type="volume" value="市升" />
+	    <unit type="volume" value="L"/>
-		<unit type="short_distance" value="市厘" />
+	    <unit type="short_distance" value="cm"/>
-		<unit type="base_distance" value="里" />
+	    <unit type="base_distance" value="m"/>
-		<unit type="long_distance" value="市里" />
+	    <unit type="long_distance" value="km"/>
 	</units>
 </localizationPack>

localization/si.xml

@@ -7,10 +7,10 @@
 		<language iso_code="si" />
 	</languages>
 	<taxes>
-		<tax id="1" name="DDV SI 20%" rate="20" />
+		<tax id="1" name="DDV SI 22%" rate="22" />
-		<tax id="2" name="DDV SI 8.5%" rate="8.5" />
+		<tax id="2" name="DDV SI 9.5%" rate="9.5" />
 		
-		<taxRulesGroup name="SI Standard Rate (20%)">
+		<taxRulesGroup name="SI Standard Rate (22%)">
 			<taxRule iso_code_country="be" id_tax="1" />
 			<taxRule iso_code_country="bg" id_tax="1" />
 			<taxRule iso_code_country="cz" id_tax="1" />
@@ -40,7 +40,7 @@
 			<taxRule iso_code_country="uk" id_tax="1" />
 		</taxRulesGroup>
 
-		<taxRulesGroup name="SI Reduced Rate (8.5%)">
+		<taxRulesGroup name="SI Reduced Rate (9.5%)">
 			<taxRule iso_code_country="be" id_tax="2" />
 			<taxRule iso_code_country="bg" id_tax="2" />
 			<taxRule iso_code_country="cz" id_tax="2" />
@@ -70,7 +70,7 @@
 			<taxRule iso_code_country="uk" id_tax="2" />
 		</taxRulesGroup>
 
-		<taxRulesGroup name="SI Foodstuff Rate (8.5%)">
+		<taxRulesGroup name="SI Foodstuff Rate (9.5%)">
 			<taxRule iso_code_country="be" id_tax="2" />
 			<taxRule iso_code_country="bg" id_tax="2" />
 			<taxRule iso_code_country="cz" id_tax="2" />
@@ -100,7 +100,7 @@
 			<taxRule iso_code_country="uk" id_tax="2" />
 		</taxRulesGroup>
 
-		<taxRulesGroup name="SI Books Rate (8.5%)">
+		<taxRulesGroup name="SI Books Rate (9.5%)">
 			<taxRule iso_code_country="be" id_tax="2" />
 			<taxRule iso_code_country="bg" id_tax="2" />
 			<taxRule iso_code_country="cz" id_tax="2" />

localization/tn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<localizationPack name="TN">
+<localizationPack name="Tunisia">
   <currencies>
     <currency name="Tunisian Dinar" iso_code="TND" iso_code_num="788" sign="DT" blank="0" conversion_rate="1.000000" format="2" decimals="1"/>
   </currencies>

mails/en/backoffice_order.html

@@ -20,7 +20,7 @@
 <td>&nbsp;</td>
 </tr>
 <tr>
-<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">A new command has been generated to you.</td>
+<td style="background-color: {color}; color: #fff; font-size: 12px; font-weight: bold; padding: 0.5em 1em;" align="left">A new order has been generated to you.</td>
 </tr>
 <tr>
 <td>&nbsp;</td>

mails/en/backoffice_order.txt

@@ -1,6 +1,6 @@
 Hi {firstname} {lastname},
 
-A new command has been generated to you.
+A new order has been generated to you.
 
 Go on {order_link} to finalize the payment.
 

modules/pscleaner/pscleaner.php

@@ -474,6 +474,7 @@ class PSCleaner extends Module
 					'stock',
 					'stock_available',
 					'stock_mvt',
+					'tag',
 				);
 				foreach ($tables as $table)
 					$db->execute('TRUNCATE TABLE `'._DB_PREFIX_.bqSQL($table).'`');

themes/default/css/rtl.css

@@ -1,2 +1,2 @@
-* { direction: rtl !important; }
+body { direction: rtl !important; }
 #page { text-align: right !important; }