diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
index 23a96cc996b9691272ff575f9017a58aafcc7251..b8fcc1489ffdbad1c799862fac78c574002c58c6 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_categories.sql
@@ -17,10 +17,10 @@
-- ===================================================================
CREATE TABLE llx_osc_categories (
- rowid int(11) unsigned NOT NULL auto_increment,
- dolicatid int(11) NOT NULL default '0',
- osccatid int(11) NOT NULL default '0',
+ rowid integer unsigned NOT NULL auto_increment,
+ dolicatid integer NOT NULL default '0',
+ osccatid integer NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY dolicatid (dolicatid),
UNIQUE KEY osccatid (osccatid)
-) ENGINE=InnoDB COMMENT='Correspondance categorie Dolibarr categorie OSC';
+) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
index 3f878e97ff54a9d1185035ce468f4e34d397a29f..994d38f84c477382a2658015927001be60ce977e 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_customer.sql
@@ -17,9 +17,9 @@
-- ===================================================================
CREATE TABLE llx_osc_customer (
- rowid int(11) NOT NULL default '0',
+ rowid integer NOT NULL default '0',
datem datetime default NULL,
- fk_soc int(11) NOT NULL default '0',
+ fk_soc integer NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_soc (fk_soc)
-) ENGINE=InnoDB COMMENT='Table transition client OSC - societe Dolibarr';
+) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
index a2cb1ad814644a2ece3ce6b49a66ec8b40c3cf54..e4798c40ba1856673e1191faec5147e03504402f 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_order.sql
@@ -17,9 +17,9 @@
-- ===================================================================
CREATE TABLE llx_osc_order (
- rowid int(11) NOT NULL default '0',
+ rowid integer NOT NULL default '0',
datem datetime default NULL,
- fk_commande int(11) NOT NULL default '0',
+ fk_commande integer NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_commande (fk_commande)
-) ENGINE=InnoDB COMMENT='Table transition commande OSC - commande Dolibarr';
+) ENGINE=InnoDB;
diff --git a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
index dba9ca1fef184580d894107caff165fe9ade8458..87810534bc87ff0c39e359bad3bf9c1197adae85 100755
--- a/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
+++ b/dev/dbmodel/emulate_oscommerce/llx_osc_product.sql
@@ -17,11 +17,11 @@
-- ===================================================================
CREATE TABLE llx_osc_product (
- rowid int(11) NOT NULL default '0',
+ rowid integer NOT NULL default '0',
datem datetime default NULL,
- fk_product int(11) NOT NULL default '0',
+ fk_product integer NOT NULL default '0',
PRIMARY KEY (rowid),
UNIQUE KEY fk_product (fk_product)
-) ENGINE=InnoDB COMMENT='Table transition produit OSC - produit Dolibarr';
+) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
index 381e2822fdce66b99f7ec77a486454854971a1ef..be3b786e8a7eea7a7f1bc1921d5a8a3dba7b5dc5 100644
--- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
+++ b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
@@ -4,7 +4,7 @@
-- when current version is 2.6.0 or higher.
--
-alter table llx_tmp_caisse modify fk_tva int(11) NOT NULL;
+alter table llx_tmp_caisse modify fk_tva integer NOT NULL;
drop table llx_facture_stats;
drop table llx_stock_valorisation;
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 492d44fcde50893f8b4a50c077adf6942bef348d..a6eb3ba401bb9e386b75c5c588f027c810a53e41 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
@@ -61,23 +61,23 @@ ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur;
ALTER TABLE llx_product_fournisseur_price ADD charges DOUBLE( 24, 8 ) DEFAULT 0 AFTER unitprice;
ALTER TABLE llx_product_fournisseur_price ADD unitcharges DOUBLE( 24, 8 ) DEFAULT 0 AFTER charges;
-alter table llx_commandedet add column fk_product_fournisseur_price int(11) after info_bits;
+alter table llx_commandedet add column fk_product_fournisseur_price integer after info_bits;
alter table llx_commandedet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
alter table llx_commandedet drop column marge_tx;
alter table llx_commandedet drop column marque_tx;
-alter table llx_facturedet add column fk_product_fournisseur_price int(11) after info_bits;
+alter table llx_facturedet add column fk_product_fournisseur_price integer after info_bits;
alter table llx_facturedet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
-alter table llx_propaldet add column fk_product_fournisseur_price int(11) after info_bits;
+alter table llx_propaldet add column fk_product_fournisseur_price integer after info_bits;
alter table llx_propaldet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
alter table llx_propaldet drop column pa_ht;
alter table llx_propaldet drop column marge_tx;
alter table llx_propaldet drop column marque_tx;
-ALTER TABLE llx_commande CHANGE COLUMN fk_demand_reason fk_input_reason INT(11) NULL DEFAULT NULL;
-ALTER TABLE llx_propal CHANGE COLUMN fk_demand_reason fk_input_reason INT(11) NULL DEFAULT NULL;
-ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_methode_commande fk_input_method INT(11) NULL DEFAULT 0;
+ALTER TABLE llx_commande CHANGE COLUMN fk_demand_reason fk_input_reason integer NULL DEFAULT NULL;
+ALTER TABLE llx_propal CHANGE COLUMN fk_demand_reason fk_input_reason integer NULL DEFAULT NULL;
+ALTER TABLE llx_commande_fournisseur CHANGE COLUMN fk_methode_commande fk_input_method integer NULL DEFAULT 0;
INSERT INTO llx_const (name, value, type, note, visible) values ('PRODUCT_CODEPRODUCT_ADDON','mod_codeproduct_leopard','yesno','Module to control product codes',0);
diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql
index 38138f54a3e1584879f2fdc51490c0e9d4c68f3a..1ad017a3128e24ef0587641553a56d177a4e5cd8 100644
--- a/htdocs/install/mysql/tables/llx_commandedet.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet.sql
@@ -48,11 +48,10 @@ create table llx_commandedet
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non
buy_price_ht double(24,8) DEFAULT 0, -- prix d'achat HT
- fk_product_fournisseur_price int(11) DEFAULT NULL, -- reference prix fournisseur
+ fk_product_fournisseur_price integer DEFAULT NULL, -- reference prix fournisseur
special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0,
import_key varchar(14)
-
)ENGINE=innodb;
--
diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql
index 4dd8ba15a39a56756bba740214b732a90a3f615e..30de9a02893b4b1b91ce7f121756c4a7946fb2b7 100644
--- a/htdocs/install/mysql/tables/llx_facturedet.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet.sql
@@ -49,7 +49,7 @@ create table llx_facturedet
date_end datetime DEFAULT NULL, -- date fin si service
info_bits integer DEFAULT 0, -- TVA NPR ou non
buy_price_ht double(24,8) DEFAULT 0, -- prix d'achat HT
- fk_product_fournisseur_price int(11) DEFAULT NULL, -- reference prix fournisseur
+ fk_product_fournisseur_price integer DEFAULT NULL, -- reference prix fournisseur
fk_code_ventilation integer DEFAULT 0 NOT NULL,
fk_export_compta integer DEFAULT 0 NOT NULL,
special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales
diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql
index fb438a53830fa3360c5288ed444d7881713f59aa..3f5d273b937686995de1ddde91a4ca6b1320b652 100644
--- a/htdocs/install/mysql/tables/llx_propaldet.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet.sql
@@ -48,7 +48,7 @@ create table llx_propaldet
info_bits integer DEFAULT 0, -- TVA NPR ou non
buy_price_ht double(24,8) DEFAULT 0, -- prix d'achat HT
- fk_product_fournisseur_price int(11) DEFAULT NULL, -- reference prix fournisseur
+ fk_product_fournisseur_price integer DEFAULT NULL, -- reference prix fournisseur
special_code integer DEFAULT 0, -- code pour les lignes speciales
rang integer DEFAULT 0 -- ordre affichage sur la propal