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

admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl

@@ -62,5 +62,10 @@
 			</div>
 		</form>
 		<div class="clear">&nbsp;</div>
+		<script>
+			$(document).ready(function() {
+				$('table[name=\'list_table\']').hide();
+			});
+		</script>
 	{/if}
 {/block}

classes/stock/StockManager.php

@@ -473,7 +473,7 @@ class StockManagerCore implements StockManagerInterface
 		$query->where('od.product_id = '.(int)$id_product);
 		if (0 != $id_product_attribute)
 			$query->where('od.product_attribute_id = '.(int)$id_product_attribute);
-		$query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.date_add = o.date_upd');
+		$query->leftJoin('order_history', 'oh', 'oh.id_order = o.id_order AND oh.id_order_state = o.current_state');
 		$query->leftJoin('order_state', 'os', 'os.id_order_state = oh.id_order_state');
 		$query->where('os.shipped != 1');
 		$query->where('o.valid = 1 OR (os.id_order_state != '.(int)Configuration::get('PS_OS_ERROR').'
@@ -658,4 +658,4 @@ class StockManagerCore implements StockManagerInterface
 		return $stocks;
 	}
 
-}
+}

controllers/admin/AdminEmployeesController.php

@@ -343,7 +343,7 @@ class AdminEmployeesControllerCore extends AdminController
 		$email = $this->getFieldValue($obj, 'email');
 		if (!Validate::isEmail($email))
 	 		$this->errors[] = Tools::displayError('Invalid e-mail');
-		else if (Employee::employeeExists($email) && !Tools::getValue('id_employee'))
+		elseif (Employee::employeeExists($email) && (!Tools::getValue('id_employee') ||  ($employee = new Employee((int)Tools::getValue('id_employee'))) && $employee->email != $email))
 			$this->errors[] = Tools::displayError('An account already exists for this e-mail address:').' '.$email;
 	}
 

install-dev/upgrade/php/update_customer_default_group.php

@@ -0,0 +1,50 @@
+<?php
+/*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+public function update_customer_default_group()
+{
+	$filename = _PS_ROOT_DIR_.'/config/defines.inc.php';
+	$filename_old = str_replace('.inc.', '.old.', $filename);
+	copy($filename, $filename_old);
+	@chmod($filename_old, 0664);	
+	$content = file_get_contents($filename);
+	$pattern = "/define\('_PS_DEFAULT_CUSTOMER_GROUP_', (\d)\);/";
+	preg_match($pattern, $content, $matches);
+	if (!defined('_PS_DEFAULT_CUSTOMER_GROUP_'))
+			define('_PS_DEFAULT_CUSTOMER_GROUP_', ((isset($matches[1]) AND is_numeric($matches[1]))? (int)$matches[1] : 3));
+	$ps_customer_group = $this->db->getValue('SELECT value FROM `'._DB_PREFIX_.'configuration` WHERE name LIKE "PS_CUSTOMER_GROUP"', false);			
+	$str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');';
+	$str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');';				
+	$content = str_replace($str_old, $str_new, $content);
+	$result = (bool)file_put_contents($filename, $content);
+	if($result === true && file_exists($filename) && file_exists($filename_old))
+	{
+		@unlink($filename_old);
+		@chmod($filename, 0664);
+		return true;
+	}
+	return false;
+}

install-dev/upgrade/sql/1.5.4.0.sql

@@ -1,5 +1,7 @@
 SET NAMES 'utf8';
 
+/* PHP:update_customer_default_group(); */;
+
 UPDATE `PREFIX_meta` SET `page` = 'supplier' WHERE `page` = 'supply';
 
 ALTER TABLE  `PREFIX_image_type` CHANGE  `name`  `name` VARCHAR( 64 ) NOT NULL;