diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index 4bbe431b3dc..e25eb41e4e8 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -25,7 +25,8 @@ alter table llx_propal add column note_public text after note; ALTER TABLE llx_societe ADD mode_reglement INT( 11 ) DEFAULT NULL ; ALTER TABLE llx_societe ADD cond_reglement INT( 11 ) DEFAULT '1' NOT NULL ; -ALTER TABLE llx_societe ADD tva_assuj tinyint DEFAULT '1' NOT NULL ; +ALTER TABLE llx_societe ADD tva_assuj tinyint; +ALTER TABLE llx_societe MODIFY tva_assuj tinyint; alter table llx_product add gencode varchar(255) DEFAULT NULL; @@ -53,3 +54,9 @@ create table llx_commande_fournisseur_model_pdf )type=innodb; alter table llx_categorie add fk_statut smallint DEFAULT 0; + + +alter table llx_actioncomm modify datea datetime; +alter table llx_actioncomm add column datec datetime after id; +alter table llx_actioncomm add column datep datetime after datec; +alter table llx_actioncomm add column tms timestamp after datea; diff --git a/mysql/tables/llx_actioncomm.sql b/mysql/tables/llx_actioncomm.sql index ef06ddcf0f2..921b69d3736 100644 --- a/mysql/tables/llx_actioncomm.sql +++ b/mysql/tables/llx_actioncomm.sql @@ -26,7 +26,10 @@ create table llx_actioncomm ( id integer AUTO_INCREMENT PRIMARY KEY, - datea timestamp, -- action date + datec datetime, -- date creation + datep datetime, -- date 0% + datea datetime, -- date 100% + tms timestamp, -- date modif fk_action integer, label varchar(50) NOT NULL, -- libelle de l'action fk_soc integer, diff --git a/mysql/tables/llx_societe.sql b/mysql/tables/llx_societe.sql index d5b2df24c06..d3d8d43e66d 100644 --- a/mysql/tables/llx_societe.sql +++ b/mysql/tables/llx_societe.sql @@ -64,5 +64,5 @@ create table llx_societe remise_client real DEFAULT 0, -- remise systématique pour le client mode_reglement integer DEFAULT 0, -- mode de réglement cond_reglement integer DEFAULT 1 NOT NULL, -- condition de réglement - tva_assuj tinyint DEFAULT 1 NOT NULL,-- assujéti ou non à la TVA + tva_assuj tinyint, -- assujéti ou non à la TVA )type=innodb;