diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 28d008097dc..2147b0d1959 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -207,4 +207,4 @@ alter table llx_propaldet add column localtax1_type char(1) after localtax1_tx; alter table llx_propaldet add column localtax2_type char(1) after localtax2_tx; -- END TASK #204 -ALTER TABLE llx_menu CHANGE enabled enabled TINYINT(1) UNSIGNED NULL DEFAULT '1'; \ No newline at end of file +ALTER TABLE llx_menu MODIFY COLUMN enabled TINYINT(1) UNSIGNED NULL DEFAULT '1'; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 9e9e9bf67de..c92bdb0809d 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -1,8 +1,8 @@ -- ======================================================================== --- Copyright (C) 2007 Patrick Raguin --- Copyright (C) 2007-2008 Laurent Destailleur --- Copyright (C) 2009 Regis Houssin --- Copyright (C) 2012 Marcos García +-- Copyright (C) 2007 Patrick Raguin +-- Copyright (C) 2007-2008 Laurent Destailleur +-- Copyright (C) 2009-2012 Regis Houssin +-- Copyright (C) 2012 Marcos García -- -- 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 @@ -23,31 +23,24 @@ CREATE TABLE llx_menu ( rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY, - menu_handler varchar(16) NOT NULL, -- Menu handler name - entity integer DEFAULT 1 NOT NULL, -- Multi company id - module varchar(64), -- Module name if record is added by a module - type varchar(4) NOT NULL, -- Menu top or left - mainmenu varchar(100) NOT NULL, -- Name family/module for top menu (home, companies, ...) - leftmenu varchar(100) NULL, -- Name family/module for left menu (setup, info, ...) - fk_menu integer NOT NULL, -- 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu - fk_mainmenu varchar(24), -- - fk_leftmenu varchar(24), -- - position integer NOT NULL, -- Sort order of entry - url varchar(255) NOT NULL, -- Relative (or absolute) url to go - target varchar(100) NULL, -- Target of Url link - titre varchar(255) NOT NULL, -- Key for menu translation - langs varchar(100), -- Lang file to load for translation - level smallint, -- Deprecated. Not used. - perms varchar(255), -- Condition to show enabled or disabled - enabled tinyint(1) UNSIGNED NULL default '1', -- Condition to show or hide - usertype integer NOT NULL default '0', -- 0 if menu for all users, 1 for external only, 2 for internal only + menu_handler varchar(16) NOT NULL, -- Menu handler name + entity integer DEFAULT 1 NOT NULL, -- Multi company id + module varchar(64), -- Module name if record is added by a module + type varchar(4) NOT NULL, -- Menu top or left + mainmenu varchar(100) NOT NULL, -- Name family/module for top menu (home, companies, ...) + leftmenu varchar(100) NULL, -- Name family/module for left menu (setup, info, ...) + fk_menu integer NOT NULL, -- 0 or Id of mother menu line, or -1 if we use fk_mainmenu and fk_leftmenu + fk_mainmenu varchar(24), -- + fk_leftmenu varchar(24), -- + position integer NOT NULL, -- Sort order of entry + url varchar(255) NOT NULL, -- Relative (or absolute) url to go + target varchar(100) NULL, -- Target of Url link + titre varchar(255) NOT NULL, -- Key for menu translation + langs varchar(100), -- Lang file to load for translation + level smallint, -- Deprecated. Not used. + perms varchar(255), -- Condition to show enabled or disabled + enabled tinyint(1) UNSIGNED NULL DEFAULT 1, -- Condition to show or hide + usertype integer NOT NULL DEFAULT 0, -- 0 if menu for all users, 1 for external only, 2 for internal only tms timestamp -) ENGINE=innodb; - --- --- List of codes for the field entity --- --- 1 : first company product --- 2 : second company product --- 3 : etc... --- \ No newline at end of file + +) ENGINE=innodb; \ No newline at end of file