diff --git a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql index 94572f0378e4c3d430982adcd15677944385c2d5..e2205b29953806e2a4d659c5e8d726a968374d09 100644 --- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql +++ b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql @@ -75,8 +75,8 @@ insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_ alter table llx_cond_reglement add (decalage smallint(6) default 0); -alter table llx_commande add fk_cond_reglement int(11) DEFAULT NULL; -alter table llx_commande add fk_mode_reglement int(11) DEFAULT NULL; +alter table llx_commande add fk_cond_reglement integer DEFAULT NULL; +alter table llx_commande add fk_mode_reglement integer DEFAULT NULL; alter table llx_categorie drop column fk_statut; diff --git a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql index cfaa7ce105e0c37b449c576a4be35f26a303e334..070682d3c50fd601cdba93e66ee6329c0adef738 100644 --- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql +++ b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql @@ -143,8 +143,8 @@ alter table llx_categorie ADD type int not null default '0'; -- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref; create table `llx_categorie_societe` ( - `fk_categorie` int(11) not null, - `fk_societe` int(11) not null, + `fk_categorie` integer not null, + `fk_societe` integer not null, UNIQUE KEY `fk_categorie` (`fk_categorie`,`fk_societe`), KEY `fk_societe` (`fk_societe`) ) ENGINE=innodb; @@ -154,8 +154,8 @@ alter table `llx_categorie_societe` add constraint `fk_categorie_societe_categor alter table `llx_categorie_societe` add constraint `fk_categorie_societe_fk_soc` foreign key(`fk_societe`) REFERENCES `llx_societe` (`rowid`); create table `llx_categorie_product` ( - `fk_categorie` int(11) not null, - `fk_product` int(11) not null, + `fk_categorie` integer not null, + `fk_product` integer not null, PRIMARY KEY (`fk_categorie`,`fk_product`), KEY `idx_categorie_product_fk_categorie` (`fk_categorie`), KEY `idx_categorie_product_fk_product` (`fk_product`) @@ -169,24 +169,24 @@ alter table `llx_categorie_product` -- Ajout gestion du droit de pret drop table if exists `llx_droitpret_rapport`; create table `llx_droitpret_rapport` ( - `rowid` int(11) NOT NULL auto_increment, + `rowid` integer NOT NULL auto_increment, `date_envoie` datetime NOT NULL, `format` varchar(10) NOT NULL, `date_debut` datetime NOT NULL, `date_fin` datetime NOT NULL, `fichier` varchar(255) NOT NULL, - `nbfact` int(11) NOT NULL, + `nbfact` integer NOT NULL, PRIMARY KEY (`rowid`) ) ENGINE=innodb; -- Gestion des menu CREATE TABLE `llx_menu` ( - `rowid` int(11) NOT NULL, + `rowid` integer NOT NULL, `menu_handler` varchar(16) NOT NULL default 'auguria', `type` enum('top','left') NOT NULL default 'left', `mainmenu` varchar(100) NOT NULL, - `fk_menu` int(11) NOT NULL, + `fk_menu` integer NOT NULL, `order` tinyint(4) NOT NULL, `url` varchar(255) NOT NULL, `target` varchar(100) NULL, @@ -200,15 +200,15 @@ CREATE TABLE `llx_menu` ( ) ENGINE=innodb; create table `llx_menu_constraint` ( - `rowid` int(11) NOT NULL, + `rowid` integer NOT NULL, `action` varchar(255) NOT NULL, PRIMARY KEY (`rowid`) ) ENGINE=innodb; create table `llx_menu_const` ( - `rowid` int(11) NOT NULL auto_increment, - `fk_menu` int(11) NOT NULL, - `fk_constraint` int(11) NOT NULL, + `rowid` integer NOT NULL auto_increment, + `fk_menu` integer NOT NULL, + `fk_constraint` integer NOT NULL, `user` tinyint(4) NOT NULL default '2', PRIMARY KEY (`rowid`) ) ENGINE=innodb; diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 6f09732d0dcee88510888ada6aa7d523c2356f01..093265e217c1c5a388a19612677de2b3407ce652 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -34,5 +34,5 @@ UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontof ALTER TABLE llx_user add COLUMN fk_user integer; -- margin on contracts -alter table llx_contratdet add column fk_product_fournisseur_price int(11) after info_bits; +alter table llx_contratdet add column fk_product_fournisseur_price integer after info_bits; alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 1138199101509f54a6cc57dcb082d0254997a2f4..ac4eea1de83cb750c46c0a436ed12d0a3037db00 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -52,9 +52,9 @@ create table llx_contratdet total_localtax1 double(24,8) DEFAULT 0, -- Total Local tax 1 de la ligne total_localtax2 double(24,8) DEFAULT 0, -- Total Local tax 2 de la ligne total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale - info_bits integer DEFAULT 0, -- TVA NPR ou non - fk_product_fournisseur_price int(11) DEFAULT NULL, -- supplier price id - buy_price_ht double(24,8) DEFAULT '0.00000000', -- buying price + info_bits integer DEFAULT 0, -- TVA NPR ou non + fk_product_fournisseur_price integer DEFAULT NULL, -- supplier price id + buy_price_ht double(24,8) DEFAULT NULL, -- buying price fk_user_author integer NOT NULL DEFAULT 0, fk_user_ouverture integer,