diff --git a/dev/dbmodel/dolibarr_schema.mwb b/dev/dbmodel/dolibarr_schema.mwb index 227a7e45550cd9a77a00cf403ac04ca8cb8641bf..39407ba53835c4e50d3c2ee096652cd3e8bad5c4 100644 Binary files a/dev/dbmodel/dolibarr_schema.mwb and b/dev/dbmodel/dolibarr_schema.mwb differ diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql index ebb207711be8f232e313118cc0012c46dbe97aef..30e52a6786e0272a7785418a8d9811180da0f824 100755 --- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql +++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql @@ -6,10 +6,34 @@ -- when current version is 2.8.0 or higher. -- - +-- rename llx_product_det ALTER TABLE llx_product_det RENAME TO llx_product_lang; ALTER TABLE llx_product_lang ADD UNIQUE INDEX uk_product_lang (fk_product, lang); ALTER TABLE llx_product_lang ADD CONSTRAINT fk_product_lang_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); +-- add products variants ability ALTER TABLE llx_product ADD COLUMN virtual tinyint DEFAULT 0 NOT NULL AFTER tms; ALTER TABLE llx_product ADD COLUMN fk_parent integer DEFAULT 0 AFTER virtual; + +create table llx_product_variant +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + ref varchar(64) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- multi company id + active tinyint DEFAULT 1 NOT NULL, + rang integer DEFAULT 0 +)type=innodb; + +ALTER TABLE llx_product_variant ADD UNIQUE INDEX uk_product_variant_ref (ref, entity); + +create table llx_product_variant_lang +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_product_variant integer DEFAULT 0 NOT NULL, + lang varchar(5) NOT NULL, + label varchar(64) NOT NULL +)type=innodb; + +ALTER TABLE llx_product_variant_lang ADD UNIQUE INDEX uk_product_variant_lang (fk_product_variant, lang); +ALTER TABLE llx_product_variant_lang ADD CONSTRAINT fk_product_variant_lang_fk_product_variant FOREIGN KEY (fk_product_variant) REFERENCES llx_product_variant (rowid); diff --git a/htdocs/install/mysql/tables/llx_product_variant.key.sql b/htdocs/install/mysql/tables/llx_product_variant.key.sql new file mode 100644 index 0000000000000000000000000000000000000000..e5fa9390446b1e5f186d45b55711808569691c77 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_variant.key.sql @@ -0,0 +1,23 @@ +-- ============================================================================ +-- Copyright (C) 2010 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- +-- $Id$ +-- ============================================================================ + + +ALTER TABLE llx_product_variant ADD UNIQUE INDEX uk_product_variant_ref (ref, entity); + diff --git a/htdocs/install/mysql/tables/llx_product_variant.sql b/htdocs/install/mysql/tables/llx_product_variant.sql new file mode 100644 index 0000000000000000000000000000000000000000..4bd42d74ebea89c074e38279de896b1f18318bdc --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_variant.sql @@ -0,0 +1,29 @@ +-- ============================================================================ +-- Copyright (C) 2010 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- +-- $Id$ +-- ============================================================================ + +create table llx_product_variant +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + ref varchar(64) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- multi company id + active tinyint DEFAULT 1 NOT NULL, + rang integer DEFAULT 0 +)type=innodb; diff --git a/htdocs/install/mysql/tables/llx_product_variant_lang.key.sql b/htdocs/install/mysql/tables/llx_product_variant_lang.key.sql new file mode 100644 index 0000000000000000000000000000000000000000..6818083d2ca876174eee9a69bd086f84e7271a7b --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_variant_lang.key.sql @@ -0,0 +1,26 @@ +-- ============================================================================ +-- Copyright (C) 2010 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- +-- $Id$ +-- ============================================================================ + + +ALTER TABLE llx_product_variant_lang ADD UNIQUE INDEX uk_product_variant_lang (fk_product_variant, lang); + + +ALTER TABLE llx_product_variant_lang ADD CONSTRAINT fk_product_variant_lang_fk_product_variant FOREIGN KEY (fk_product_variant) REFERENCES llx_product_variant (rowid); + diff --git a/htdocs/install/mysql/tables/llx_product_variant_lang.sql b/htdocs/install/mysql/tables/llx_product_variant_lang.sql new file mode 100644 index 0000000000000000000000000000000000000000..53fc09f6ca61316200a83fd09be74f700e3820c9 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_product_variant_lang.sql @@ -0,0 +1,27 @@ +-- ============================================================================ +-- Copyright (C) 2010 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, write to the Free Software +-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-- +-- $Id$ +-- ============================================================================ + +create table llx_product_variant_lang +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_product_variant integer DEFAULT 0 NOT NULL, + lang varchar(5) NOT NULL, + label varchar(64) NOT NULL +)type=innodb; diff --git a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql index 1a35f711489c53f1feba0a37a00dac2641035c2a..99234b6660f47a2895f8477b543646732f0ebd19 100644 --- a/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql +++ b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql @@ -19,7 +19,7 @@ -- =========================================================================== --- Supprime orhpelins pour permettre mont�e de la cl� +-- Supprime orhpelins pour permettre montee de la cle -- V4 DELETE llx_usergroup_rights FROM llx_usergroup_rights LEFT JOIN llx_usergroup ON llx_usergroup_rights.fk_usergroup = llx_usergroup.rowid WHERE llx_usergroup.rowid IS NULL;