Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

controllers/admin/AdminImportController.php

@@ -2435,17 +2435,12 @@ class AdminImportControllerCore extends AdminController
 				$discount_rate = (float)$info['discount_rate'];
 				$tax_rate = (float)$info['tax_rate'];
 
-				// checks if one product is there only once
-				if (isset($product['id_product']))
-				{
-					if ($product['id_product'] == $id_product_attribute)
-						$this->errors[] = sprintf($this->l('Product (%d/%D) cannot be added twice (at line %d).'), $id_product,
-							$id_product_attribute, $current_line + 1);
-					else
-						$product['id_product'] = $id_product_attribute;
-				}
+				// checks if one product/attribute is there only once
+				if (isset($products[$id_product][$id_product_attribute]))
+					$this->errors[] = sprintf($this->l('Product/Attribute (%d/%d) cannot be added twice (at line %d).'), $id_product,
+						$id_product_attribute, $current_line + 1);					
 				else
-					$product['id_product'] = 0;
+					$products[$id_product][$id_product_attribute] = $quantity_expected;	
 
 				// checks parameters
 				if (false === ($supplier_reference = ProductSupplier::getProductSupplierReference($id_product, $id_product_attribute, $supply_order->id_supplier)))

controllers/admin/AdminLocalizationController.php

@@ -28,9 +28,6 @@ class AdminLocalizationControllerCore extends AdminController
 {
 	public function __construct()
 	{
-		$this->className = 'Configuration';
-		$this->table = 'configuration';
-
 		parent::__construct();
 
 		$this->fields_options = array(

controllers/admin/AdminLogsController.php

@@ -64,10 +64,20 @@ class AdminLogsControllerCore extends AdminController
 		$this->_join .= ' LEFT JOIN '._DB_PREFIX_.'employee e ON (a.id_employee = e.id_employee)';
 		parent::__construct();
 	}
+	
+	public function processDelete()
+	{
+		return Logger::eraseAllLogs();
+	}
 
 	public function initToolbar()
 	{
 		parent::initToolbar();
+		$this->toolbar_btn['delete'] = array(
+			'short' => 'Erase',
+			'desc' => $this->l('Erase all'),
+			'js' => 'if (confirm(\''.$this->l('Are you sure?').'\')) document.location = \''.$this->context->link->getAdminLink('AdminLogs').'&token='.$this->token.'&deletelog=1\';'
+		);
 		unset($this->toolbar_btn['new']);
 	}
 

controllers/admin/AdminManufacturersController.php

@@ -256,7 +256,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'lang' => true,
 					'cols' => 60,
 					'rows' => 10,
-					'class' => 'rte',
+					'autoload_rte' => 'rte', //Enable TinyMCE editor for short description
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
@@ -266,7 +266,7 @@ class AdminManufacturersControllerCore extends AdminController
 					'lang' => true,
 					'cols' => 60,
 					'rows' => 10,
-					'class' => 'rte',
+					'autoload_rte' => 'rte', //Enable TinyMCE editor for description
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
@@ -730,4 +730,4 @@ class AdminManufacturersControllerCore extends AdminController
 	{
 		return true;
 	}
-}
+}

controllers/admin/AdminStatsTabController.php

@@ -131,8 +131,13 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
 
 		$modules = $this->getModules();
 		$module_instance = array();
-		foreach ($modules as $module)
+		foreach ($modules as $m => $module)
+		{
 			$module_instance[$module['name']] = Module::getInstanceByName($module['name']);
+			$modules[$m]['displayName'] = $module_instance[$module['name']]->displayName;
+		}
+
+		uasort($modules, array($this, 'checkModulesNames'));
 
 		$tpl->assign(array(
 			'current' => self::$currentIndex,
@@ -143,6 +148,11 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
 
 		return $tpl->fetch();
 	}
+	
+	public function checkModulesNames($a, $b)
+	{
+		return (bool)($a['displayName'] > $b['displayName']);
+	}
 
 	protected function getModules()
 	{

controllers/admin/AdminSuppliersController.php

@@ -94,7 +94,8 @@ class AdminSuppliersControllerCore extends AdminController
 					'rows' => 10,
 					'lang' => true,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}',
-					'desc' => $this->l('Will appear in the supplier list')
+					'desc' => $this->l('Will appear in the supplier list'),
+					'autoload_rte' => 'rte' //Enable TinyMCE editor for short description
 				),
 				array(
 					'type' => 'text',

controllers/admin/AdminSupplyOrdersController.php

@@ -754,7 +754,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
 				'orderby' => false,
 				'filter' => false,
 				'search' => false,
-				'hint' => 'Note that you can see details on the receptions - per products',
+				'hint' => $this->l('Note that you can see details on the receptions - per products'),
 			),
 			'quantity_expected' => array(
 				'title' => $this->l('Quantity expected'),

controllers/admin/AdminTranslationsController.php

@@ -460,7 +460,9 @@ class AdminTranslationsControllerCore extends AdminController
 		if (!$default_language || !Validate::isLanguageIsoCode($default_language))
 			return false;
 		// 1 - Scan mails files
-		$mails = scandir(_PS_MAIL_DIR_.$default_language.'/');
+		$mails = array();
+		if (Tools::file_exists_cache(_PS_MAIL_DIR_.$default_language.'/'))
+			$mails = scandir(_PS_MAIL_DIR_.$default_language.'/');
 
 		$mails_new_lang = array();
 
@@ -579,7 +581,9 @@ class AdminTranslationsControllerCore extends AdminController
 			if (preg_match('#^translations\/'.$iso_code.'\/tabs.php#Ui', $file['filename'], $matches) && Validate::isLanguageIsoCode($iso_code))
 			{
 				// Include array width new translations tabs
-				$tabs = include _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename'];
+				$tabs = array();
+				if (Tools::file_exists_cache(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename']))
+					$tabs = include_once(_PS_ROOT_DIR_.DIRECTORY_SEPARATOR.$file['filename']);
 
 				foreach ($tabs as $class_name => $translations)
 				{