diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql index df58ad3b95b6980edeb659386d04e208bd865661..d7bf4e25bafe5a575a65fa9a5981eb08d0d931fa 100755 --- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql +++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql @@ -183,6 +183,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays) values (13, 'Cotisation sur la valeur ajoutée des entreprises', 0, 1, 'TAXCVAE', '1'); ALTER TABLE llx_paiement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; +ALTER TABLE llx_product_price ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; -- Restore foreign key (on llx_expedition_methode before) on correct table (llx_c_shipment_mode) ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_expedition_methode; diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql index 638d339548e64c6971e8bd6571ab9b2f31169fc5..12f1257f1568da9be5721c7b00eb8d3804ff82e0 100644 --- a/htdocs/install/mysql/tables/llx_product_price.sql +++ b/htdocs/install/mysql/tables/llx_product_price.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> +-- Copyright (C) 2005-2012 Regis Houssin <regis@dolibarr.fr> -- Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es> -- -- This program is free software; you can redistribute it and/or modify @@ -19,21 +20,22 @@ create table llx_product_price ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - fk_product integer NOT NULL, - date_price datetime NOT NULL, - price_level smallint NULL DEFAULT 1, - price double(24,8) DEFAULT NULL, - price_ttc double(24,8) DEFAULT NULL, - price_min double(24,8) default NULL, - price_min_ttc double(24,8) default NULL, - price_base_type varchar(3) DEFAULT 'HT', - tva_tx double(6,3) NOT NULL, - recuperableonly integer NOT NULL DEFAULT '0', - localtax1_tx double(6,3) DEFAULT 0, - localtax2_tx double(6,3) DEFAULT 0, - fk_user_author integer, - tosell tinyint DEFAULT 1 + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, -- Multi company id + tms timestamp, + fk_product integer NOT NULL, + date_price datetime NOT NULL, + price_level smallint NULL DEFAULT 1, + price double(24,8) DEFAULT NULL, + price_ttc double(24,8) DEFAULT NULL, + price_min double(24,8) default NULL, + price_min_ttc double(24,8) default NULL, + price_base_type varchar(3) DEFAULT 'HT', + tva_tx double(6,3) NOT NULL, + recuperableonly integer NOT NULL DEFAULT '0', + localtax1_tx double(6,3) DEFAULT 0, + localtax2_tx double(6,3) DEFAULT 0, + fk_user_author integer, + tosell tinyint DEFAULT 1 )ENGINE=innodb;