Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql

htdocs/install/mysql/tables/llx_holiday_config.key.sql

@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2012      Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_holiday_config ADD UNIQUE INDEX idx_holiday_config (name);
+

htdocs/install/mysql/tables/llx_holiday_config.sql

@@ -19,7 +19,7 @@
 CREATE TABLE llx_holiday_config 
 (
 rowid    integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
-name     VARCHAR( 255 ) NOT NULL UNIQUE,
+name     VARCHAR(128) NOT NULL,
 value    TEXT NULL
 ) 
 ENGINE=innodb;