diff --git a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql index 74410774b51..03da0b3bc37 100644 --- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql +++ b/htdocs/install/mysql/migration/2.9.0-3.0.0.sql @@ -128,7 +128,7 @@ ALTER TABLE llx_commande ADD COLUMN ref_ext varchar(30) after entity; ALTER TABLE llx_propal ADD COLUMN ref_ext varchar(30) after entity; ALTER TABLE llx_user ADD COLUMN ref_ext varchar(30) after entity; ALTER TABLE llx_societe ADD COLUMN ref_ext varchar(60) after entity; -ALTER TABLE llx_product ADD COLUMN ref_ext varchar(32) after entity; +ALTER TABLE llx_product ADD COLUMN ref_ext varchar(30) after entity; ALTER TABLE llx_mailing_cibles CHANGE COLUMN url source_url integer; diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index d089caed0e4..4a4e781fd60 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -52,8 +52,9 @@ DELETE FROM llx_const WHERE __DECRYPT('name')__ = 'MAIN_CONFIRM_AJAX'; ALTER TABLE llx_facture_fourn ADD COLUMN ref_ext varchar(30) AFTER entity; ALTER TABLE llx_commande_fournisseur ADD COLUMN ref_ext varchar(30) AFTER entity; -ALTER TABLE llx_commande ADD COLUMN fk_demand_reason int(11) AFTER fk_availability; +ALTER TABLE llx_adherent ADD COLUMN ref_ext varchar(30) after entity; +ALTER TABLE llx_commande ADD COLUMN fk_demand_reason int(11) AFTER fk_availability; ALTER TABLE llx_facturedet DROP INDEX uk_fk_remise_except; ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture); diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index caf6f6848a4..69bf706ca68 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -30,6 +30,8 @@ create table llx_adherent ( rowid integer AUTO_INCREMENT PRIMARY KEY, entity integer DEFAULT 1 NOT NULL, -- multi company id + ref_ext varchar(30), -- reference into an external system (not used by dolibarr) + civilite varchar(6), nom varchar(50), prenom varchar(50), diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 9e105cb7966..9708c47e082 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -23,10 +23,6 @@ create table llx_commande ( rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp, - fk_soc integer NOT NULL, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande - ref varchar(30) NOT NULL, -- order reference number entity integer DEFAULT 1 NOT NULL, -- multi company id @@ -34,6 +30,10 @@ create table llx_commande ref_int varchar(30), -- reference into an internal system (used by dolibarr) ref_client varchar(30), -- reference for customer + fk_soc integer NOT NULL, + fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande + + tms timestamp, date_creation datetime, -- date de creation date_valid datetime, -- date de validation date_cloture datetime, -- date de cloture diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index ba3275229a7..4045afce371 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -30,10 +30,10 @@ create table llx_commande_fournisseur ref_ext varchar(30), -- reference into an external system (not used by dolibarr) ref_supplier varchar(30), - tms timestamp, fk_soc integer NOT NULL, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la commande + + tms timestamp, date_creation datetime, -- date de creation date_valid datetime, -- date de validation date_cloture datetime, -- date de cloture diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 31ef73d0059..66a61851cae 100644 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -24,16 +24,16 @@ create table llx_product ( rowid integer AUTO_INCREMENT PRIMARY KEY, + ref varchar(32) NOT NULL, + entity integer DEFAULT 1 NOT NULL, -- Multi company id + + ref_ext varchar(32), -- reference into an external system (not used by dolibarr) + datec datetime, tms timestamp, virtual tinyint DEFAULT 0 NOT NULL, -- Not used. Used by external modules. Value 0 for physical product, 1 for virtual product fk_parent integer DEFAULT 0, -- Not used. Used by external modules. Virtual product id - ref varchar(32) NOT NULL, - entity integer DEFAULT 1 NOT NULL, -- Multi company id - - ref_ext varchar(32), -- reference into an external system (not used by dolibarr) - label varchar(255) NOT NULL, description text, note text, diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 152b3f812cd..cb866b0fe55 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -24,15 +24,14 @@ create table llx_propal ( rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_soc integer, - fk_projet integer DEFAULT 0, -- projet auquel est rattache la propale - ref varchar(30) NOT NULL, -- proposal reference number entity integer DEFAULT 1 NOT NULL, -- multi company id ref_ext varchar(30), -- reference into an external system (not used by dolibarr) - ref_client varchar(30), -- customer order number + ref_client varchar(30), -- customer proposal number + fk_soc integer, + fk_projet integer DEFAULT 0, -- projet auquel est rattache la propale datec datetime, -- date de creation datep date, -- date de la propal fin_validite datetime, -- date de fin de validite diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index d9f8294e102..a87d9da5eb7 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -24,6 +24,12 @@ create table llx_societe ( rowid integer AUTO_INCREMENT PRIMARY KEY, + nom varchar(60), -- company reference name + entity integer DEFAULT 1 NOT NULL, -- multi company id + + ref_ext varchar(60), -- reference into an external system (not used by dolibarr) + ref_int varchar(60), -- reference into an internal system (used by dolibarr) + statut tinyint DEFAULT 0, -- statut parent integer, tms timestamp, @@ -32,12 +38,6 @@ create table llx_societe status tinyint DEFAULT 1, -- cessation d'activité ( 1 -- en activité, 0 -- cessation d'activité) - nom varchar(60), -- company reference name - entity integer DEFAULT 1 NOT NULL, -- multi company id - - ref_ext varchar(60), -- reference into an external system (not used by dolibarr) - ref_int varchar(60), -- reference into an internal system (used by dolibarr) - code_client varchar(15), -- code client code_fournisseur varchar(15), -- code founisseur code_compta varchar(15), -- code compta client diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index 77141b33d12..a1f35145739 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -23,13 +23,16 @@ create table llx_user ( rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, -- multi company id + + ref_ext varchar(30), -- reference into an external system (not used by dolibarr) + datec datetime, tms timestamp, login varchar(24) NOT NULL, - entity integer DEFAULT 1 NOT NULL, -- multi company id pass varchar(32), pass_crypted varchar(128), - pass_temp varchar(32), -- temporary password when asked for forget password + pass_temp varchar(32), -- temporary password when asked for forget password name varchar(50), firstname varchar(50), office_phone varchar(20),