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 a5e76b08b4116e9921751c6ad73d0f018d652c3e..bb0ef5cf9900213fd03597f7d470a583cfc7867a 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 @@ -16,6 +16,8 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); DROP TABLE llx_product_ca; +DROP TABLE llx_document; +DROP TABLE llx_dolibarr_modules; ALTER TABLE llx_menu MODIFY COLUMN fk_mainmenu varchar(24); ALTER TABLE llx_menu MODIFY COLUMN fk_leftmenu varchar(24); @@ -220,4 +222,3 @@ ALTER TABLE llx_propaldet MODIFY COLUMN localtax2_type varchar(1); -- END TASK #204 ALTER TABLE llx_menu MODIFY COLUMN enabled varchar(255) NULL default '1'; -ALTER TABLE llx_document MODIFY COLUMN permissions varchar(9) DEFAULT 'rw-rw-rw'; diff --git a/htdocs/install/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql deleted file mode 100644 index 0dc9cc376ec4a4e2246ff46d789e5d3fc7f3cf6a..0000000000000000000000000000000000000000 --- a/htdocs/install/mysql/tables/llx_document.sql +++ /dev/null @@ -1,29 +0,0 @@ --- =================================================================== --- Copyright (C) 2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> --- --- 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 2 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/>. --- --- =================================================================== - -create table llx_document -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - name varchar(255) NOT NULL, - file_name varchar(255) NOT NULL, - file_extension varchar(5) NOT NULL, - date_generation datetime NULL, - fk_owner integer NULL, - fk_group integer NULL, - permissions varchar(9) DEFAULT 'rw-rw-rw' -)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql deleted file mode 100644 index a711ab7d9cc480a564cabdf11e25b775e68d3a62..0000000000000000000000000000000000000000 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql +++ /dev/null @@ -1,19 +0,0 @@ --- ============================================================================ --- Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr> --- --- 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 2 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_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity); diff --git a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql deleted file mode 100644 index 50c86d2911a24629cc1ef15d28120406b85e94ba..0000000000000000000000000000000000000000 --- a/htdocs/install/mysql/tables/llx_dolibarr_modules.sql +++ /dev/null @@ -1,30 +0,0 @@ --- ======================================================================== --- Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> --- Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> --- --- 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 2 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/>. --- --- ======================================================================== - -create table llx_dolibarr_modules -( - numero integer, - entity integer DEFAULT 1 NOT NULL, -- multi company id - active tinyint DEFAULT 0 NOT NULL, - active_date datetime NOT NULL, - active_version varchar(25) NOT NULL - -)ENGINE=innodb; - -