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
deleted file mode 100644
index e2205b29953806e2a4d659c5e8d726a968374d09..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
+++ /dev/null
@@ -1,958 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.0.0
--- sans AUCUNE erreur ni warning
---
-
-create table llx_paiementfourn_facturefourn
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_paiementfourn INT(11) DEFAULT NULL,
- fk_facturefourn INT(11) DEFAULT NULL,
- amount DOUBLE DEFAULT '0'
-) TYPE=innodb;
-ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_facture(fk_facturefourn);
-ALTER TABLE llx_paiementfourn_facturefourn ADD INDEX idx_paiementfourn_facturefourn_fk_paiement(fk_paiementfourn);
-
-
-drop table if exists llx_commande_model_pdf;
-drop table if exists llx_commande_fournisseur_model_pdf;
-
-alter table llx_commande add column note_public text after note;
-
-alter table llx_contrat add column note text;
-alter table llx_contrat add column note_public text after note;
-
-alter table llx_facture add column note_public text after note;
-alter table llx_facture add column remise_absolue real DEFAULT 0 after remise_percent;
-alter table llx_facture add column close_code varchar(16) after remise;
-alter table llx_facture add column close_note varchar(128) after close_code;
-alter table llx_facture modify close_code varchar(16);
-
-alter table llx_propal add column note_public text after note;
-alter table llx_propal add column remise_absolue real DEFAULT 0 after remise_percent;
-
-alter table llx_commande add column remise_absolue real DEFAULT 0 after remise_percent;
-
-ALTER TABLE llx_societe add mode_reglement tinyint;
-ALTER TABLE llx_societe add cond_reglement tinyint;
-ALTER TABLE llx_societe add tva_assuj tinyint DEFAULT '1';
-ALTER TABLE llx_societe add email varchar(128) after url;
-
-ALTER TABLE llx_societe change active statut tinyint DEFAULT 0;
-
-ALTER TABLE llx_societe modify mode_reglement tinyint NULL;
-ALTER TABLE llx_societe modify cond_reglement tinyint NULL;
-ALTER TABLE llx_societe modify cond_reglement tinyint NULL;
-ALTER TABLE llx_societe modify fk_stcomm tinyint DEFAULT 0;
-ALTER TABLE llx_societe modify services tinyint DEFAULT 0;
-ALTER TABLE llx_societe modify client tinyint DEFAULT 0;
-ALTER TABLE llx_societe modify fournisseur tinyint DEFAULT 0;
-
-ALTER TABLE llx_societe add customer_bad tinyint DEFAULT 0 after fournisseur;
-ALTER TABLE llx_societe add customer_rate real DEFAULT 0 after customer_bad;
-ALTER TABLE llx_societe add supplier_rate real DEFAULT 0 after customer_rate;
-
-ALTER TABLE llx_societe modify siren varchar(16);
-ALTER TABLE llx_societe modify siret varchar(16);
-ALTER TABLE llx_societe modify ape varchar(16);
-ALTER TABLE llx_societe add idprof4 varchar(16) after ape;
-
-ALTER TABLE llx_societe drop column id;
-
-ALTER TABLE llx_societe modify parent integer;
-UPDATE llx_societe set parent = null where parent = 0;
-
-ALTER TABLE llx_product ADD COLUMN stock_loc VARCHAR(10) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN gencode VARCHAR(255) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN weight float DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN weight_units tinyint DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN canvas varchar(15) DEFAULT '';
-
-ALTER TABLE llx_stock_mouvement ADD COLUMN price FLOAT(13,4) DEFAULT 0;
-
-insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_facture, fdm, nbjour) values (6,'PROFORMA', 6,1, 'Proforma','R�glement avant livraison',0,0);
-
-alter table llx_cond_reglement add (decalage smallint(6) default 0);
-
-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;
-alter table llx_categorie add visible tinyint DEFAULT 1 NOT NULL;
-ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label);
-
-alter table llx_c_actioncomm add module varchar(16) DEFAULT NULL after libelle;
-
-delete from llx_c_actioncomm where id in (1,2,3,4,5,8,9,50);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 1, 'AC_TEL', 'system', 'Appel Téléphonique' ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 2, 'AC_FAX', 'system', 'Envoi Fax' ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 3, 'AC_PROP', 'system', 'Envoi Proposition' ,'propal');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 4, 'AC_EMAIL','system', 'Envoi Email' ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 5, 'AC_RDV', 'system', 'Rendez-vous' ,NULL);
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 8, 'AC_COM', 'system', 'Envoi Commande' ,'order');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values ( 9, 'AC_FAC', 'system', 'Envoi Facture' ,'invoice');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (50, 'AC_OTH', 'system', 'Autre' ,NULL);
-
-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 datep2 datetime after datep;
-alter table llx_actioncomm add column datea2 datetime after datea;
-alter table llx_actioncomm add column tms timestamp after datea2;
-alter table llx_actioncomm add column fk_commande integer after propalrowid;
-alter table llx_actioncomm add column fk_parent integer NOT NULL default 0 after fk_contact;
-alter table llx_actioncomm add column durationp real after percent;
-alter table llx_actioncomm add column durationa real after durationp;
-alter table llx_actioncomm add column fk_projet integer after label;
-alter table llx_actioncomm add column punctual smallint NOT NULL default 1 after priority;
-
-
-update llx_actioncomm set datec = datea where datec is null;
-update llx_actioncomm set datep = datea where datep is null AND percent < 100;
-update llx_actioncomm set datep = datec where datea is null AND datep is null AND percent < 100;
-update llx_actioncomm set datea = datec where datea is null AND datep is null AND percent = 100;
-update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail';
-
-
-
-drop table if exists llx_expedition_model_pdf;
-
-
-create table llx_product_det
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_product integer DEFAULT 0 NOT NULL,
- lang varchar(5) DEFAULT 0 NOT NULL,
- label varchar(255) NOT NULL,
- description text,
- note text
-)ENGINE=innodb;
-
-ALTER TABLE `llx_propal` ADD `date_livraison` DATE;
-ALTER TABLE `llx_commande` ADD `date_livraison` DATE;
-update llx_commande set date_livraison = null where date_livraison = '0000-00-00';
-update llx_commande set date_livraison = null where date_livraison = '1970-01-01';
-
-ALTER TABLE llx_facture_fourn DROP INDEX facnumber;
-ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc);
-ALTER TABLE llx_facture_fourn ADD note_public text after note;
-alter table llx_facture_fourn add column `type` smallint DEFAULT 0 NOT NULL after facnumber;
-
-ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_facture (fk_facture_fourn);
-ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_facture FOREIGN KEY (fk_facture_fourn) REFERENCES llx_facture_fourn (rowid);
-
-
-ALTER TABLE llx_facturedet ADD COLUMN fk_remise_except integer NULL AFTER remise;
-ALTER TABLE llx_facturedet ADD COLUMN total_ht real AFTER price;
-ALTER TABLE llx_facturedet ADD COLUMN total_tva real AFTER total_ht;
-ALTER TABLE llx_facturedet ADD COLUMN total_ttc real AFTER total_tva;
-ALTER TABLE llx_facturedet ADD COLUMN info_bits integer DEFAULT 0 AFTER date_end;
-ALTER TABLE llx_facturedet modify fk_product integer NULL;
-
-UPDATE llx_facturedet SET info_bits=0 where (fk_remise_except IS NULL OR fk_remise_except = 0);
-UPDATE llx_facturedet SET fk_product=NULL where fk_product=0;
-
-ALTER TABLE llx_propaldet ADD COLUMN total_ht real AFTER price;
-ALTER TABLE llx_propaldet ADD COLUMN total_tva real AFTER total_ht;
-ALTER TABLE llx_propaldet ADD COLUMN total_ttc real AFTER total_tva;
-ALTER TABLE llx_propaldet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc;
-
-ALTER TABLE llx_commandedet ADD COLUMN total_ht real AFTER price;
-ALTER TABLE llx_commandedet ADD COLUMN total_tva real AFTER total_ht;
-ALTER TABLE llx_commandedet ADD COLUMN total_ttc real AFTER total_tva;
-ALTER TABLE llx_commandedet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc;
-
-ALTER TABLE llx_contratdet ADD COLUMN total_ht real AFTER price_ht;
-ALTER TABLE llx_contratdet ADD COLUMN total_tva real AFTER total_ht;
-ALTER TABLE llx_contratdet ADD COLUMN total_ttc real AFTER total_tva;
-ALTER TABLE llx_contratdet ADD COLUMN info_bits integer DEFAULT 0 AFTER total_ttc;
-
-
-ALTER TABLE llx_commande ADD INDEX idx_commande_fk_soc (fk_soc);
-ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-
-ALTER TABLE llx_commande_fournisseur ADD INDEX idx_commande_fournisseur_fk_soc (fk_soc);
-ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-
-
-alter table llx_commande_fournisseur add note_public text after note;
-
-
-drop table if exists llx_avoir_model_pdf;
-
-
-drop table if exists llx_soc_recontact;
-
-
-update llx_const set name='PRODUIT_DESC_IN_FORM' where name='FORM_ADD_PROD_DESC';
-update llx_const set name='PRODUIT_CHANGE_PROD_DESC' where name='CHANGE_PROD_DESC';
-update llx_const set name='COMMANDE_ADD_PROD_DESC' where name='COM_ADD_PROD_DESC';
-update llx_const set name='PROPALE_ADD_PROD_DESC' where name='PROP_ADD_PROD_DESC';
-update llx_const set name='DON_FORM' where name='DONS_FORM';
-update llx_const set name='MAIN_SIZE_LISTE_LIMIT' where name='SIZE_LISTE_LIMIT';
-update llx_const set name='SOCIETE_FISCAL_MONTH_START' where name='FISCAL_MONTH_START';
-update llx_const set visible=0 where name='FACTURE_DISABLE_RECUR';
-update llx_const set visible=0 where name='MAILING_EMAIL_FROM';
-update llx_const set visible=1 where name='PRODUIT_CONFIRM_DELETE_LINE';
-update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_MAIL_FROM';
-update llx_const set name='NOTIFICATION_EMAIL_FROM', visible=0 where name='MAIN_EMAIL_FROM';
-update llx_const set value=2048, visible=0 where name='MAIN_UPLOAD_DOC' and value=1;
-delete from llx_const where name = 'SIZE_LISTE_LIMIT';
-
-
-insert into llx_const(name,value,type,visible,note) values('MAIN_SHOW_DEVELOPMENT_MODULES','0','yesno',1,'Make development modules visible');
-
-delete from llx_const where name in ('OSC_CATALOG_URL','OSC_LANGUAGE_ID');
-update llx_const set visible=0 where name like 'OSC_DB_%';
-
-alter table llx_paiementfourn add statut smallint(6) NOT NULL DEFAULT 0;
-
-
-alter table llx_bank_url add column type enum("company","payment","member","subscription","donation","sc","payment_sc");
-update llx_bank_url set type=null where type='';
-alter table llx_bank_url modify type enum("company","payment","member","subscription","donation","sc","payment_sc") NOT NULL;
-
-update llx_bank_url set type = 'payment_supplier' where label = '(paiement)' and type='payment' and url like '%/fourn/%';
-
-alter table llx_bank_url drop index fk_bank;
-alter table llx_bank_url drop index fk_bank_2;
-alter table llx_bank_url drop index fk_bank_3;
-alter table llx_bank_url drop index fk_bank_4;
-alter table llx_bank_url drop index fk_bank_5;
-alter table llx_bank_url drop index fk_bank_6;
-alter table llx_bank_url drop index fk_bank_7;
-alter table llx_bank_url drop index fk_bank_8;
-alter table llx_bank_url drop index fk_bank_9;
-
-ALTER TABLE llx_bank_url DROP INDEX uk_bank_url;
-ALTER TABLE llx_bank_url ADD UNIQUE INDEX uk_bank_url (fk_bank,type);
-
-create table llx_societe_adresse_livraison
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- datec datetime,
- tms timestamp,
- fk_societe integer DEFAULT 0,
- nom varchar(60),
- address varchar(255),
- cp varchar(10),
- ville varchar(50),
- fk_departement integer DEFAULT 0,
- fk_pays integer DEFAULT 0,
- note text,
- fk_user_creat integer,
- fk_user_modif integer
-)ENGINE=innodb;
-
-alter table llx_societe_adresse_livraison add column label varchar(30) after tms;
-
-alter table llx_propal add column fk_adresse_livraison integer after date_livraison;
-alter table llx_commande add column fk_adresse_livraison integer after date_livraison;
-
-alter table llx_c_pays modify libelle varchar(50) NOT NULL;
-
-SET FOREIGN_KEY_CHECKS = 0;
-delete from llx_c_pays;
-SET FOREIGN_KEY_CHECKS = 1;
-insert into llx_c_pays (rowid,code,libelle) values (0, '' , '-' );
-insert into llx_c_pays (rowid,code,libelle) values (1, 'FR', 'France' );
-insert into llx_c_pays (rowid,code,libelle) values (2, 'BE', 'Belgique' );
-insert into llx_c_pays (rowid,code,libelle) values (3, 'IT', 'Italie' );
-insert into llx_c_pays (rowid,code,libelle) values (4, 'ES', 'Espagne' );
-insert into llx_c_pays (rowid,code,libelle) values (5, 'DE', 'Allemagne' );
-insert into llx_c_pays (rowid,code,libelle) values (6, 'CH', 'Suisse' );
-insert into llx_c_pays (rowid,code,libelle) values (7, 'GB', 'Royaume uni' );
-insert into llx_c_pays (rowid,code,libelle) values (8, 'IE', 'Irlande' );
-insert into llx_c_pays (rowid,code,libelle) values (9, 'CN', 'Chine' );
-insert into llx_c_pays (rowid,code,libelle) values (10, 'TN', 'Tunisie' );
-insert into llx_c_pays (rowid,code,libelle) values (11, 'US', 'Etats Unis' );
-insert into llx_c_pays (rowid,code,libelle) values (12, 'MA', 'Maroc' );
-insert into llx_c_pays (rowid,code,libelle) values (13, 'DZ', 'Algérie' );
-insert into llx_c_pays (rowid,code,libelle) values (14, 'CA', 'Canada' );
-insert into llx_c_pays (rowid,code,libelle) values (15, 'TG', 'Togo' );
-insert into llx_c_pays (rowid,code,libelle) values (16, 'GA', 'Gabon' );
-insert into llx_c_pays (rowid,code,libelle) values (17, 'NL', 'Pays Bas' );
-insert into llx_c_pays (rowid,code,libelle) values (18, 'HU', 'Hongrie' );
-insert into llx_c_pays (rowid,code,libelle) values (19, 'RU', 'Russie' );
-insert into llx_c_pays (rowid,code,libelle) values (20, 'SE', 'Suède' );
-insert into llx_c_pays (rowid,code,libelle) values (21, 'CI', 'Côte d\'Ivoire' );
-insert into llx_c_pays (rowid,code,libelle) values (22, 'SN', 'Sénégal' );
-insert into llx_c_pays (rowid,code,libelle) values (23, 'AR', 'Argentine' );
-insert into llx_c_pays (rowid,code,libelle) values (24, 'CM', 'Cameroun' );
-insert into llx_c_pays (rowid,code,libelle) values (25, 'PT', 'Portugal' );
-insert into llx_c_pays (rowid,code,libelle) values (26, 'SA', 'Arabie Saoudite');
-insert into llx_c_pays (rowid,code,libelle) values (27, 'MC', 'Monaco' );
-insert into llx_c_pays (rowid,code,libelle) values (28, 'AU', 'Australie' );
-insert into llx_c_pays (rowid,code,libelle) values (29, 'SG', 'Singapoure' );
-insert into llx_c_pays (rowid,code,libelle) values (30, 'AF', 'Afghanistan' );
-insert into llx_c_pays (rowid,code,libelle) values (31, 'AX', 'Iles Aland' );
-insert into llx_c_pays (rowid,code,libelle) values (32, 'AL', 'Albanie' );
-insert into llx_c_pays (rowid,code,libelle) values (33, 'AS', 'Samoa américaines');
-insert into llx_c_pays (rowid,code,libelle) values (34, 'AD', 'Andorre' );
-insert into llx_c_pays (rowid,code,libelle) values (35, 'AO', 'Angola' );
-insert into llx_c_pays (rowid,code,libelle) values (36, 'AI', 'Anguilla' );
-insert into llx_c_pays (rowid,code,libelle) values (37, 'AQ', 'Antarctique' );
-insert into llx_c_pays (rowid,code,libelle) values (38, 'AG', 'Antigua-et-Barbuda');
-insert into llx_c_pays (rowid,code,libelle) values (39, 'AM', 'Arménie' );
-insert into llx_c_pays (rowid,code,libelle) values (40, 'AW', 'Aruba' );
-insert into llx_c_pays (rowid,code,libelle) values (41, 'AT', 'Autriche' );
-insert into llx_c_pays (rowid,code,libelle) values (42, 'AZ', 'Azerbaïdjan' );
-insert into llx_c_pays (rowid,code,libelle) values (43, 'BS', 'Bahamas' );
-insert into llx_c_pays (rowid,code,libelle) values (44, 'BH', 'Bahreïn' );
-insert into llx_c_pays (rowid,code,libelle) values (45, 'BD', 'Bangladesh' );
-insert into llx_c_pays (rowid,code,libelle) values (46, 'BB', 'Barbade' );
-insert into llx_c_pays (rowid,code,libelle) values (47, 'BY', 'Biélorussie' );
-insert into llx_c_pays (rowid,code,libelle) values (48, 'BZ', 'Belize' );
-insert into llx_c_pays (rowid,code,libelle) values (49, 'BJ', 'Bénin' );
-insert into llx_c_pays (rowid,code,libelle) values (50, 'BM', 'Bermudes' );
-insert into llx_c_pays (rowid,code,libelle) values (51, 'BT', 'Bhoutan' );
-insert into llx_c_pays (rowid,code,libelle) values (52, 'BO', 'Bolivie' );
-insert into llx_c_pays (rowid,code,libelle) values (53, 'BA', 'Bosnie-Herzégovine');
-insert into llx_c_pays (rowid,code,libelle) values (54, 'BW', 'Botswana' );
-insert into llx_c_pays (rowid,code,libelle) values (55, 'BV', 'Ile Bouvet' );
-insert into llx_c_pays (rowid,code,libelle) values (56, 'BR', 'Brésil' );
-insert into llx_c_pays (rowid,code,libelle) values (57, 'IO', 'Territoire britannique de l\'Océan Indien');
-insert into llx_c_pays (rowid,code,libelle) values (58, 'BN', 'Brunei' );
-insert into llx_c_pays (rowid,code,libelle) values (59, 'BG', 'Bulgarie' );
-insert into llx_c_pays (rowid,code,libelle) values (60, 'BF', 'Burkina Faso' );
-insert into llx_c_pays (rowid,code,libelle) values (61, 'BI', 'Burundi' );
-insert into llx_c_pays (rowid,code,libelle) values (62, 'KH', 'Cambodge' );
-insert into llx_c_pays (rowid,code,libelle) values (63, 'CV', 'Cap-Vert' );
-insert into llx_c_pays (rowid,code,libelle) values (64, 'KY', 'Iles Cayman' );
-insert into llx_c_pays (rowid,code,libelle) values (65, 'CF', 'République centrafricaine');
-insert into llx_c_pays (rowid,code,libelle) values (66, 'TD', 'Tchad' );
-insert into llx_c_pays (rowid,code,libelle) values (67, 'CL', 'Chili' );
-insert into llx_c_pays (rowid,code,libelle) values (68, 'CX', 'Ile Christmas' );
-insert into llx_c_pays (rowid,code,libelle) values (69, 'CC', 'Iles des Cocos (Keeling)');
-insert into llx_c_pays (rowid,code,libelle) values (70, 'CO', 'Colombie' );
-insert into llx_c_pays (rowid,code,libelle) values (71, 'KM', 'Comores' );
-insert into llx_c_pays (rowid,code,libelle) values (72, 'CG', 'Congo' );
-insert into llx_c_pays (rowid,code,libelle) values (73, 'CD', 'République démocratique du Congo');
-insert into llx_c_pays (rowid,code,libelle) values (74, 'CK', 'Iles Cook' );
-insert into llx_c_pays (rowid,code,libelle) values (75, 'CR', 'Costa Rica' );
-insert into llx_c_pays (rowid,code,libelle) values (76, 'HR', 'Croatie' );
-insert into llx_c_pays (rowid,code,libelle) values (77, 'CU', 'Cuba' );
-insert into llx_c_pays (rowid,code,libelle) values (78, 'CY', 'Chypre' );
-insert into llx_c_pays (rowid,code,libelle) values (79, 'CZ', 'République Tchèque');
-insert into llx_c_pays (rowid,code,libelle) values (80, 'DK', 'Danemark' );
-insert into llx_c_pays (rowid,code,libelle) values (81, 'DJ', 'Djibouti' );
-insert into llx_c_pays (rowid,code,libelle) values (82, 'DM', 'Dominique' );
-insert into llx_c_pays (rowid,code,libelle) values (83, 'DO', 'République Dominicaine');
-insert into llx_c_pays (rowid,code,libelle) values (84, 'EC', 'Equateur' );
-insert into llx_c_pays (rowid,code,libelle) values (85, 'EG', 'Egypte' );
-insert into llx_c_pays (rowid,code,libelle) values (86, 'SV', 'Salvador' );
-insert into llx_c_pays (rowid,code,libelle) values (87, 'GQ', 'Guinée Equatoriale');
-insert into llx_c_pays (rowid,code,libelle) values (88, 'ER', 'Erythrée' );
-insert into llx_c_pays (rowid,code,libelle) values (89, 'EE', 'Estonie' );
-insert into llx_c_pays (rowid,code,libelle) values (90, 'ET', 'Ethiopie' );
-insert into llx_c_pays (rowid,code,libelle) values (91, 'FK', 'Iles Falkland' );
-insert into llx_c_pays (rowid,code,libelle) values (92, 'FO', 'Iles Féroé' );
-insert into llx_c_pays (rowid,code,libelle) values (93, 'FJ', 'Iles Fidji' );
-insert into llx_c_pays (rowid,code,libelle) values (94, 'FI', 'Finlande' );
-insert into llx_c_pays (rowid,code,libelle) values (95, 'GF', 'Guyane française');
-insert into llx_c_pays (rowid,code,libelle) values (96, 'PF', 'Polynésie française');
-insert into llx_c_pays (rowid,code,libelle) values (97, 'TF', 'Terres australes françaises');
-insert into llx_c_pays (rowid,code,libelle) values (98, 'GM', 'Gambie' );
-insert into llx_c_pays (rowid,code,libelle) values (99, 'GE', 'Géorgie' );
-insert into llx_c_pays (rowid,code,libelle) values (100, 'GH', 'Ghana' );
-insert into llx_c_pays (rowid,code,libelle) values (101, 'GI', 'Gibraltar' );
-insert into llx_c_pays (rowid,code,libelle) values (102, 'GR', 'Grèce' );
-insert into llx_c_pays (rowid,code,libelle) values (103, 'GL', 'Groenland' );
-insert into llx_c_pays (rowid,code,libelle) values (104, 'GD', 'Grenade' );
-insert into llx_c_pays (rowid,code,libelle) values (105, 'GP', 'Guadeloupe' );
-insert into llx_c_pays (rowid,code,libelle) values (106, 'GU', 'Guam' );
-insert into llx_c_pays (rowid,code,libelle) values (107, 'GT', 'Guatemala' );
-insert into llx_c_pays (rowid,code,libelle) values (108, 'GN', 'Guinée' );
-insert into llx_c_pays (rowid,code,libelle) values (109, 'GW', 'Guinée-Bissao' );
-insert into llx_c_pays (rowid,code,libelle) values (110, 'GY', 'Guyana' );
-insert into llx_c_pays (rowid,code,libelle) values (111, 'HT', 'Haïti' );
-insert into llx_c_pays (rowid,code,libelle) values (112, 'HM', 'Iles Heard et McDonald');
-insert into llx_c_pays (rowid,code,libelle) values (113, 'VA', 'Saint-Siège (Vatican)');
-insert into llx_c_pays (rowid,code,libelle) values (114, 'HN', 'Honduras' );
-insert into llx_c_pays (rowid,code,libelle) values (115, 'HK', 'Hong Kong' );
-insert into llx_c_pays (rowid,code,libelle) values (116, 'IS', 'Islande' );
-insert into llx_c_pays (rowid,code,libelle) values (117, 'IN', 'Inde' );
-insert into llx_c_pays (rowid,code,libelle) values (118, 'ID', 'Indonésie' );
-insert into llx_c_pays (rowid,code,libelle) values (119, 'IR', 'Iran' );
-insert into llx_c_pays (rowid,code,libelle) values (120, 'IQ', 'Iraq' );
-insert into llx_c_pays (rowid,code,libelle) values (121, 'IL', 'Israël' );
-insert into llx_c_pays (rowid,code,libelle) values (122, 'JM', 'Jamaïque' );
-insert into llx_c_pays (rowid,code,libelle) values (123, 'JP', 'Japon' );
-insert into llx_c_pays (rowid,code,libelle) values (124, 'JO', 'Jordanie' );
-insert into llx_c_pays (rowid,code,libelle) values (125, 'KZ', 'Kazakhstan' );
-insert into llx_c_pays (rowid,code,libelle) values (126, 'KE', 'Kenya' );
-insert into llx_c_pays (rowid,code,libelle) values (127, 'KI', 'Kiribati' );
-insert into llx_c_pays (rowid,code,libelle) values (128, 'KP', 'Corée du Nord' );
-insert into llx_c_pays (rowid,code,libelle) values (129, 'KR', 'Corée du Sud' );
-insert into llx_c_pays (rowid,code,libelle) values (130, 'KW', 'Koweït' );
-insert into llx_c_pays (rowid,code,libelle) values (131, 'KG', 'Kirghizistan' );
-insert into llx_c_pays (rowid,code,libelle) values (132, 'LA', 'Laos' );
-insert into llx_c_pays (rowid,code,libelle) values (133, 'LV', 'Lettonie' );
-insert into llx_c_pays (rowid,code,libelle) values (134, 'LB', 'Liban' );
-insert into llx_c_pays (rowid,code,libelle) values (135, 'LS', 'Lesotho' );
-insert into llx_c_pays (rowid,code,libelle) values (136, 'LR', 'Liberia' );
-insert into llx_c_pays (rowid,code,libelle) values (137, 'LY', 'Libye' );
-insert into llx_c_pays (rowid,code,libelle) values (138, 'LI', 'Liechtenstein' );
-insert into llx_c_pays (rowid,code,libelle) values (139, 'LT', 'Lituanie' );
-insert into llx_c_pays (rowid,code,libelle) values (140, 'LU', 'Luxembourg' );
-insert into llx_c_pays (rowid,code,libelle) values (141, 'MO', 'Macao' );
-insert into llx_c_pays (rowid,code,libelle) values (142, 'MK', 'ex-République yougoslave de Macédoine');
-insert into llx_c_pays (rowid,code,libelle) values (143, 'MG', 'Madagascar' );
-insert into llx_c_pays (rowid,code,libelle) values (144, 'MW', 'Malawi' );
-insert into llx_c_pays (rowid,code,libelle) values (145, 'MY', 'Malaisie' );
-insert into llx_c_pays (rowid,code,libelle) values (146, 'MV', 'Maldives' );
-insert into llx_c_pays (rowid,code,libelle) values (147, 'ML', 'Mali' );
-insert into llx_c_pays (rowid,code,libelle) values (148, 'MT', 'Malte' );
-insert into llx_c_pays (rowid,code,libelle) values (149, 'MH', 'Iles Marshall' );
-insert into llx_c_pays (rowid,code,libelle) values (150, 'MQ', 'Martinique' );
-insert into llx_c_pays (rowid,code,libelle) values (151, 'MR', 'Mauritanie' );
-insert into llx_c_pays (rowid,code,libelle) values (152, 'MU', 'Maurice' );
-insert into llx_c_pays (rowid,code,libelle) values (153, 'YT', 'Mayotte' );
-insert into llx_c_pays (rowid,code,libelle) values (154, 'MX', 'Mexique' );
-insert into llx_c_pays (rowid,code,libelle) values (155, 'FM', 'Micronésie' );
-insert into llx_c_pays (rowid,code,libelle) values (156, 'MD', 'Moldavie' );
-insert into llx_c_pays (rowid,code,libelle) values (157, 'MN', 'Mongolie' );
-insert into llx_c_pays (rowid,code,libelle) values (158, 'MS', 'Monserrat' );
-insert into llx_c_pays (rowid,code,libelle) values (159, 'MZ', 'Mozambique' );
-insert into llx_c_pays (rowid,code,libelle) values (160, 'MM', 'Birmanie' );
-insert into llx_c_pays (rowid,code,libelle) values (161, 'NA', 'Namibie' );
-insert into llx_c_pays (rowid,code,libelle) values (162, 'NR', 'Nauru' );
-insert into llx_c_pays (rowid,code,libelle) values (163, 'NP', 'Népal' );
-insert into llx_c_pays (rowid,code,libelle) values (164, 'AN', 'Antilles néerlandaises');
-insert into llx_c_pays (rowid,code,libelle) values (165, 'NC', 'Nouvelle-Calédonie');
-insert into llx_c_pays (rowid,code,libelle) values (166, 'NZ', 'Nouvelle-Zélande');
-insert into llx_c_pays (rowid,code,libelle) values (167, 'NI', 'Nicaragua' );
-insert into llx_c_pays (rowid,code,libelle) values (168, 'NE', 'Niger' );
-insert into llx_c_pays (rowid,code,libelle) values (169, 'NG', 'Nigeria' );
-insert into llx_c_pays (rowid,code,libelle) values (170, 'NU', 'Nioué' );
-insert into llx_c_pays (rowid,code,libelle) values (171, 'NF', 'Ile Norfolk' );
-insert into llx_c_pays (rowid,code,libelle) values (172, 'MP', 'Mariannes du Nord');
-insert into llx_c_pays (rowid,code,libelle) values (173, 'NO', 'Norvège' );
-insert into llx_c_pays (rowid,code,libelle) values (174, 'OM', 'Oman' );
-insert into llx_c_pays (rowid,code,libelle) values (175, 'PK', 'Pakistan' );
-insert into llx_c_pays (rowid,code,libelle) values (176, 'PW', 'Palaos' );
-insert into llx_c_pays (rowid,code,libelle) values (177, 'PS', 'territoire Palestinien Occupé');
-insert into llx_c_pays (rowid,code,libelle) values (178, 'PA', 'Panama' );
-insert into llx_c_pays (rowid,code,libelle) values (179, 'PG', 'Papouasie-Nouvelle-Guinée');
-insert into llx_c_pays (rowid,code,libelle) values (180, 'PY', 'Paraguay' );
-insert into llx_c_pays (rowid,code,libelle) values (181, 'PE', 'Pérou' );
-insert into llx_c_pays (rowid,code,libelle) values (182, 'PH', 'Philippines' );
-insert into llx_c_pays (rowid,code,libelle) values (183, 'PN', 'Iles Pitcairn' );
-insert into llx_c_pays (rowid,code,libelle) values (184, 'PL', 'Pologne' );
-insert into llx_c_pays (rowid,code,libelle) values (185, 'PR', 'Porto Rico' );
-insert into llx_c_pays (rowid,code,libelle) values (186, 'QA', 'Qatar' );
-insert into llx_c_pays (rowid,code,libelle) values (187, 'RE', 'Réunion' );
-insert into llx_c_pays (rowid,code,libelle) values (188, 'RO', 'Roumanie' );
-insert into llx_c_pays (rowid,code,libelle) values (189, 'RW', 'Rwanda' );
-insert into llx_c_pays (rowid,code,libelle) values (190, 'SH', 'Sainte-Hélène' );
-insert into llx_c_pays (rowid,code,libelle) values (191, 'KN', 'Saint-Christophe-et-Niévès');
-insert into llx_c_pays (rowid,code,libelle) values (192, 'LC', 'Sainte-Lucie' );
-insert into llx_c_pays (rowid,code,libelle) values (193, 'PM', 'Saint-Pierre-et-Miquelon');
-insert into llx_c_pays (rowid,code,libelle) values (194, 'VC', 'Saint-Vincent-et-les-Grenadines');
-insert into llx_c_pays (rowid,code,libelle) values (195, 'WS', 'Samoa' );
-insert into llx_c_pays (rowid,code,libelle) values (196, 'SM', 'Saint-Marin' );
-insert into llx_c_pays (rowid,code,libelle) values (197, 'ST', 'Sao Tomé-et-Principe');
-insert into llx_c_pays (rowid,code,libelle) values (198, 'RS', 'Serbie' );
-insert into llx_c_pays (rowid,code,libelle) values (199, 'SC', 'Seychelles' );
-insert into llx_c_pays (rowid,code,libelle) values (200, 'SL', 'Sierra Leone' );
-insert into llx_c_pays (rowid,code,libelle) values (201, 'SK', 'Slovaquie' );
-insert into llx_c_pays (rowid,code,libelle) values (202, 'SI', 'Slovénie' );
-insert into llx_c_pays (rowid,code,libelle) values (203, 'SB', 'Iles Salomon' );
-insert into llx_c_pays (rowid,code,libelle) values (204, 'SO', 'Somalie' );
-insert into llx_c_pays (rowid,code,libelle) values (205, 'ZA', 'Afrique du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (206, 'GS', 'Iles Géorgie du Sud et Sandwich du Sud');
-insert into llx_c_pays (rowid,code,libelle) values (207, 'LK', 'Sri Lanka' );
-insert into llx_c_pays (rowid,code,libelle) values (208, 'SD', 'Soudan' );
-insert into llx_c_pays (rowid,code,libelle) values (209, 'SR', 'Suriname' );
-insert into llx_c_pays (rowid,code,libelle) values (210, 'SJ', 'Iles Svalbard et Jan Mayen');
-insert into llx_c_pays (rowid,code,libelle) values (211, 'SZ', 'Swaziland' );
-insert into llx_c_pays (rowid,code,libelle) values (212, 'SY', 'Syrie' );
-insert into llx_c_pays (rowid,code,libelle) values (213, 'TW', 'Taïwan' );
-insert into llx_c_pays (rowid,code,libelle) values (214, 'TJ', 'Tadjikistan' );
-insert into llx_c_pays (rowid,code,libelle) values (215, 'TZ', 'Tanzanie' );
-insert into llx_c_pays (rowid,code,libelle) values (216, 'TH', 'Thaïlande' );
-insert into llx_c_pays (rowid,code,libelle) values (217, 'TL', 'Timor Oriental');
-insert into llx_c_pays (rowid,code,libelle) values (218, 'TK', 'Tokélaou' );
-insert into llx_c_pays (rowid,code,libelle) values (219, 'TO', 'Tonga' );
-insert into llx_c_pays (rowid,code,libelle) values (220, 'TT', 'Trinité-et-Tobago');
-insert into llx_c_pays (rowid,code,libelle) values (221, 'TR', 'Turquie' );
-insert into llx_c_pays (rowid,code,libelle) values (222, 'TM', 'Turkménistan' );
-insert into llx_c_pays (rowid,code,libelle) values (223, 'TC', 'Iles Turks-et-Caicos');
-insert into llx_c_pays (rowid,code,libelle) values (224, 'TV', 'Tuvalu' );
-insert into llx_c_pays (rowid,code,libelle) values (225, 'UG', 'Ouganda' );
-insert into llx_c_pays (rowid,code,libelle) values (226, 'UA', 'Ukraine' );
-insert into llx_c_pays (rowid,code,libelle) values (227, 'AE', 'Emirats arabes unis');
-insert into llx_c_pays (rowid,code,libelle) values (228, 'UM', 'Iles mineures éloignées des états-Unis');
-insert into llx_c_pays (rowid,code,libelle) values (229, 'UY', 'Uruguay' );
-insert into llx_c_pays (rowid,code,libelle) values (230, 'UZ', 'Ouzbékistan' );
-insert into llx_c_pays (rowid,code,libelle) values (231, 'VU', 'Vanuatu' );
-insert into llx_c_pays (rowid,code,libelle) values (232, 'VE', 'Vénézuela' );
-insert into llx_c_pays (rowid,code,libelle) values (233, 'VN', 'Viêt Nam' );
-insert into llx_c_pays (rowid,code,libelle) values (234, 'VG', 'Iles Vierges britanniques');
-insert into llx_c_pays (rowid,code,libelle) values (235, 'VI', 'Iles Vierges américaines');
-insert into llx_c_pays (rowid,code,libelle) values (236, 'WF', 'Wallis-et-Futuna');
-insert into llx_c_pays (rowid,code,libelle) values (237, 'EH', 'Sahara occidental');
-insert into llx_c_pays (rowid,code,libelle) values (238, 'YE', 'Yémen' );
-insert into llx_c_pays (rowid,code,libelle) values (239, 'ZM', 'Zambie' );
-insert into llx_c_pays (rowid,code,libelle) values (240, 'ZW', 'Zimbabwe' );
-
-delete from llx_c_regions where rowid='2901' and code_region='2901';
-delete from llx_c_departements where fk_region='2901';
-
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (2801,28,2801, '',0,'Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'QLD','',1,'','Queensland');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'SA','',1,'','South Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'ACT','',1,'','Australia Capital Territory');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'TAS','',1,'','Tasmania');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'WA','',1,'','Western Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801, 'NT','',1,'','Northern Territory');
-
-delete from llx_c_tva where rowid='291' and fk_pays='5';
-delete from llx_c_tva where rowid='292' and fk_pays='5';
-delete from llx_c_tva where rowid='291' and fk_pays='29';
-delete from llx_c_tva where rowid='292' and fk_pays='29';
-delete from llx_c_tva where rowid='261' and fk_pays='26';
-delete from llx_c_tva where rowid='262' and fk_pays='26';
-delete from llx_c_tva where rowid='263' and fk_pays='26';
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (281, 28, '10','0','VAT Rate 10',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (282, 28, '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (251,25, '17','0','VAT Rate 17',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (252,25, '12','0','VAT Rate 12',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (253,25, '0','0','VAT Rate 0',1);
-
-
-update llx_const set name='DON_ADDON_MODEL' where name='DON_ADDON';
-update llx_const set value='neptune' where value='pluton' and name = 'FACTURE_ADDON';
-update llx_const set value='azur' where value='orange' and name = 'PROPALE_ADDON';
-update llx_const set value='mod_commande_diamant' where value='mod_commande_jade' and name ='COMMANDE_ADDON';
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0);
-
-alter table llx_propal_model_pdf rename to llx_document_model;
-
-alter table llx_document_model DROP PRIMARY KEY;
-alter table llx_document_model add column rowid integer AUTO_INCREMENT PRIMARY KEY FIRST;
-alter table llx_document_model add column type varchar(20) NOT NULL after nom;
-update llx_document_model set type='propal' where type='';
-
-delete from llx_document_model where nom='adytek';
-delete from llx_document_model where nom='rouge' and type='order';
-delete from llx_document_model where nom='azur' and type='order';
-delete from llx_document_model where nom='orange' and type='propal';
-delete from llx_document_model where nom='transporteur' and type='shipping';
-delete from llx_document_model where nom='dorade' and type='shipping';
-
-
-
-
-ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber);
-
-alter table llx_facture_rec add column remise_absolue real default 0 after remise_percent;
-alter table llx_facture_rec add column fk_mode_reglement integer default 0 after fk_cond_reglement;
-alter table llx_facture_rec add column date_lim_reglement date after fk_mode_reglement;
-alter table llx_facture_rec add column note_public text after note;
-update llx_facture_rec set fk_mode_reglement='0' where fk_mode_reglement='NULL';
-
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_soc (fk_soc);
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_user_author (fk_user_author);
-ALTER TABLE llx_facture_rec ADD INDEX idx_facture_rec_fk_projet (fk_projet);
-
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
-
-ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre);
-
-ALTER TABLE llx_commandedet ADD COLUMN fk_remise_except integer NULL AFTER remise;
-ALTER TABLE llx_commandedet ADD COLUMN special_code tinyint(1) UNSIGNED DEFAULT 0;
-
-ALTER TABLE llx_propaldet ADD COLUMN fk_remise_except integer NULL AFTER remise;
-
-ALTER TABLE llx_contratdet ADD COLUMN fk_remise_except integer NULL AFTER remise;
-
-create table llx_livraison
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- fk_commande integer DEFAULT 0,
- fk_expedition integer,
- ref varchar(30) NOT NULL,
- date_creation datetime,
- date_valid datetime,
- fk_user_author integer,
- fk_user_valid integer,
- fk_statut smallint default 0,
- note text,
- note_public text,
- model_pdf varchar(50),
- date_livraison date default NULL,
- fk_adresse_livraison integer,
-
- UNIQUE INDEX (ref),
- key(fk_commande)
-)ENGINE=innodb;
-
-alter table llx_livraison drop foreign key fk_livraison_societe;
-alter table llx_livraison drop column fk_soc;
-
-
-create table llx_livraisondet
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_livraison integer,
- fk_commande_ligne integer NOT NULL,
- qty real,
- key(fk_livraison),
- key(fk_commande_ligne)
-)ENGINE=innodb;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (90, 'commande', 'internal', 'SALESREPSIGN', 'Commercial signataire de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (91, 'commande', 'internal', 'SALESREPFOLL', 'Commercial suivi de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (100, 'commande', 'external', 'BILLING', 'Contact client facturation commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (101, 'commande', 'external', 'CUSTOMER', 'Contact client suivi commande', 1);
-
-alter table llx_bank_account add column ref varchar(12) NOT NULL;
-alter table llx_bank_account add column url varchar(128);
-alter table llx_bank_account add column currency_code varchar(2) NOT NULL;
-alter table llx_bank_account add column min_allowed integer DEFAULT 0;
-alter table llx_bank_account add column min_desired integer DEFAULT 0;
-alter table llx_bank_account add column comment varchar(254);
-alter table llx_bank_account modify bic varchar(11);
-
-update llx_bank_account set currency_code='EU';
-update llx_bank_account set rappro=0 where courant=2;
-
-ALTER TABLE llx_bank ADD COLUMN fk_bordereau INTEGER DEFAULT 0;
-ALTER TABLE llx_bank ADD COLUMN banque varchar(255);
-ALTER TABLE llx_bank ADD COLUMN emetteur varchar(255);
-
-alter table llx_accountingsystem_det rename to llx_accountingaccount;
-
-
-insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (262,'Consulter tous les clients','commercial','r',1,'voir','client');
--- V4.1 insert into llx_user_rights(fk_user,fk_id) select distinct fk_user, '262' from llx_user_rights where fk_id = 261;
-update llx_rights_def set subperms='creer' where subperms='supprimer' AND module='user' AND perms='self' AND id=255;
-update llx_rights_def set module='tax' where module='compta' AND id in ('91','92','93');
-update llx_rights_def set subperms='receptionner' where id=186;
-
-
-alter table llx_commandedet add column rang integer DEFAULT 0;
-alter table llx_propaldet add column rang integer DEFAULT 0;
-
-alter table llx_facture drop column model;
-alter table llx_facture add column model_pdf varchar(50) after note_public;
-
-alter table llx_facture drop foreign key fk_facture_fk_facture;
-alter table llx_facture drop column fk_facture;
-alter table llx_facture add column fk_facture_source integer after fk_user_valid;
-ALTER TABLE llx_facture ADD INDEX idx_facture_fk_facture_source (fk_facture_source);
-ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_source_fk_facture FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid);
-alter table llx_facture add column type smallint DEFAULT 0 NOT NULL after facnumber;
-
-
--- Supprimme orphelins pour permettre montée de la clé
--- V4 DELETE llx_commandedet FROM llx_commandedet LEFT JOIN llx_commande ON llx_commandedet.fk_commande = llx_commande.rowid WHERE llx_commande.rowid IS NULL;
-
-ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_commande (fk_commande);
-ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid);
-
-
--- drop table llx_societe_remise_except;
-create table llx_societe_remise_except
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_soc integer NOT NULL,
- datec datetime,
- amount_ht real NOT NULL,
- fk_user integer NOT NULL,
- fk_facture integer,
- description varchar(255) NOT NULL
-)ENGINE=innodb;
-
-alter table llx_societe_remise_except ADD COLUMN amount_tva real DEFAULT 0 NOT NULL after amount_ht;
-alter table llx_societe_remise_except ADD COLUMN amount_ttc real DEFAULT 0 NOT NULL after amount_tva;
-alter table llx_societe_remise_except ADD COLUMN tva_tx real DEFAULT 0 NOT NULL after amount_ttc;
-alter table llx_societe_remise_except ADD COLUMN fk_facture_source integer after fk_user;
-
-update llx_societe_remise_except set amount_tva=0, tva_tx=0, amount_ttc = amount_ht where amount_ttc = 0;
-delete from llx_societe_remise_except WHERE amount_ht=0;
-
--- Supprimme orphelins pour permettre montée de la clé
--- V4 DELETE llx_societe_remise_except FROM llx_societe_remise_except LEFT JOIN llx_facturedet ON llx_societe_remise_except.fk_facture = llx_facturedet.rowid WHERE llx_facturedet.rowid IS NULL;
-
-ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture;
-ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_facture_source;
-
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_user (fk_user);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_soc (fk_soc);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_source (fk_facture_source);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (idp);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facturedet (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_source FOREIGN KEY (fk_facture_source) REFERENCES llx_facture (rowid);
-
-update llx_societe_remise_except set description='Remise sans description' where description is NULL or description ='';
-alter table llx_societe_remise_except modify description varchar(255) NOT NULL;
-
-insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 0, 'Durée de validitée des propales');
-
-alter table llx_propal add column ref_client varchar(30) after ref;
-
-alter table llx_societe_adresse_livraison drop column fk_departement;
-
-alter table llx_user change datelastaccess datelastlogin datetime;
-alter table llx_user add column datepreviouslogin datetime after datelastlogin;
-alter table llx_user add column ldap_sid varchar(255) DEFAULT NULL;
-alter table llx_user add column statut tinyint DEFAULT 1;
-alter table llx_user add column lang varchar(6);
-alter table llx_user add column pass_crypted varchar(128) after pass;
-
-alter table llx_user add column office_phone varchar(20);
-alter table llx_user add column office_fax varchar(20);
-alter table llx_user add column user_mobile varchar(20);
-
-
-alter table llx_user modify login varchar(24) NOT NULL;
-alter table llx_user drop code;
-
-
-update llx_user set pass_crypted = MD5(pass) where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) < 32;
-update llx_user set pass_crypted = pass where pass IS NOT NULL AND pass_crypted IS NULL and length(pass) = 32;
-update llx_user set pass = NULL where length(pass) = 32;
-
-ALTER TABLE llx_user modify fk_societe integer;
-ALTER TABLE llx_user modify fk_socpeople integer;
-alter table llx_user add column fk_member integer after fk_socpeople;
-
-update llx_user set fk_societe = NULL where fk_societe = 0;
-update llx_user set fk_socpeople = NULL where fk_socpeople = 0;
-update llx_user set fk_member = NULL where fk_member = 0;
-
-ALTER TABLE llx_user DROP INDEX login;
-
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login);
-
-ALTER TABLE llx_user ADD INDEX uk_user_fk_societe (fk_societe);
-
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member (fk_member);
-
-
-alter table llx_boxes add column fk_user integer;
-
-alter table llx_commande_fournisseur drop column fk_soc_contact;
-alter table llx_commande drop column fk_soc_contact;
-alter table llx_livraison drop column fk_soc_contact;
-alter table llx_propal drop column fk_soc_contact;
-
-alter table llx_commandedet drop column label;
-
-
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_VAL_ORDER_SUUPLIER','Validation commande fournisseur','Déclenché lors de la validation d\'une commande fournisseur','order_supplier');
-
-
-
-drop table if exists llx_sqltables;
-
-
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_1;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_2;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_3;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_4;
-ALTER IGNORE TABLE llx_categorie_product DROP FOREIGN KEY llx_categorie_product_ibfk_5;
-
-ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_product ADD CONSTRAINT fk_categorie_product_product_rowid FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
-
-ALTER TABLE llx_categorie_product ADD PRIMARY KEY (fk_categorie, fk_product);
-
-alter table llx_product modify label varchar(255) NOT NULL;
-alter table llx_product modify description text;
-ALTER TABLE llx_product ADD COLUMN price_base_type varchar(3) DEFAULT 'HT' AFTER price;
-ALTER TABLE llx_product ADD COLUMN price_ttc float(12,4) DEFAULT 0 AFTER price_base_type;
-alter table llx_product_det modify label varchar(255) NOT NULL;
-alter table llx_product_det modify description text;
-
-create table llx_accountingdebcred
-(
- fk_transaction integer NOT NULL,
- fk_account integer NOT NULL,
- amount real NOT NULL,
- direction varchar(1) NOT NULL
-)ENGINE=innodb;
-
-alter table llx_facturedet_rec add column total_ht real;
-alter table llx_facturedet_rec add column total_tva real;
-alter table llx_facturedet_rec add column total_ttc real;
-
-alter table llx_adherent add column phone varchar(30) after email;
-alter table llx_adherent add column phone_perso varchar(30) after phone;
-alter table llx_adherent add column phone_mobile varchar(30) after phone_perso;
-
-delete from llx_adherent_type where libelle IS NULL;
-alter table llx_adherent_type modify libelle varchar(50) NOT NULL;
-
-update llx_facture set fk_facture_source=null where fk_facture_source is not null and type = 0;
-update llx_facture set fk_statut=2 where paye=1;
-update llx_facture set fk_statut=2 where close_code is not null and close_code != '' and close_code != 'replaced';
-
-
-update llx_boxes set fk_user = 0 where fk_user IS NULL;
-ALTER TABLE llx_boxes modify fk_user integer default 0 NOT NULL;
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_boxes FROM llx_boxes LEFT JOIN llx_boxes_def ON llx_boxes.box_id = llx_boxes_def.rowid WHERE llx_boxes_def.rowid IS NULL;
-
-ALTER TABLE llx_boxes ADD INDEX idx_boxes_boxid (box_id);
--- V4 ALTER TABLE llx_boxes ADD CONSTRAINT fk_boxes_box_id FOREIGN KEY (box_id) REFERENCES llx_boxes_def (rowid);
-
-ALTER TABLE llx_boxes ADD INDEX idx_boxes_fk_user (fk_user);
-
-
-create table llx_categorie_fournisseur
-(
- fk_categorie integer NOT NULL,
- fk_societe integer NOT NULL,
- UNIQUE (fk_categorie, fk_societe)
-)ENGINE=innodb;
-
-
-create table llx_fournisseur_ca
-(
- fk_societe integer,
- date_calcul datetime,
- year smallint UNSIGNED,
- ca_genere float,
- UNIQUE (fk_societe, year)
-)ENGINE=innodb;
-
-alter table llx_fournisseur_ca add ca_achat float(11,2) DEFAULT 0;
-
-create table llx_product_ca
-(
- fk_product integer,
- date_calcul datetime,
- year smallint UNSIGNED,
- ca_genere float,
- UNIQUE (fk_product, year)
-)ENGINE=innodb;
-
-create table llx_commande_fournisseur_dispatch
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_commande integer,
- fk_product integer,
- qty float, -- quantit�
- fk_entrepot integer,
- fk_user integer,
- datec datetime
-)ENGINE=innodb;
-
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX (fk_commande);
-
-create table llx_stock_valorisation
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp, -- date technique mise a jour automatiquement
- date_valo datetime, -- date de valorisation
- fk_product integer NOT NULL, -- id du produit concerne par l'operation
- qty_ope float(9,3), -- quantite de l'operation
- price_ope float(12,4), -- prix unitaire du produit concerne par l'operation
- valo_ope float(12,4), -- valorisation de l'operation
- price_pmp float(12,4), -- valeur PMP de l'operation
- qty_stock float(9,3) DEFAULT 0, -- qunatite en stock
- valo_pmp float(12,4), -- valorisation du stock en PMP
- fk_stock_mouvement integer, -- id du mouvement de stock
-
- key(fk_product)
-)ENGINE=innodb;
-
-
-create table llx_entrepot_valorisation
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp, -- date technique mise a jour automatiquement
- date_calcul date, -- date auquel a ete calcule la valeur
- fk_entrepot integer UNSIGNED NOT NULL ,
- valo_pmp float(12,4), -- valoristaion du stock en PMP
- key(fk_entrepot)
-)ENGINE=innodb;
-
-ALTER TABLE llx_entrepot ADD COLUMN valo_pmp float(12,4) DEFAULT 0;
-
-create table llx_user_entrepot
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_entrepot integer UNSIGNED, -- pointe sur llx_entrepot
- fk_user integer UNSIGNED, -- pointe sur llx_user
- consult tinyint(1) UNSIGNED,
- send tinyint(1) UNSIGNED
-)ENGINE=innodb;
-
-create table llx_product_subproduct
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_product integer NOT NULL, -- id du produit maitre
- fk_product_subproduct integer NOT NULL, -- id du sous-produit
- UNIQUE(fk_product, fk_product_subproduct)
-)ENGINE=innodb;
-
-create table llx_bordereau_cheque
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- datec datetime,
- date_bordereau date,
- number mediumint,
- amount float(12,2),
- nbcheque smallint UNSIGNED DEFAULT 0,
- fk_bank_account integer,
- fk_user_author integer,
- note text,
- statut tinyint(1) UNSIGNED DEFAULT 0
-)ENGINE=innodb;
-
-alter table llx_product_price add price_level tinyint(4) NULL DEFAULT 1;
-alter table llx_product_price add column price_ttc float(12,4) DEFAULT 0 after price;
-alter table llx_product_price add column price_base_type varchar(3) DEFAULT 'HT' after price_ttc;
-
-ALTER TABLE llx_document_model ADD UNIQUE uk_document_model (nom,type);
-
-ALTER TABLE llx_chargesociales drop column date_pai;
-
-UPDATE llx_facture SET type=0 where type=3;
-
-create table llx_export_model
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- label varchar(50) NOT NULL,
- type varchar(20) NOT NULL,
- field text
-)ENGINE=innodb;
-
-ALTER table llx_export_model add fk_user integer DEFAULT 0 NOT NULL after rowid;
-
-ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label);
-
-UPDATE llx_rights_def SET ID=ID+1001 WHERE ID BETWEEN 180 AND 189 AND module='fournisseur';
-UPDATE llx_user_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1001 WHERE fk_id BETWEEN 180 AND 189;
-
-UPDATE llx_rights_def SET ID=ID+1000 WHERE ID BETWEEN 230 AND 236 AND module='fournisseur';
-UPDATE llx_user_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1000 WHERE fk_id BETWEEN 230 AND 236;
-
-UPDATE llx_rights_def SET ID=ID+1 WHERE ID BETWEEN 1320 AND 1320 AND module='facture';
-UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1320 AND 1320;
-
-UPDATE llx_rights_def SET ID=ID+1 WHERE ID BETWEEN 1420 AND 1420 AND module='commande';
-UPDATE llx_user_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420;
-UPDATE llx_usergroup_rights SET fk_id=fk_id+1 WHERE fk_id BETWEEN 1420 AND 1420;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
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
deleted file mode 100644
index 835c78e151a3f791a2af565204597b6eb42e66ad..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
+++ /dev/null
@@ -1,1183 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.1.0
--- sans AUCUNE erreur ni warning
---
-
-
-alter table llx_commande_fournisseur_dispatch drop index fk_commande;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_2;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_3;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_4;
-alter table llx_commande_fournisseur_dispatch drop index fk_commande_5;
-
-ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande);
-
---V4.1 UPDATE llx_product_fournisseur_price set fk_user = null where fk_user not in (select rowid from llx_user);
---V4.1 delete llx_commande where fk_soc not in (select rowid from llx_societe);
-
-alter table llx_categorie add column type tinyint DEFAULT 1 NOT NULL;
-
--- Supprime les doublons de la table llx_categories
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie;
--- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie;
--- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories
--- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
-
--- On migre les categories fournisseur de la table llx_fournisseur_categorie qui est obsolete vers table llx_categories qui est generique pour gerer les categories de tout type
--- V4.1 INSERT into llx_categorie (label, description, visible, type) (select distinct label, label, 1, 1 from llx_fournisseur_categorie);
--- V4.1 UPDATE llx_categorie_fournisseur as cf SET cf.fk_categorie = IFNULL((SELECT distinct c.rowid from llx_categorie as c, llx_fournisseur_categorie as fc where fc.rowid = cf.fk_categorie AND c.type = 1 AND c.label = fc.label),cf.fk_categorie);
-
--- Supprime les doublons de la table llx_categories
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- V4.1 CREATE TABLE tmp_categorie1 SELECT * FROM llx_categorie;
--- V4.1 CREATE TABLE tmp_categorie2 SELECT * FROM llx_categorie;
--- V4.1 delete c from llx_categorie as c where c.rowid in (select distinct c2.rowid from tmp_categorie1 as c2, tmp_categorie2 as cc2 where c2.rowid != cc2.rowid and c2.type = cc2.type and c2.label = cc2.label) and c.rowid not in (select min(c3.rowid) from tmp_categorie1 as c3, tmp_categorie2 as cc3 where c3.rowid != cc3.rowid and c3.type = cc3.type and c3.label = cc3.label group by c3.label,c3.type);
--- V4.1 DROP TABLE tmp_categorie1;
--- V4.1 DROP TABLE tmp_categorie2;
--- Si suppression des doublons precedente a ete faite, on monte la cle sur les categories
--- V4.1 ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label,type);
-
-
--- Corrige mauvaise insertion du a champ trop court
-alter table llx_action_def modify code varchar(28) UNIQUE NOT NULL;
-alter table llx_action_def modify objet_type varchar(16) NOT NULL;
-update llx_action_def set code = 'NOTIFY_VAL_ORDER_SUPPLIER' where code = 'NOTIFY_VAL_ORDER_SUUPLIE';
-update llx_action_def set objet_type = 'order_supplier' where code = 'NOTIFY_VAL_ORDER_SUPPLIER';
-
--- Nettoyage champ ref table llx_bank_account
-update llx_bank_account set ref=concat('ACCOUNT',rowid) where (ref='' or ref is null);
-
-update llx_bank_account set currency_code='EU' where (currency_code IS NULL or currency_code='');
-alter table llx_bank_account modify currency_code varchar(3) NOT NULL;
-update llx_bank_account set currency_code='EUR' where (currency_code IS NULL or currency_code='' or currency_code='EU');
-
--- Sequence de requete pour nettoyage et correction champ type table llx_bank_url
-update llx_bank_url set type='company' where (type is null or type = '') and url like '%compta/fiche.php?socid=%';
-alter table llx_bank_url modify `type` varchar(20);
-update llx_bank_url set type='?' where (type is null or type = '') and url like '%compta/facture.php?facid=%';
-update llx_bank_url set type='payment_supplier' where (type='' or type is null) and url like '%fourn/paiement/fiche.php?id=%';
-update llx_bank_url set type='?' where (type is null or type = '');
-alter table llx_bank_url modify `type` varchar(20) NOT NULL;
-
-update llx_bank set datev = datec where datev = '1970-01-01 00:00:00' and rappro = 0;
-update llx_bank set dateo = datec where datev = '1970-01-01 00:00:00' and rappro = 0;
-
-alter table llx_c_chargesociales add column actioncompta varchar(12) NOT NULL;
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 1, 'Allocations familiales', 1,1,'TAXFAM');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 2, 'GSG Déductible', 1,1,'TAXCSGD');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values ( 3, 'GSG/CRDS NON Déductible',0,1,'TAXCSGND');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (10, 'Taxe apprentissage', 0,1,'TAXAPP');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (11, 'Taxe professionnelle', 0,1,'TAXPRO');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (12, 'Contribution à la formation professionnelle', 1,1,'TAXOPCA');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (20, 'Impots locaux/fonciers', 0,1,'TAXFON');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (30, 'Assurance Santé (SECU-URSSAF)', 0,1,'TAXSECU');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (40, 'Mutuelle', 0,1,'TAXMUT');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (50, 'Assurance vieillesse (CNAV)', 0,1,'TAXRET');
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (60, 'Assurance Chomage (ASSEDIC)', 0,1,'TAXCHOM');
-update llx_c_chargesociales set actioncompta='TAXFAM' where id = 1;
-update llx_c_chargesociales set actioncompta='TAXCSGD' where id = 2;
-update llx_c_chargesociales set actioncompta='TAXCSGND' where id = 3;
-update llx_c_chargesociales set actioncompta='TAXAPP' where id = 10;
-update llx_c_chargesociales set actioncompta='TAXPRO' where id = 11;
-update llx_c_chargesociales set actioncompta='TAXFON' where id = 20;
-alter table llx_chargesociales modify fk_type integer NOT NULL;
-alter table llx_chargesociales modify libelle varchar(80) NOT NULL;
-
-insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate');
-update llx_rights_def set libelle='Creer/modifier/supprimer ecriture bancaire' where perms='modifier' AND module='banque';
-
--- Supprime colone en doublon avec fk_user_creat
-alter table llx_paiement drop column author;
-
-update llx_actioncomm set fk_action = 9 where fk_action = 10;
-update llx_actioncomm set percent = 100 where percent = 0 and datea is not null;
-
-ALTER TABLE llx_cotisation ADD COLUMN datef date after dateadh;
-ALTER TABLE llx_cotisation modify datef date;
-ALTER TABLE llx_cotisation ADD UNIQUE INDEX uk_cotisation (fk_adherent,dateadh);
--- V4.1 update llx_cotisation set datef = ADDDATE(ADDDATE(dateadh, INTERVAL 1 YEAR),INTERVAL -1 DAY);
-
-
-delete from llx_const where name='MAIN_SHOW_DEVELOPMENT_MODULES';
-delete from llx_const where name='MAIN_ENABLE_DEVELOPMENT';
-DELETE FROM llx_const WHERE name = 'PRODUIT_CHANGE_PROD_DESC';
-DELETE FROM llx_const WHERE name like 'FICHINTER_ADDON%';
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON', 'pacific','chaine',0);
-insert into llx_const (name, value, type, visible) values ('FICHEINTER_ADDON_PDF','soleil','chaine',0);
-
-INSERT INTO llx_const(name, value, type, note, visible) VALUES ('GENBARCODE_LOCATION','/usr/local/bin/genbarcode','chaine','location of genbarcode',0);
-insert into llx_const(name, value, type, visible, note) values('MAIN_FEATURES_LEVEL','0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development');
-
-update llx_const set name='MAIN_MAIL_EMAIL_FROM' where name='NOTIFICATION_EMAIL_FROM';
-
-update llx_const set value='bluelagoon' where name='MAIN_THEME' and value ='dolibarr';
-
-update llx_const set visible=0 where name in ('MAIN_UPLOAD_DOC','MAIN_MAIL_SMTP_SERVER','MAIN_MAIL_SMTP_PORT','MAIN_MAIL_EMAIL_FROM');
-
-update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRELEFT' and value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENU_BARRETOP' and value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRELEFT' and value='default.php';
-update llx_const set value='rodolphe.php' where name='MAIN_MENUFRONT_BARRETOP' and value='default.php';
-
-
-delete from llx_adherent_type where libelle IS NULL;
-alter table llx_adherent_type modify libelle varchar(50) NOT NULL;
-
-
-alter table llx_tva add fk_bank integer NOT NULL;
-alter table llx_tva add fk_user_creat integer;
-alter table llx_tva add fk_user_modif integer;
-
--- V4.1 UPDATE llx_tva as t set fk_bank = (SELECT IFNULL(MIN(rowid),0) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_bank = 0;
--- V4.1 UPDATE llx_tva as t set fk_user_creat = (SELECT MIN(fk_user_author) FROM llx_bank as b WHERE b.datev = t.datev AND b.amount = -t.amount AND b.label like 'R%glement TVA') WHERE t.fk_user_creat IS NULL;
-
-
--- Extention de la gestion des categories
-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` integer not null,
- `fk_societe` integer not null,
- UNIQUE KEY `fk_categorie` (`fk_categorie`,`fk_societe`),
- KEY `fk_societe` (`fk_societe`)
-) ENGINE=innodb;
-
-alter table `llx_categorie_societe` drop foreign key fk_societe;
-alter table `llx_categorie_societe` add constraint `fk_categorie_societe_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`);
-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` 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`)
-) ENGINE=innodb;
-
-alter table `llx_categorie_product`
- add constraint `fk_categorie_product_categorie_rowid` foreign key(`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
- add constraint `fk_categorie_product_product_rowid` foreign key(`fk_product`) REFERENCES `llx_product` (`rowid`);
-
-
--- Ajout gestion du droit de pret
-drop table if exists `llx_droitpret_rapport`;
-create table `llx_droitpret_rapport` (
- `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` integer NOT NULL,
- PRIMARY KEY (`rowid`)
-) ENGINE=innodb;
-
-
--- Gestion des menu
-CREATE TABLE `llx_menu` (
- `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` integer NOT NULL,
- `order` tinyint(4) NOT NULL,
- `url` varchar(255) NOT NULL,
- `target` varchar(100) NULL,
- `titre` varchar(255) NOT NULL,
- `langs` varchar(100),
- `level` tinyint(1),
- `leftmenu` varchar(100) NULL,
- `right` varchar(255),
- `user` tinyint(4) NOT NULL default '0',
- PRIMARY KEY (`rowid`)
-) ENGINE=innodb;
-
-create table `llx_menu_constraint` (
- `rowid` integer NOT NULL,
- `action` varchar(255) NOT NULL,
- PRIMARY KEY (`rowid`)
-) ENGINE=innodb;
-
-create table `llx_menu_const` (
- `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;
-
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_menu` (`fk_menu`);
-ALTER TABLE `llx_menu_const` ADD INDEX `idx_menu_const_fk_constraint` (`fk_constraint`);
-
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_menu` FOREIGN KEY (`fk_menu`) REFERENCES `llx_menu` (`rowid`);
-ALTER TABLE `llx_menu_const` ADD CONSTRAINT `fk_menu_const_fk_constraint` FOREIGN KEY (`fk_constraint`) REFERENCES `llx_menu_constraint` (`rowid`);
-
-
---
--- Contenu de la table `llx_menu`
---
-delete from llx_menu_const;
-delete from llx_menu_constraint;
-delete from llx_menu where menu_handler='auguria';
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1, 'home', '', 0, '/index.php?mainmenu=home&leftmenu=', 'Home', -1, '', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2, 'companies', '', 0, '/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3, 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4, 'suppliers', '', 0, '/fourn/index.php?mainmenu=suppliers&leftmenu=', 'Suppliers', -1, 'suppliers', '$user->rights->fournisseur->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5, 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->commercial->main->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (6, 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire || $user->rights->banque->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (7, 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 0, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (8, 'tools', '', 0, '/index.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->bookmark->lire || $user->rights->export->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (9, 'telephony', '', 0, '/telephonie/index.php?mainmenu=telephony&leftmenu=', 'Telephony', -1, 'telephony', '$user->rights->telephonie->lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (10, 'energy', '', 0, '/energie/index.php?mainmenu=energy&leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (11, 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (12, 'shop', '', 0, '/oscommerce_ws/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 12);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (13, 'webcal', '', 0, '/webcal/webcal.php?mainmenu=webcal&leftmenu=', 'Calendar', -1, 'other', '', '', 0, 13);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (14, 'mantis', '', 0, '/mantis/mantis.php?mainmenu=mantis', 'BugTracker', -1, 'other', '', '', 2, 14);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (15, 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '', '', 2, 15);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (16, 'phenix', '', 0, '/phenix/phenix.php?mainmenu=phenix&leftmenu=', 'Calendar', -1, 'other', '', '', 0, 16);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (100, 'home', '', 1, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (101, 'home', '$leftmenu=="setup"', 100, '/admin/company.php', 'MenuCompanySetup', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (102, 'home', '$leftmenu=="setup"', 100, '/admin/ihm.php', 'GUISetup', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (103, 'home', '$leftmenu=="setup"', 100, '/admin/modules.php', 'Modules', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (104, 'home', '$leftmenu=="setup"', 100, '/admin/boxes.php', 'Boxes', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (105, 'home', '$leftmenu=="setup"', 100, '/admin/menus.php', 'Menus', 1, 'admin', '', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (106, 'home', '$leftmenu=="setup"', 100, '/admin/delais.php', 'DelaysBeforeWarning', 1, 'admin', '', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (107, 'home', '$leftmenu=="setup"', 100, '/admin/triggers.php', 'Triggers', 1, 'admin', '', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (108, 'home', '$leftmenu=="setup"', 100, '/admin/perms.php', 'Security', 1, 'admin', '', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (109, 'home', '$leftmenu=="setup"', 100, '/admin/mails.php', 'Emails', 1, 'admin', '', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (110, 'home', '$leftmenu=="setup"', 100, '/admin/limits.php', 'Limits', 1, 'admin', '', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (111, 'home', '$leftmenu=="setup"', 100, '/admin/dict.php', 'DictionarySetup', 1, 'admin', '', '', 2, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (112, 'home', '$leftmenu=="setup"', 100, '/admin/const.php', 'OtherSetup', 1, 'admin', '', '', 2, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (200, 'home', '', 1, '/admin/system/index.php?leftmenu=system', 'SystemInfo', 0, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (201, 'home', '$leftmenu=="system"', 200, '/admin/system/dolibarr.php', 'Dolibarr', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (202, 'home', '$leftmenu=="system"', 201, '/admin/system/constall.php', 'AllParameters', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (203, 'home', '$leftmenu=="system"', 201, '/about.php', 'About', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (204, 'home', '$leftmenu=="system"', 200, '/admin/system/os.php', 'OS', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (205, 'home', '$leftmenu=="system"', 200, '/admin/system/web.php', 'WebServer', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (206, 'home', '$leftmenu=="system"', 200, '/admin/system/phpinfo.php', 'Php', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (207, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=conf', 'PhpConf', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (208, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=env', 'PhpEnv', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (209, 'home', '$leftmenu=="system"', 206, '/admin/system/phpinfo.php?what=modules', 'PhpModules', 2, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (210, 'home', '$leftmenu=="system"', 200, '/admin/system/database.php', 'Database', 1, 'admin', '', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (211, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables.php', 'Tables', 2, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (212, 'home', '$leftmenu=="system"', 210, '/admin/system/database-tables-contraintes.php', 'Constraints', 2, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (300, 'home', '', 1, '/admin/tools/index.php?leftmenu=admintools', 'SystemTools', 0, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (301, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_export.php', 'Backup', 1, 'admin', '', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (302, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/dolibarr_import.php', 'Restore', 1, 'admin', '', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (303, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/purge.php', 'Purge', 1, 'admin', '', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (304, 'home', '$leftmenu=="admintools"', 300, '/admin/tools/eaccelerator.php', 'EAccelerator', 1, 'admin', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (400, 'home', '', 1, '/user/home.php?leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (401, 'home', '$leftmenu=="users"', 400, '/user/index.php', 'Users', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (402, 'home', '$leftmenu=="users"', 401, '/user/fiche.php?action=create', 'NewUser', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (403, 'home', '$leftmenu=="users"', 400, '/user/group/index.php', 'Groups', 1, 'users', '$user->rights->user->user->lire || $user->admin', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (404, 'home', '$leftmenu=="users"', 403, '/user/group/fiche.php?action=create', 'NewGroup', 2, 'users', '$user->rights->user->user->creer || $user->admin', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (500, 'companies', '', 2, '/societe.php', 'ThirdParty', 0, 'companies', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (501, 'companies', '', 500, '/soc.php?action=create', 'MenuNewThirdParty', 1, 'companies', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (502, 'companies', '', 500, '/societe/groupe/index.php', 'MenuSocGroup', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (503, 'companies', '', 500, '/fourn/liste.php?leftmenu=suppliers', 'Suppliers', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (504, 'companies', '', 503, '/soc.php?leftmenu=supplier&action=create&type=f', 'NewSupplier', 2, 'suppliers', '$user->rights->societe->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (505, 'companies', '', 503, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 2, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (506, 'companies', '', 500, '/comm/prospect/prospects.php?leftmenu=prospects', 'Prospects', 1, 'companies', '$user->rights->societe->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (507, 'companies', '', 506, '/soc.php?leftmenu=prospects&action=create&type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (508, 'companies', '', 506, '/contact/index.php?leftmenu=customers&type=p', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (509, 'companies', '', 500, '/comm/clients.php?leftmenu=customers', 'Customers', 1, 'companies', '$user->rights->societe->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (510, 'companies', '', 509, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (511, 'companies', '', 509, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 2, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (600, 'companies', '', 2, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (601, 'companies', '', 600, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (602, 'companies', '', 600, '/contact/index.php?leftmenu=contacts', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (700, 'commercial', '', 5, '/comm/prospect/index.php?leftmenu=prospects', 'Prospects', 0, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (701, 'commercial', '', 700, '/soc.php?leftmenu=prospects&action=create&type=c', 'MenuNewProspect', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (702, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (703, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=-1', 'LastProspectDoNotContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (704, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=0', 'LastProspectNeverContacted', 2, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (705, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=1', 'LastProspectToContact', 2, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (706, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=2', 'LastProspectContactInProcess', 2, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (707, 'commercial', '$leftmenu=="prospects"', 702, '/comm/prospect/prospects.php?sortfield=s.datec&sortorder=desc&begin=&stcomm=3', 'LastProspectContactDone', 2, 'companies', '$user->rights->societe->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (708, 'commercial', '', 700, '/contact/index.php?leftmenu=prospects&type=p', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (800, 'commercial', '', 5, '/comm/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (801, 'commercial', '', 800, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (802, 'commercial', '', 800, '/comm/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (803, 'commercial', '', 800, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (900, 'commercial', '', 5, '/contact/index.php?leftmenu=contacts', 'Contacts', 0, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (901, 'commercial', '', 900, '/contact/fiche.php?leftmenu=contacts&action=create', 'NewContact', 1, 'companies', '$user->rights->societe->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (902, 'commercial', '', 900, '/contact/index.php?leftmenu=contacts&action=create', 'List', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1000, 'commercial', '', 5, '/comm/action/index.php?leftmenu=actions', 'Actions', 0, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1001, 'commercial', '$leftmenu=="actions"', 1000, '/societe.php?leftmenu=actions', 'NewAction', 1, 'companies', '$user->rights->societe->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1002, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&status=todo', 'MenuToDoActions', 1, 'companies', '$user->rights->societe->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1003, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/index.php?leftmenu=actions&time=today', 'Today', 1, 'companies', '$user->rights->societe->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1004, 'commercial', '$leftmenu=="actions"', 1000, '/comm/action/rapport/index.php?leftmenu=actions', 'Reportings', 1, 'companies', '$user->rights->societe->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1100, 'commercial', '', 5, '/comm/propal.php?leftmenu=propals', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1101, 'commercial', '$leftmenu=="propals"', 1100, '/societe.php?leftmenu=propals', 'NewPropal', 1, 'propal', '$user->rights->propale->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1102, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=0', 'PropalsDraft', 1, 'propal', '$user->rights->propale->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1103, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=1', 'PropalsOpened', 1, 'propal', '$user->rights->propale->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1104, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal.php?viewstatut=2,3,4', 'PropalStatusClosedShort', 1, 'propal', '$user->rights->propale->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1105, 'commercial', '$leftmenu=="propals"', 1100, '/comm/propal/stats/index.php?leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1200, 'commercial', '', 5, '/commande/index.php?leftmenu=orders', 'Orders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1201, 'commercial', '$leftmenu=="orders"', 1200, '/societe.php?leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1202, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=0', 'StatusOrderDraftShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1203, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=1', 'StatusOrderValidated', 1, 'orders', '$user->rights->commande->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1204, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=2', 'StatusOrderOnProcessShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1205, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=3', 'StatusOrderToBill', 1, 'orders', '$user->rights->commande->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1206, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1207, 'commercial', '$leftmenu=="orders"', 1200, '/commande/liste.php?leftmenu=orders&viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1208, 'commercial', '$leftmenu=="orders"', 1200, '/commande/stats/index.php?leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1300, 'commercial', '', 5, '/expedition/index.php?leftmenu=sendings', 'Sendings', 0, 'orders', '$user->rights->expedition->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1301, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/liste.php?leftmenu=sendings', 'List', 1, 'orders', '$user->rights->expedition->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1302, 'commercial', '$leftmenu=="sendings"', 1300, '/expedition/stats/index.php?leftmenu=sendings', 'Statistics', 1, 'orders', '$user->rights->expedition->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1400, 'commercial', '', 5, '/contrat/index.php?leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1401, 'commercial', '$leftmenu=="contracts"', 1400, '/societe.php?leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1402, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/liste.php?leftmenu=contracts', 'List', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1403, 'commercial', '$leftmenu=="contracts"', 1400, '/contrat/services.php?leftmenu=contracts', 'MenuServices', 1, 'contracts', '$user->rights->contrat->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1404, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=0', 'MenuInactiveServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1405, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1406, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=4&filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1407, 'commercial', '$leftmenu=="contracts"', 1402, '/contrat/services.php?leftmenu=contracts&mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1500, 'commercial', '', 5, '/fichinter/index.php?leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1501, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/fiche.php?action=create&leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1502, 'commercial', '$leftmenu=="ficheinter"', 1500, '/fichinter/index.php?leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1600, 'accountancy', '', 6, '/compta/index.php?leftmenu=suppliers', 'Suppliers', 0, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1601, 'accountancy', '', 1600, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'companies', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1602, 'accountancy', '', 1600, '/fourn/liste.php?leftmenu=suppliers', 'List', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1603, 'accountancy', '', 1600, '/contact/index.php?leftmenu=suppliers&type=f', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1604, 'accountancy', '', 1600, '/fourn/facture/index.php?leftmenu=suppliers_bills', 'BillsSuppliers', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1605, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/fiche.php?action=create', 'NewBill', 2, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1606, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/impayees.php', 'Unpaid', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1607, 'accountancy', '$leftmenu=="suppliers_bills"', 1604, '/fourn/facture/paiement.php', 'Payments', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1700, 'accountancy', '', 6, '/compta/index.php?leftmenu=customers', 'Customers', 0, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1701, 'accountancy', '', 1700, '/soc.php?leftmenu=customers&action=create&type=c', 'MenuNewCustomer', 1, 'companies', '$user->rights->societe->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1702, 'accountancy', '', 1700, '/compta/clients.php?leftmenu=customers', 'List', 1, 'companies', '$user->rights->societe->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1703, 'accountancy', '', 1700, '/contact/index.php?leftmenu=customers&type=c', 'Contacts', 1, 'companies', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1704, 'accountancy', '', 1700, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 1, 'bills', '$user->rights->facture->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1705, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/clients.php?action=facturer&leftmenu=customers_bills', 'NewBill', 2, 'bills', '$user->rights->facture->creer', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1706, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 2, 'bills', '$user->rights->facture->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1707, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1708, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/paiement/liste.php?leftmenu=customers_bills_payments', 'Payments', 2, 'bills', '$user->rights->facture->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1709, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/avalider.php?leftmenu=customers_bills_payments', 'MenuToValid', 3, 'bills', '$user->rights->facture->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1710, 'accountancy', 'preg_match("/customers_bills_payments/i",$leftmenu)', 1708, '/compta/paiement/rapport.php?leftmenu=customers_bills_payments', 'Reportings', 3, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1711, 'accountancy', '', 6, '/compta/paiement/cheque/index.php?leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1712, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'bills', '$user->rights->facture->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1713, 'accountancy', 'preg_match("/checks/i",$leftmenu)', 1711, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'MenuChequesReceipts', 1, 'bills', '$user->rights->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1714, 'accountancy', 'preg_match("/customers_bills/i",$leftmenu)', 1704, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 2, 'bills', '$user->rights->facture->lire', '', 2, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1715, 'accountancy', '', 1700, '/compta/paiement/cheque/index.php', 'CheckReceipt', 1, 'bills', '$user->rights->facture->lire', '', 1, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1716, 'accountancy', '', 1704, '/compta/paiement/cheque/fiche.php?action=new', 'New', 2, 'bills', '$user->rights->facture->lire', '', 1, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1717, 'accountancy', '', 1704, '/compta/paiement/cheque/liste.php', 'List', 2, 'bills', '$user->rights->facture->lire', '', 1, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1800, 'accountancy', '', 6, '/compta/propal.php', 'Prop', 0, 'propal', '$user->rights->propale->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (1900, 'accountancy', '', 6, '/compta/commande/liste.php?leftmenu=orders&status=3&afacturer=1', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2000, 'accountancy', '', 6, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2001, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/fiche.php?action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2002, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/liste.php?action=create', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2003, 'accountancy', '$leftmenu=="donations"', 2000, '/compta/dons/stats.php', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2100, 'accountancy', '', 6, '/compta/deplacement/index.php', 'Trips', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2200, 'accountancy', '', 6, '/compta/charges/index.php?leftmenu=charges&mainmenu=accountancy', 'Charges', 0, 'Charges', '$user->rights->tax->charges->lire', '', 0, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2201, 'accountancy', '$leftmenu=="charges"', 2200, '/compta/sociales/index.php', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2300, 'accountancy', '', 6, '/compta/tva/index.php?leftmenu=vat&mainmenu=accountancy', 'VAT', 0, 'companies', '$user->rights->tax->charges->lire', '', 0, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2301, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/fiche.php?action=create', 'NewPayment', 1, 'companies', '$user->rights->tax->charges->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2302, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/reglement.php', 'Payments', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2303, 'accountancy', '$leftmenu=="vat"', 2300, '/compta/tva/clients.php', 'ReportByCustomers', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2400, 'accountancy', '', 6, '/compta/ventilation/index.php?leftmenu=ventil', 'Ventilation', 0, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 8);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2401, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/liste.php', 'A ventiler', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2402, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/ventilation/lignes.php', 'Ventil�es', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2403, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/param/', 'Setup', 1, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2404, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2405, 'accountancy', '$leftmenu=="ventil"', 2403, '/compta/param/comptes/fiche.php?action=create', 'New', 2, 'companies', '$user->rights->compta->ventilation->parametrer', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2406, 'accountancy', '$leftmenu=="ventil"', 2400, '/compta/export/', 'Export', 1, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2407, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/index.php', 'New', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2408, 'accountancy', '$leftmenu=="ventil"', 2406, '/compta/export/liste.php', 'List', 2, 'companies', '$user->rights->compta->ventilation->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2500, 'accountancy', '', 6, '/compta/prelevement/index.php?leftmenu=withdraw', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2501, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/demandes.php?status=0', 'StandingOrderToProcess', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2502, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/create.php', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2503, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/bons.php', 'WithdrawalsReceipts', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2504, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste.php', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2505, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/liste_factures.php', 'WithdrawedBills', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2506, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/rejets.php', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2507, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/stats.php', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2508, 'accountancy', '$leftmenu=="withdraw"', 2500, '/compta/prelevement/config.php', 'Setup', 1, 'withdrawals', '$user->rights->prelevement->bons->configurer', '', 2, 7);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2600, 'accountancy', '', 6, '/compta/bank/index.php?leftmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 10);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2601, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/fiche.php?action=create', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2602, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/categ.php', 'Categories', 1, 'banks', '$user->rights->banque->configurer', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2603, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/search.php', 'SearchTransaction', 1, 'banks', '$user->rights->banque->lire', '', 0, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2604, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/budget.php', 'ByRubriques', 1, 'banks', '$user->rights->banque->lire', '', 0, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2605, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bilan.php', 'Bilan', 1, 'banks', '$user->rights->banque->lire', '', 0, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2606, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/virement.php', 'BankTransfers', 1, 'banks', '$user->rights->banque->modifier', '', 0, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2607, 'accountancy', '$leftmenu=="bank"', 2600, '/compta/bank/bplc.php', 'Transactions BPLC', 1, 'banks', '', '', 0, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2700, 'accountancy', '', 6, '/compta/resultat/index.php?leftmenu=ca&mainmenu=accountancy', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 11);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2701, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/resultat/index.php?leftmenu=ca', 'R�sultat / Exercice', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2702, 'accountancy', '$leftmenu=="ca"', 2701, '/compta/resultat/clientfourn.php?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2703, 'accountancy', '$leftmenu=="ca"', 2700, '/compta/stats/index.php?leftmenu=ca', 'Chiffre d''affaire', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2704, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/casoc?leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2705, 'accountancy', '$leftmenu=="ca"', 2703, '/compta/stats/cabyuser.php?leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->comptaexpert->comptarapport->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2800, 'products', '', 3, '/product/index.php?leftmenu=product&type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2801, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2802, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2803, 'products', '', 2800, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->stock->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2804, 'products', '', 2800, '/product/fiche.php?leftmenu=product&action=create&type=0&canvas=livre', 'Nouveau livre', 1, 'products', '$user->rights->produit->creer', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2805, 'products', '', 2800, '/product/liste.php?leftmenu=product&type=0&canvas=livre', 'Livre', 1, 'products', '$user->rights->produit->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2900, 'products', '', 3, '/product/index.php?leftmenu=service&type=1', 'Services', 0, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2901, 'products', '', 2900, '/product/fiche.php?leftmenu=service&action=create&type=1', 'NewService', 1, 'products', '$user->rights->produit->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (2902, 'products', '', 2900, '/product/liste.php?leftmenu=service&type=1', 'List', 1, 'products', '$user->rights->produit->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3000, 'products', '', 3, '/product/stats/index.php?leftmenu=stats', 'Statistics', 0, 'main', '$user->rights->produit>lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3001, 'products', '', 3000, '/product/popuprop.php?leftmenu=stats', 'Popularity', 1, 'main', '$user->rights->produit>lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3100, 'products', '', 3, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3101, 'products', '$leftmenu=="stock"', 3100, '/product/stock/fiche.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3102, 'products', '$leftmenu=="stock"', 3100, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3103, 'products', '$leftmenu=="stock"', 3100, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3104, 'products', '$leftmenu=="stock"', 3100, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3200, 'products', '', 3, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3201, 'products', '$leftmenu=="cat"', 3200, '/categories/fiche.php?action=create&type=0', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3300, 'suppliers', '', 4, '/fourn/index.php?leftmenu=suppliers', 'Suppliers', 0, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3301, 'suppliers', '', 3300, '/soc.php?leftmenu=suppliers&action=create&type=f', 'NewSupplier', 1, 'suppliers', '$user->rights->societe->creer && $user->rights->fournisseur->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3302, 'suppliers', '', 3300, '/fourn/liste.php', 'List', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3303, 'suppliers', '', 3300, '/contact/index.php?leftmenu=supplier&type=f', 'Contacts', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3304, 'suppliers', '', 3300, '/fourn/stats.php', 'Statistics', 1, 'suppliers', '$user->rights->societe->lire && $user->rights->fournisseur->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3400, 'suppliers', '', 4, '/fourn/facture/index.php', 'Bills', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3401, 'suppliers', '', 3400, '/fourn/facture/fiche.php?action=create', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3402, 'suppliers', '', 3400, '/fourn/facture/paiement.php', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3500, 'suppliers', '', 4, '/fourn/commande/index.php?leftmenu=suppliers', 'Orders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3501, 'suppliers', '', 3500, '/societe.php?leftmenu=supplier', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3502, 'suppliers', '', 3500, '/fourn/commande/liste.php?leftmenu=suppliers', 'List', 1, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3600, 'project', '', 7, '/projet/index.php?leftmenu=projects', 'Projects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3601, 'project', '', 3600, '/comm/clients.php?leftmenu=projects', 'NewProject', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3602, 'project', '', 3600, '/projet/liste.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3700, 'project', '', 7, '/projet/tasks', 'Tasks', 0, 'projects', '$user->rights->projet->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3701, 'project', '', 3700, '/projet/tasks/mytasks.php', 'MyTasks', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3800, 'project', '', 7, '/projet/activity', 'Activity', 0, 'projects', '$user->rights->projet->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3801, 'project', '', 3800, '/projet/activity/myactivity.php', 'MyActivity', 1, 'projects', '$user->rights->projet->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3900, 'tools', '', 8, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3901, 'tools', '', 3900, '/comm/mailing/fiche.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (3902, 'tools', '', 3900, '/comm/mailing/liste.php?leftmenu=mailing', 'List', 1, 'mails', '$user->rights->mailing->lire', '', 0, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4000, 'tools', '', 8, '/bookmarks/liste.php?leftmenu=bookmarks', 'Bookmarks', 0, 'other', '$user->rights->bookmark->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4001, 'tools', '', 4000, '/bookmarks/fiche.php?action=create', 'NewBookmark', 1, 'other', '$user->rights->bookmark->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4002, 'tools', '', 4000, '/bookmarks/liste.php', 'List', 1, 'other', '$user->rights->bookmark->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4100, 'tools', '', 8, '/exports/index.php?leftmenu=export', 'FormatedExport', 0, 'exports', '$user->rights->export->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4101, 'tools', '', 4100, '/exports/export.php?leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4130, 'tools', '', 8, '/admin/import/index.php?leftmenu=import', 'FormatedImport', 0, 'imports', '$user->rights->import->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4131, 'tools', '', 4130, '/admin/import/import.php?leftmenu=import', 'NewImport', 1, 'imports', '$user->rights->import->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4200, 'members', '', 15, '/adherents/index.php?leftmenu=members&mainmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4201, 'members', '', 4200, '/adherents/fiche.php?action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4202, 'members', '', 4200, '/adherents/liste.php', 'List', 1, 'members', '$user->rights->adherent->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4203, 'members', '', 4200, '/adherents/liste.php?statut=-1', 'MenuMembersToValidate', 1, 'members', '$user->rights->adherent->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4204, 'members', '', 4200, '/adherents/liste.php?statut=1', 'MenuMembersValidated', 1, 'members', '$user->rights->adherent->lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4205, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=outofdate', 'MenuMembersNotUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4206, 'members', '', 4200, '/adherents/liste.php?statut=1&filter=uptodate', 'MenuMembersUpToDate', 1, 'members', '$user->rights->adherent->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4207, 'members', '', 4200, '/adherents/liste.php?statut=0', 'MenuMembersResiliated', 1, 'members', '$user->rights->adherent->lire', '', 2, 6);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4300, 'members', '', 15, '/adherents/index.php?leftmenu=accountancy&mainmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4301, 'members', '', 4300, '/adherents/liste.php?statut=-1&leftmenu=accountancy&mainmenu=members', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4302, 'members', '', 4300, '/adherents/cotisations.php?leftmenu=accountancy', 'List', 1, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4400, 'members', '', 15, '/compta/bank/index.php?leftmenu=accountancy', 'Bank', 0, 'banks', '$user->rights->adherent->lire', '', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4500, 'members', '', 15, '/adherents/index.php?leftmenu=export&mainmenu=members', 'Exports', 0, 'members', '$user->rights->adherent->export', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4501, 'members', '$leftmenu=="export"', 4500, '/exports/index.php?leftmenu=export', 'Datas', 1, 'members', '$user->rights->adherent->export', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4502, 'members', '$leftmenu=="export"', 4500, '/adherents/htpasswd.php?leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4503, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/carte.php?leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 2);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4504, 'members', '$leftmenu=="export"', 4500, '/adherents/cartes/etiquette.php?leftmenu=export', 'Etiquettes d''adh�rents', 1, 'members', '$user->rights->adherent->export', '_blank', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4600, 'members', '', 15, '/public/adherents/index.php?leftmenu=member_public', 'MemberPublicLinks', 0, 'members', '$user->rights->adherent->export', '', 2, 4);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4700, 'members', '', 15, '/adherents/index.php?leftmenu=setup&mainmenu=members', 'Setup', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4701, 'members', '', 4700, '/adherents/type.php?leftmenu=setup', 'MembersTypes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4702, 'members', '', 4700, '/adherents/options.php?leftmenu=setup', 'MembersAttributes', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4800, 'product', '', 3, '/product/droitpret/index.php?leftmenu=droitpret', 'Droit de pr�t', 0, 'products', '$user->rights->droitpret->lire', '', 2, 5);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4801, 'product', '$leftmenu=="droitpret"', 4800, '/product/droitpret/index.php?leftmenu=droitpret', 'G�n�rer rapport', 1, 'products', '$user->rights->droitpret->creer', '', 2, 1);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4900, 'suppliers', '', 4, '/categories/index.php?leftmenu=cat&type=1', 'Categories', 0, 'categories', '$user->rights->categorie>lire', '', 2, 3);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (4901, 'suppliers', '$leftmenu=="cat"', 4900, '/categories/fiche.php?action=create&type=1', 'NewCat', 1, 'categories', '$user->rights->categorie>creer', '', 2, 0);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5000, 'commercial', '', 5, '/categories/index.php?leftmenu=cat&type=2', 'Categories', 0, 'commercial', '$user->rights->categorie>lire', '', 2, 9);
-insert into `llx_menu` (`rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, `right`, `target`, `user`, `order`) values (5001, 'commercial', '$leftmenu=="cat"', 5000, '/categories/fiche.php?action=create&type=2', 'NewCat', 1, 'commercial', '$user->rights->categorie>creer', '', 2, 0);
-update llx_menu set type='top' where level=-1;
-
---
--- Contenu de la table `llx_menu_constraint`
---
-insert into `llx_menu_constraint` (`rowid`, `action`) values (1, '$user->admin');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (2, '$conf->societe->enabled && $user->rights->societe->lire');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (3, '$user->rights->societe->creer');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (4, 'is_dir("societe/groupe")');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (5, '$conf->societe->enabled && $conf->fournisseur->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (6, '$user->societe_id == 0');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (7, '$conf->propal->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (8, '$conf->commande->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (9, '$conf->expedition->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (10, '$conf->contrat->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (11, '$conf->fichinter->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (12, '$conf->societe->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (13, '$conf->facture->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (14, '! $conf->global->FACTURE_DISABLE_RECUR');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (15, '$conf->don->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (16, '$conf->deplacement->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (17, '$conf->tax->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (18, '($conf->compta->enabled || $conf->comptaexpert->enabled) && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $user->societe_id == 0');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (19, '$conf->compta-enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (20, '$conf->prelevement->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (21, '$conf->banque->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (22, '$conf->compta->enabled || $conf->comptaexpert->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (23, '$conf->produit->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (24, '$conf->stock->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (25, '$conf->service->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (26, '$conf->categorie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (27, '$conf->projet->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (28, '$conf->mailing->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (29, '$conf->bookmark->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (30, '$conf->export->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (31, '$conf->adherent->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (32, '($conf->societe->enabled && $user->rights->societe->lire) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (33, '$conf->produit->enabled || $conf->service->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (34, '$conf->fournisseur->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (35, '$conf->commercial->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (36, '$conf->compta->enabled || $conf->comptaexpert->enabled || $conf->banque->enabled\r\n || $conf->commande->enabled || $conf->facture->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (37, '$conf->mailing->enabled || $conf->export->enabled || $conf->bookmark->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (38, '$conf->boutique->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (39, '$conf->oscommerce2->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (40, '$conf->webcal->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (41, '$conf->mantis->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (42, '(dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY"))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (43, '!((dolibarr_get_const($this->db,"PRODUIT_SPECIAL_LIVRE")) && (dolibarr_get_const($this->db,"PRODUCT_CANVAS_ABILITY")))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (44, '$conf->droitpret->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (45, '$conf->menudb->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (46, '$conf->energie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (47, '$conf->telephonie->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (48, '($user->admin && function_exists("eaccelerator_info"))');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (49, '$conf->import->enabled');
-insert into `llx_menu_constraint` (`rowid`, `action`) values (50, '$conf->phenix->enabled');
-
---
--- Contenu de la table `llx_menu_const`
---
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (1, 100, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (2, 200, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (3, 300, 1, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (4, 304, 48, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (5, 501, 3, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (6, 502, 4, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (7, 504, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (8, 503, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (9, 504, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (10, 505, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (11, 500, 2, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (12, 1100, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (13, 1200, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (14, 1300, 9, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (15, 1400, 10, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (16, 1500, 11, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (17, 1600, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (18, 1601, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (19, 1603, 12, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (20, 1605, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (21, 1604, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (22, 1605, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (23, 1606, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (24, 1607, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (25, 1701, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (26, 1700, 12, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (27, 1705, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (28, 1706, 14, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (29, 1704, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (30, 1705, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (31, 1706, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (32, 1708, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (33, 1709, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (34, 1710, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (35, 1711, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (36, 1712, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (37, 1713, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (38, 1714, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (39, 1800, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (40, 1900, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (41, 1900, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (42, 2000, 15, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (43, 2100, 16, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (44, 2200, 17, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (45, 2300, 18, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (46, 2400, 19, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (47, 2500, 20, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (48, 2300, 21, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (49, 2700, 22, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (50, 2800, 23, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (51, 2801, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (52, 2803, 24, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (53, 2900, 25, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (54, 2901, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (55, 3000, 7, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (56, 3100, 24, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (57, 3200, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (58, 3201, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (59, 3300, 5, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (60, 3301, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (61, 3400, 13, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (62, 3401, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (63, 3500, 8, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (64, 3600, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (65, 3700, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (66, 3800, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (67, 3900, 28, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (68, 4000, 29, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (69, 4100, 30, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (70, 4130, 49, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (71, 4200, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (72, 4300, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (73, 4400, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (74, 4500, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (75, 4600, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (76, 4700, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (77, 4400, 21, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (78, 4501, 30, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (79, 2, 32, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (80, 3, 33, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (81, 4, 34, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (82, 5, 35, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (83, 6, 36, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (84, 7, 27, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (85, 8, 37, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (86, 9, 47, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (87, 10, 46, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (88, 11, 38, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (89, 12, 39, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (90, 13, 40, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (91, 14, 41, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (92, 15, 31, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (93, 16, 50, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (100, 1715, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (101, 1716, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (102, 1717, 13, 1);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (103, 2804, 42, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (104, 2805, 42, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (105, 2801, 43, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (106, 2802, 43, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (110, 4800, 44, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (111, 4900, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (112, 4901, 6, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (113, 5000, 26, 2);
-insert into `llx_menu_const` (`rowid`, `fk_menu`, `fk_constraint`, `user`) values (114, 5001, 6, 2);
-
-ALTER TABLE llx_product ADD COLUMN volume float DEFAULT NULL after weight_units;
-ALTER TABLE llx_product ADD COLUMN volume_units tinyint DEFAULT NULL after volume;
-
-ALTER TABLE llx_product modify ref varchar(32) NOT NULL;
-
-ALTER TABLE `llx_socpeople` CHANGE `fk_user` `fk_user_creat` INT(11) NULL;
-ALTER TABLE `llx_socpeople` CHANGE `fk_user_create` `fk_user_creat` INT(11) NULL;
--- V4.1 UPDATE llx_socpeople set fk_user_creat = null where llx_socpeople.fk_user_creat is not null and llx_socpeople.fk_user_creat not in (select rowid from llx_user);
--- V4 ALTER TABLE llx_socpeople ADD INDEX idx_socpeople_fk_user_creat (fk_user_creat);
--- V4 ALTER TABLE llx_socpeople DROP INDEX idx_fk_user_creat;
--- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_user_creat_user_rowid FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_user add pass_temp VARCHAR(32) NULL after pass_crypted;
-update llx_user set pass = null where pass = pass_crypted and length(pass) = 32;
-
-drop table if exists llx_soc_events;
-drop table if exists llx_todocomm;
-drop table if exists llx_ventes;
-drop table if exists llx_pointmort;
-drop table if exists llx_birthday_alert;
-
-ALTER TABLE llx_commande_fournisseurdet ADD total_ht double(24,8) DEFAULT 0 after subprice;
-ALTER TABLE llx_commande_fournisseurdet ADD total_tva double(24,8) DEFAULT 0 after total_ht;
-ALTER TABLE llx_commande_fournisseurdet ADD total_ttc double(24,8) DEFAULT 0 after total_tva;
-ALTER TABLE llx_commande_fournisseurdet ADD info_bits integer DEFAULT 0 after total_ttc;
-
-
--- Pas de limite sur nb decimal des prix dans base car definie en option
--- Tous les prix doivent etre au format float(16,8)
--- Tous les tx tva doivent etre au format float(6,3)
-ALTER TABLE llx_product_price ADD COLUMN price_ttc double(24,8) DEFAULT 0 AFTER price;
-ALTER TABLE llx_product ADD COLUMN price_ttc double(24,8) DEFAULT 0 AFTER price_base_type;
-
-ALTER TABLE llx_product MODIFY price double(24,8) DEFAULT 0;
-ALTER TABLE llx_product MODIFY price_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_product MODIFY tva_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_product_price MODIFY price double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_price MODIFY price_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_price MODIFY tva_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_product_fournisseur_price_log MODIFY price double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_fournisseur_price_log MODIFY quantity double;
-ALTER TABLE llx_product_fournisseur_price MODIFY price double(24,8) DEFAULT 0;
-ALTER TABLE llx_product_fournisseur_price MODIFY quantity double;
-
-
-ALTER TABLE llx_facture_fourn MODIFY amount double(24,8) DEFAULT 0 NOT NULL;
-ALTER TABLE llx_facture_fourn MODIFY remise double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY total double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn MODIFY total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_facture_fourn_det MODIFY pu_ht double(24,8);
-ALTER TABLE llx_facture_fourn_det ADD pu_ttc double(24,8) AFTER pu_ht;
-ALTER TABLE llx_facture_fourn_det MODIFY pu_ttc double(24,8);
-ALTER TABLE llx_facture_fourn_det MODIFY qty smallint DEFAULT 1;
-ALTER TABLE llx_facture_fourn_det MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY tva_taux double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_fourn_det MODIFY total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_propal ADD total_ht double(24,8) DEFAULT 0 after remise;
-
-ALTER TABLE llx_propal MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_propal MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_propal MODIFY total double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_propaldet MODIFY tva_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY subprice double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_contratdet MODIFY tva_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY subprice double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_contratdet MODIFY total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commande MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande MODIFY total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commande_fournisseur MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseur MODIFY total_ttc double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_commandedet MODIFY subprice double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY tva_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY subprice double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY total_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_commande_fournisseurdet MODIFY tva_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_societe_remise_except MODIFY amount_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY amount_tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY amount_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_societe_remise_except MODIFY tva_tx double(6,3) DEFAULT 0;
-
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_commande_fournisseur FROM llx_commande_fournisseur LEFT JOIN llx_societe ON llx_commande_fournisseur.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL;
-
-
--- Changement de idp en rowid
--- V4 ALTER TABLE llx_propal DROP FOREIGN KEY llx_propal_ibfk1;
--- V4 ALTER TABLE llx_socpeople DROP FOREIGN KEY fk_socpeople_fk_soc;
--- V4 ALTER TABLE llx_commande DROP FOREIGN KEY fk_commande_societe;
--- V4 ALTER TABLE llx_commande_fournisseur DROP FOREIGN KEY fk_commande_fournisseur_societe;
--- V4 ALTER TABLE llx_contrat DROP FOREIGN KEY fk_contrat_societe;
--- V4 ALTER TABLE llx_facture DROP FOREIGN KEY fk_facture_fk_soc;
--- V4 ALTER TABLE llx_facture_fourn DROP FOREIGN KEY fk_facture_fourn_fk_soc;
--- V4 ALTER TABLE llx_fichinter DROP FOREIGN KEY fk_fichinter_fk_soc;
--- V4 ALTER TABLE llx_osc_customer DROP FOREIGN KEY llx_osc_customer_fk_soc;
--- V4 ALTER TABLE llx_propal DROP FOREIGN KEY fk_propal_fk_soc;
--- V4 ALTER TABLE llx_societe_remise_except DROP FOREIGN KEY fk_societe_remise_fk_soc;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc;
--- V4 ALTER TABLE llx_categorie_societe DROP FOREIGN KEY fk_categorie_societe_societe_rowid;
-
--- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY llx_osc_customer_societe_idp;
--- V4 ALTER TABLE `llx_osc_customer` DROP FOREIGN KEY fk_osc_customer_fk_soc;
-
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP FOREIGN KEY fk_soc;
--- V4 ALTER TABLE llx_telephonie_client_stats DROP FOREIGN KEY fk_client_comm;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP FOREIGN KEY fk_contact;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_client_comm;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc;
--- V4 ALTER TABLE llx_telephonie_societe_ligne DROP FOREIGN KEY fk_soc_facture;
--- V4 ALTER TABLE llx_telephonie_tarif_client DROP FOREIGN KEY fk_client;
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur DROP INDEX fk_soc_2;
--- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_ligne_2;
--- V4 ALTER TABLE llx_telephonie_commande_ligne DROP INDEX fk_commande_2;
--- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_user_creat_2;
--- V4 ALTER TABLE llx_telephonie_commande DROP INDEX fk_fournisseur_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_contact_3;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_2;
--- V4 ALTER TABLE llx_telephonie_contact_facture DROP INDEX fk_ligne_3;
-
-ALTER TABLE `llx_societe` CHANGE `idp` `rowid` integer AUTO_INCREMENT;
-ALTER TABLE `llx_socpeople` CHANGE `idp` `rowid` integer AUTO_INCREMENT;
-
-ALTER TABLE `llx_osc_customer` CHANGE `osc_custid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_customer` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_customer` CHANGE `doli_socidp` `fk_soc` integer NOT NULL default '0';
-ALTER TABLE `llx_osc_customer` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_customer` ADD UNIQUE KEY `fk_soc` (`fk_soc`);
-ALTER TABLE `llx_osc_order` CHANGE `osc_orderid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_order` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_order` CHANGE `doli_orderidp` `fk_commande` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_order` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_order` ADD UNIQUE KEY `fk_commande` (`fk_commande`);
-ALTER TABLE `llx_osc_product` CHANGE `osc_prodid` `rowid` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_product` CHANGE `osc_lastmodif` `datem` datetime default NULL;
-ALTER TABLE `llx_osc_product` CHANGE `doli_prodidp` `fk_product` integer NOT NULL default 0;
-ALTER TABLE `llx_osc_product` ADD PRIMARY KEY (rowid);
-ALTER TABLE `llx_osc_product` ADD UNIQUE KEY `fk_product` (`fk_product`);
-
--- V4 ALTER TABLE llx_socpeople ADD CONSTRAINT fk_socpeople_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_commande ADD CONSTRAINT fk_commande_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_commande_fournisseur ADD CONSTRAINT fk_commande_fournisseur_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_contrat ADD CONSTRAINT fk_contrat_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_facture_fourn ADD CONSTRAINT fk_facture_fourn_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_fichinter ADD CONSTRAINT fk_fichinter_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_propal ADD CONSTRAINT fk_propal_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc FOREIGN KEY (fk_societe) REFERENCES llx_societe (rowid);
-
--- V4 ALTER TABLE llx_osc_customer ADD CONSTRAINT fk_osc_customer_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
--- V4 ALTER TABLE llx_telephonie_adsl_fournisseur ADD CONSTRAINT fk_telephonie_adsl_fournisseur_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_telephonie_client_stats ADD CONSTRAINT fk_telephonie_client_stats_societe FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_contact FOREIGN KEY (fk_contact) REFERENCES llx_socpeople (rowid);
--- V4 ALTER TABLE llx_telephonie_contact_facture ADD CONSTRAINT fk_telephonie_contact_facture_ligne FOREIGN KEY (fk_ligne) REFERENCES llx_telephonie_societe_ligne (rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_client_comm FOREIGN KEY (fk_client_comm) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_societe_ligne ADD CONSTRAINT llx_telephonie_societe_ligne_soc_facture FOREIGN KEY (fk_soc_facture) REFERENCES llx_societe(rowid);
--- V4 ALTER TABLE llx_telephonie_tarif_client ADD CONSTRAINT llx_telephonie_tarif_client_client FOREIGN KEY (fk_client) REFERENCES llx_societe (rowid);
--- fin du changement idp en rowid
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (120, 'fichinter','internal', 'INTERREPFOLL', 'Responsable suivi de l\'intervention', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (121, 'fichinter','internal', 'INTERVENING', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (130, 'fichinter','external', 'BILLING', 'Contact client facturation intervention', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (131, 'fichinter','external', 'CUSTOMER', 'Contact client suivi de l\'intervention', 1);
-
-ALTER TABLE llx_fichinter CHANGE note description text DEFAULT NULL;
-ALTER TABLE llx_fichinter ADD COLUMN note_private text DEFAULT NULL after description;
-ALTER TABLE llx_fichinter ADD COLUMN note_public text DEFAULT NULL after note_private;
-ALTER TABLE llx_fichinter ADD COLUMN tms timestamp after ref;
-ALTER TABLE llx_fichinter ADD COLUMN fk_contrat integer DEFAULT 0 after fk_projet;
-
-drop table if exists `llx_accountingsystem_det`;
-
-
-update llx_bank set label='(InitialBankBalance)' where fk_type='SOLD' and label in ('Balance','(Balance)','Solde','(Solde)');
-
-alter table llx_product_fournisseur_price add unitprice double(24,8);
-alter table llx_product_fournisseur_price MODIFY unitprice double(24,8);
-update llx_product_fournisseur_price set unitprice = ROUND(price/quantity,8) where unitprice IS NULL;
-
-update llx_fichinter set tms=datec where tms < datec;
-update llx_fichinter set tms=date_valid where tms < date_valid;
-
-ALTER TABLE llx_commande_fournisseur DROP INDEX ref;
-ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc);
-
-create table llx_c_ecotaxe
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- code varchar(64) UNIQUE NOT NULL,
- libelle varchar(255),
- price double(24,8),
- organization varchar(255),
- fk_pays integer NOT NULL,
- active tinyint DEFAULT 1 NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (1, 'ER-A-A', 'Mat�riels �lectriques < 0,2kg', 0.01000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (2, 'ER-A-B', 'Mat�riels �lectriques >= 0,2 kg et < 0,5 kg', 0.03000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (3, 'ER-A-C', 'Mat�riels �lectriques >= 0,5 kg et < 1 kg', 0.04000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (4, 'ER-A-D', 'Mat�riels �lectriques >= 1 kg et < 2 kg', 0.13000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (5, 'ER-A-E', 'Mat�riels �lectriques >= 2 kg et < 4kg', 0.21000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (6, 'ER-A-F', 'Mat�riels �lectriques >= 4 kg et < 8 kg', 0.42000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (7, 'ER-A-G', 'Mat�riels �lectriques >= 8 kg et < 15 kg', 0.84000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (8, 'ER-A-H', 'Mat�riels �lectriques >= 15 kg et < 20 kg', 1.25000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (9, 'ER-A-I', 'Mat�riels �lectriques >= 20 kg et < 30 kg', 1.88000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (10, 'ER-A-J', 'Mat�riels �lectriques >= 30 kg', 3.34000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (11, 'ER-M-1', 'TV, Moniteurs < 9kg', 0.84000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (12, 'ER-M-2', 'TV, Moniteurs >= 9kg et < 15kg', 1.67000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (13, 'ER-M-3', 'TV, Moniteurs >= 15kg et < 30kg', 3.34000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (14, 'ER-M-4', 'TV, Moniteurs >= 30 kg', 6.69000000, 'ERP', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (15, 'EC-A-A', 'Mat�riels �lectriques 0,2 kg max', 0.00840000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (16, 'EC-A-B', 'Mat�riels �lectriques 0,21 kg min - 0,50 kg max', 0.02500000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (17, 'EC-A-C', 'Mat�riels �lectriques 0,51 kg min - 1 kg max', 0.04000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (18, 'EC-A-D', 'Mat�riels �lectriques 1,01 kg min - 2,5 kg max', 0.13000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (19, 'EC-A-E', 'Mat�riels �lectriques 2,51 kg min - 4 kg max', 0.21000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (20, 'EC-A-F', 'Mat�riels �lectriques 4,01 kg min - 8 kg max', 0.42000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (21, 'EC-A-G', 'Mat�riels �lectriques 8,01 kg min - 12 kg max', 0.63000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (22, 'EC-A-H', 'Mat�riels �lectriques 12,01 kg min - 20 kg max', 1.05000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (23, 'EC-A-I', 'Mat�riels �lectriques 20,01 kg min', 1.88000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (24, 'EC-M-1', 'TV, Moniteurs 9 kg max', 0.84000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (25, 'EC-M-2', 'TV, Moniteurs 9,01 kg min - 18 kg max', 1.67000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (26, 'EC-M-3', 'TV, Moniteurs 18,01 kg min - 36 kg max', 3.34000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (27, 'EC-M-4', 'TV, Moniteurs 36,01 kg min', 6.69000000, 'Ecologic', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (28, 'ES-M-1', 'TV, Moniteurs <= 20 pouces', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (29, 'ES-M-2', 'TV, Moniteurs > 20 pouces et <= 32 pouces', 3.34000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (30, 'ES-M-3', 'TV, Moniteurs > 32 pouces et autres grands �crans', 6.69000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (31, 'ES-A-A', 'Ordinateur fixe, Audio home systems (HIFI), �l�ments hifi s�par�s...', 0.84000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (32, 'ES-A-B', 'Ordinateur portable, CD-RCR, VCR, lecteurs et enregistreurs DVD... Instruments de musique et caisses de r�sonance, haut parleurs...', 0.25000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (33, 'ES-A-C', 'Imprimante, photocopieur, t�l�copieur,...', 0.42000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (34, 'ES-A-D', 'Accessoires, clavier, souris, PDA, imprimante photo, appareil photo, gps, t�l�phone, r�pondeur, t�l�phone sans fil, modem,... T�l�commande, casque, cam�scope, baladeur mp3, radio portable, radio K7 et CD portable, set top box, radio r�veil,...', 0.08400000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (35, 'ES-A-E', 'GSM', 0.00840000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (36, 'ES-A-F', 'Jouets et �quipements de loisirs et de sports < 0,5 kg', 0.04200000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (37, 'ES-A-G', 'Jouets et �quipements de loisirs et de sports > 0,5 kg', 0.17000000, 'Eco-syst�mes', 1, 1);
-INSERT INTO `llx_c_ecotaxe` (`rowid`, `code`, `libelle`, `price`, `organization`, `fk_pays`, `active`) VALUES (38, 'ES-A-H', 'Jouets et �quipements de loisirs et de sports > 10 kg', 1.25000000, 'Eco-syst�mes', 1, 1);
-
-ALTER TABLE llx_commandedet CHANGE coef marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet ADD COLUMN marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx;
-ALTER TABLE llx_commandedet MODIFY marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_commandedet MODIFY marque_tx double(6,3) DEFAULT 0;
-
-ALTER TABLE llx_propaldet CHANGE coef marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet ADD COLUMN marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet ADD COLUMN marque_tx double(6,3) DEFAULT 0 after marge_tx;
-ALTER TABLE llx_propaldet MODIFY marge_tx double(6,3) DEFAULT 0;
-ALTER TABLE llx_propaldet MODIFY marque_tx double(6,3) DEFAULT 0;
-
--- Nouveau mode de stockage de l'ordre des box (X99 ou X = colonne et 99 position dans colonne)
-alter table llx_boxes modify box_order varchar(3) NOT NULL;
--- V4.1 update llx_boxes set box_order = concat('A0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('1','3','5','7','9');
--- V4.1 update llx_boxes set box_order = concat('B0',box_order) where length(box_order) = 1 and substring(box_order,-1) in ('0','2','4','6','8');
--- V4.1 update llx_boxes set box_order = concat('A',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('1','3','5','7','9');
--- V4.1 update llx_boxes set box_order = concat('B',box_order) where length(box_order) = 2 and substring(box_order,-1) in ('0','2','4','6','8');
-
-create table llx_fichinterdet
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_fichinter integer,
- date date,
- description text,
- duree integer,
- rang integer DEFAULT 0
-)ENGINE=innodb;
-
-ALTER TABLE llx_fichinter ADD COLUMN model_pdf varchar(50) after note_public;
-
-ALTER TABLE llx_bordereau_cheque MODIFY number varchar(16) NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY amount double(24,8) NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY nbcheque smallint NOT NULL;
-ALTER TABLE llx_bordereau_cheque MODIFY statut smallint(1) NOT NULL DEFAULT 0;
-
-ALTER TABLE llx_facturedet ADD COLUMN special_code tinyint(4) unsigned default 0;
-ALTER TABLE llx_facturedet MODIFY special_code tinyint(4) unsigned default 0;
-
-ALTER TABLE llx_commandedet MODIFY special_code tinyint(4) unsigned default 0;
-
-ALTER TABLE llx_propaldet ADD COLUMN special_code tinyint(4) unsigned default 0 after marque_tx;
-ALTER TABLE llx_propaldet ADD COLUMN pa_ht double(24,8) DEFAULT 0 after info_bits;
-ALTER TABLE llx_propaldet MODIFY pa_ht double(24,8) DEFAULT 0;
-
-ALTER TABLE llx_bank MODIFY amount double(24,8) DEFAULT 0;
-
-
--- Nouveau fonctionnement de la table llx_product_fournisseur_price
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_user;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_soc;
--- V4 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur_price_fk_product;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_user;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_soc;
-ALTER TABLE llx_product_fournisseur_price DROP INDEX idx_product_fournisseur_price_fk_product;
-ALTER TABLE llx_product_fournisseur_price DROP COLUMN ref_fourn;
--- V4.1 UPDATE llx_product_fournisseur_price as pfp SET pfp.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfp.fk_product = pf.fk_product AND pfp.fk_soc = pf.fk_soc);
-ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_soc;
-ALTER TABLE llx_product_fournisseur_price CHANGE fk_product fk_product_fournisseur integer NOT NULL;
-ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_user (fk_user);
-ALTER TABLE llx_product_fournisseur_price ADD INDEX idx_product_fournisseur_price_fk_product_fournisseur (fk_product_fournisseur);
--- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_product_fournisseur_price ADD CONSTRAINT fk_product_fournisseur_price_fk_product_fournisseur FOREIGN KEY (fk_product_fournisseur) REFERENCES llx_product_fournisseur (rowid);
-
--- Nouveau fonctionnement de la table llx_product_fournisseur_price_log
--- V4.1 UPDATE llx_product_fournisseur_price_log as pfpl SET pfpl.fk_product = (SELECT pf.rowid FROM llx_product_fournisseur AS pf WHERE pfpl.fk_product = pf.fk_product AND pfpl.fk_soc = pf.fk_soc);
-ALTER TABLE llx_product_fournisseur_price_log DROP COLUMN fk_soc;
-ALTER TABLE llx_product_fournisseur_price_log CHANGE fk_product fk_product_fournisseur integer NOT NULL;
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY fk_commande integer NOT NULL;
-
-ALTER TABLE llx_product ADD COLUMN partnumber varchar(32) after gencode;
-
-ALTER TABLE llx_element_contact ADD INDEX idx_element_contact_fk_socpeople (fk_socpeople);
-
--- Supprimme orphelins pour permettre montee de la cle
--- V4 DELETE llx_fichinter FROM llx_fichinter LEFT JOIN llx_societe ON llx_fichinter.fk_soc = llx_societe.rowid WHERE llx_societe.rowid IS NULL;
-
-
-
-ALTER TABLE llx_societe ADD COLUMN supplier_account varchar(32) after fournisseur;
-
-drop table if exists llx_c_barcode;
-
-create table llx_c_barcode_type
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- code varchar(16) NOT NULL,
- libelle varchar(50) NOT NULL,
- coder integer NOT NULL DEFAULT 0,
- example varchar(16) NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (1, 'EAN8', 'EAN8', 0, '1234567');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (2, 'EAN13', 'EAN13', 0, '123456789012');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (3, 'UPC', 'UPC', 0, '123456789012');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (4, 'ISBN', 'ISBN', 0, '123456789');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (5, 'C39', 'Code 39', 0, '1234567890');
-INSERT INTO llx_c_barcode_type (rowid, code, libelle, coder, example) VALUES (6, 'C128', 'Code 128', 0, 'ABCD1234567890');
-
-ALTER TABLE llx_product CHANGE gencode barcode varchar(255) DEFAULT NULL;
-ALTER TABLE llx_product ADD COLUMN fk_barcode_type integer DEFAULT 0 after barcode;
-
-create table llx_c_paper_format
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- code varchar(16) NOT NULL,
- label varchar(50) NOT NULL,
- width float(6,2) DEFAULT 0,
- height float(6,2) DEFAULT 0,
- unit enum('mm','cm','point','inch') NOT NULL,
- active tinyint DEFAULT 1 NOT NULL
-)ENGINE=innodb;
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (1, '4A0', 'Format 4A0', '1682', '2378', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (2, '2A0', 'Format 2A0', '1189', '1682', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (3, 'A0', 'Format A0', '840', '1189', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (4, 'A1', 'Format A1', '594', '840', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (5, 'A2', 'Format A2', '420', '594', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (6, 'A3', 'Format A3', '297', '420', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (7, 'A4', 'Format A4', '210', '297', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (8, 'A5', 'Format A5', '148', '210', 'mm', 1);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (9, 'A6', 'Format A6', '105', '148', 'mm', 1);
-
-ALTER TABLE llx_user ADD COLUMN phenix_login varchar(25) after webcal_login;
-ALTER TABLE llx_user ADD COLUMN phenix_pass varchar(128) after phenix_login;
-
-update llx_propal set total_ht = price where total_ht = 0 and total > 0;
-update llx_propal set date_livraison = NULL where date_livraison = '1970-01-01 00:00:00';
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (102,'commande','external', 'SHIPPING', 'Contact client livraison commande', 1);
-
--- Uniformisation du nom. Rem: Cette table n'est pas utilise en lecture a ce jour
-drop table llx_socstatutlog;
-create table llx_societe_log
-(
- id integer AUTO_INCREMENT PRIMARY KEY,
- datel datetime,
- fk_soc integer,
- fk_statut integer,
- fk_user integer,
- author varchar(30),
- label varchar(128)
-)ENGINE=innodb;
-
-
--- Pour la Tunisie (Formes les plus utilisees)
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1000','Société à responsabilité limitée SARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1001','Société en Nom Collectif');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1002','Société en Commandite Simple');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1003','société en participation');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1004','Société Anonyme SA');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1005','Société Unipersonnelle à Responsabilité Limitée SUARL');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1006','Groupement d\'intérêt économique GEI');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (10, '1007','Groupe de sociétés');
-
--- Regions de Tunisie (id pays=10)
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1001,10,1001, '',0,'Ariana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1002,10,1002, '',0,'Béja');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1003,10,1003, '',0,'Ben Arous');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1004,10,1004, '',0,'Bizerte');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1005,10,1005, '',0,'Gabès');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1006,10,1006, '',0,'Gafsa');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1007,10,1007, '',0,'Jendouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1008,10,1008, '',0,'Kairouan');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1009,10,1009, '',0,'Kasserine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1010,10,1010, '',0,'Kèbili');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1011,10,1011, '',0,'La Manouba');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1012,10,1012, '',0,'Le Kef');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1013,10,1013, '',0,'Mahdia');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1014,10,1014, '',0,'Médenine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1015,10,1015, '',0,'Monastir');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1016,10,1016, '',0,'Nabeul');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1017,10,1017, '',0,'Sfax');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1018,10,1018, '',0,'Sidi Bouzid');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1019,10,1019, '',0,'Siliana');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1020,10,1020, '',0,'Sousse');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1021,10,1021, '',0,'Tataouine');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1022,10,1022, '',0,'Tozeur');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1023,10,1023, '',0,'Tunis');
-insert into llx_c_regions (rowid,fk_pays,code_region,cheflieu,tncc,nom) values (1024,10,1024, '',0,'Zaghouan');
-
--- TUNISIE (id 10)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (101,10, '6','0','TVA 6%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (102,10, '12','0','TVA 12%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (103,10, '18','0','VAT 18%',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (104,10, '7.5','0','TVA 6% Majoré à 25% (7.5%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (105,10, '15','0','TVA 12% Majoré à 25% (15%)',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (106,10, '22.5','0','VAT 18% Majoré à 25% (22.5%)',1);
-
--- GUADELOUPE (id 105)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 111, 105, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 112, 105, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 113, 105, '0','0','VAT Rate 0 ou non applicable',1);
-
--- MARTINIQUE (id 150)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 121, 150, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 150, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 123, 150, '0','0','VAT Rate 0 ou non applicable',1);
-
--- REUNION (id 187)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 131, 187, '8.5','0','VAT Rate 8.5',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 187, '8.5','1','VAT Rate 8.5 non perçu par le vendeur mais récupérable par l\'acheteur',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 187, '0','0','VAT Rate 0 ou non applicable',1);
-
-ALTER TABLE llx_bank_account MODIFY iban_prefix varchar(50);
-ALTER TABLE llx_bank_account ADD COLUMN country_iban varchar(2) after iban_prefix;
-ALTER TABLE llx_bank_account ADD COLUMN cle_iban varchar(2) after country_iban;
-
-
--- Mise a jour des pays
-update llx_c_pays set libelle = 'Palaos' where rowid = 176 and code = 'PW' and libelle = 'Belau';
-update llx_c_pays set libelle = 'Serbie' where rowid = 198 and code = 'CS';
-update llx_c_pays set code = 'RS' where rowid = 198 and code = 'CS';
-insert into llx_c_pays (rowid,code,libelle) values (241, 'GG', 'Guernesey' );
-insert into llx_c_pays (rowid,code,libelle) values (242, 'IM', 'Ile de Man' );
-insert into llx_c_pays (rowid,code,libelle) values (243, 'JE', 'Jersey' );
-insert into llx_c_pays (rowid,code,libelle) values (244, 'ME', 'Monténégro' );
-insert into llx_c_pays (rowid,code,libelle) values (245, 'BL', 'Saint-Barthélemy');
-insert into llx_c_pays (rowid,code,libelle) values (246, 'MF', 'Saint-Martin' );
-
-
-ALTER TABLE llx_boxes ADD UNIQUE INDEX uk_boxes (box_id, position, fk_user);
-
--- Nettoyage vieux enregistrement detail pourris
-delete from llx_facturedet where price = 0 and subprice = 0 and remise_percent = 0 and total_ttc = 0 and total_ht = 0;
-
-
--- Drop constraints to allow rename
-ALTER TABLE llx_societe_remise_except drop foreign key fk_societe_remise_fk_facture;
-ALTER TABLE llx_societe_remise_except drop index idx_societe_remise_except_fk_facture;
-
--- Rename field
-ALTER TABLE llx_societe_remise_except change fk_facture fk_facture_line integer;
-ALTER TABLE llx_societe_remise_except add fk_facture integer after fk_facture_line;
-
--- Create constraints
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture_line (fk_facture_line);
-ALTER TABLE llx_societe_remise_except ADD INDEX idx_societe_remise_except_fk_facture (fk_facture);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture_line FOREIGN KEY (fk_facture_line) REFERENCES llx_facturedet (rowid);
-ALTER TABLE llx_societe_remise_except ADD CONSTRAINT fk_societe_remise_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid);
-
--- Corrige statut des avoirs qui ont ete transforme en reduc et pour lesquels la reduc a ete ensuite supprimee
--- V4.1 update llx_facture set paye=0, fk_statut=1 where paye=1 and type=2 and rowid not in (select fk_facture_source from llx_societe_remise_except);
-
--- Corrige avoirs affectes en ligne a affectation sur facture. On met total a null pour permettre recalcul par upgrade2
--- V4.1 update llx_facture set total_ttc = NULL where rowid in (select fk_facture from llx_facturedet where description = '(CREDIT_NOTE)');
--- V4.1 update llx_societe_remise_except as re set re.fk_facture = (select fk_facture from llx_facturedet as fd where fd.rowid = re.fk_facture_line), re.fk_facture_line = NULL where re.fk_facture_line in (select rowid from llx_facturedet where description = '(CREDIT_NOTE)');
--- V4.1 delete from llx_facturedet where description = '(CREDIT_NOTE)';
-
-update llx_facture set close_code = 'discount_vat' where close_code = 'escompte';
-
-ALTER TABLE llx_commande_fournisseurdet MODIFY fk_product integer;
-
--- Le prix d'un produit ne doit pas avoir la valeur NULL
-UPDATE llx_product SET price = 0 WHERE price is NULL;
-UPDATE llx_product SET price_ttc = 0 WHERE price_ttc is NULL;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
deleted file mode 100644
index 372131e331cd333a986d7e84b165f8869470bfe8..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.2.0-2.4.0.sql
+++ /dev/null
@@ -1,351 +0,0 @@
---
--- Attention a l ordre des requetes.
--- Ce fichier doit etre charge sur une version 2.2.0
---
-
-DROP TABLE llx_facture_tva_sum;
-DROP TABLE llx_c_ape;
-
-delete from llx_const where name='MAIN_GRAPH_LIBRARY' and (value like 'phplot%' or value like 'artichow%');
-
-ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pays;
-ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel;
-
-RENAME TABLE llx_c_barcode TO llx_c_barcode_type;
-
-alter table llx_c_barcode_type modify coder varchar(16) NOT NULL;
-update llx_c_barcode_type set coder = 0 where coder in (1,2);
-
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_ALL' and value='MAIN_FORCE_SETLOCALE_LC_ALL';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_MONETARY' and value='MAIN_FORCE_SETLOCALE_LC_MONETARY';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_NUMERIC' and value='MAIN_FORCE_SETLOCALE_LC_NUMERIC';
-update llx_const set value='' where name='MAIN_FORCE_SETLOCALE_LC_TIME' and value='MAIN_FORCE_SETLOCALE_LC_TIME';
-
--- remove old deprecated options
-update llx_const set name='SOCIETE_CODECLIENT_ADDON' where name='CODECLIENT_ADDON';
-update llx_const set name='SOCIETE_CODEFOURNISSEUR_ADDON' where name='CODEFOURNISSEUR_ADDON';
-delete from llx_const where name='CODECLIENT_ADDON';
-delete from llx_const where name='CODEFOURNISSEUR_ADDON';
-
-alter table llx_const add tms timestamp;
-update llx_const set tms=sysdate() where tms is null;
-update llx_const set tms=sysdate() where tms <= 0;
-
-
-alter table llx_document_model modify type varchar(20) NOT NULL;
-
-DELETE FROM llx_rights_def WHERE module = 'menudb';
-
-ALTER table llx_boxes_def drop column name;
-ALTER table llx_boxes_def add column tms timestamp;
-
--- Rename primary key of llx_menu
-ALTER TABLE llx_menu_const drop foreign key fk_menu_const_fk_menu;
-alter table llx_menu drop primary key;
-alter table llx_menu modify rowid integer AUTO_INCREMENT NOT NULL PRIMARY KEY;
-ALTER TABLE llx_menu_const ADD CONSTRAINT fk_menu_const_fk_menu FOREIGN KEY (fk_menu) REFERENCES llx_menu (rowid);
-
-alter table llx_menu modify user integer NOT NULL default '0';
-alter table llx_menu change `order` position integer NOT NULL;
-alter table llx_menu change `right` perms varchar(255);
-alter table llx_menu add column module varchar(64) after menu_handler;
-alter table llx_menu add column tms timestamp;
-
--- Add a unique key
-update llx_menu set url='/comm/prospect/prospects.php?leftmenu=prospects' where rowid=702 and url='/contact/index.php?leftmenu=prospects&type=p';
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url);
-
--- Drop unused table
-drop table if exists llx_so_gr;
-
--- Modification expedition
-create table llx_co_exp
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_commande integer NOT NULL,
- fk_expedition integer NOT NULL,
-
- key(fk_commande),
- key(fk_expedition)
-)ENGINE=innodb;
-
--- V4 ALTER TABLE llx_expedition DROP INDEX fk_expedition_methode;
--- V4 ALTER TABLE llx_expedition DROP INDEX fk_commande;
--- V4 ALTER TABLE llx_expedition DROP INDEX ref;
--- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_expedition;
--- V4 ALTER TABLE llx_expeditiondet DROP INDEX fk_commande_ligne;
-
--- V4.1 update llx_commande set fk_adresse_livraison = null where fk_adresse_livraison is not null and fk_adresse_livraison not in (select rowid from llx_societe_adresse_livraison);
--- V4.1 delete from llx_expeditiondet where fk_expedition not in (select rowid from llx_expedition);
--- V4.1 delete from llx_livraisondet where fk_livraison not in (select rowid from llx_livraison);
-
-alter table llx_expedition add column fk_soc integer NOT NULL after ref;
-alter table llx_expedition add column fk_adresse_livraison integer DEFAULT NULL after date_expedition;
--- V4.1 UPDATE llx_expedition as e SET e.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE e.fk_commande = c.rowid);
--- V4.1 UPDATE llx_expedition as e SET e.fk_adresse_livraison = (SELECT c.fk_adresse_livraison FROM llx_commande AS c WHERE e.fk_commande = c.rowid);
-update llx_expedition set fk_adresse_livraison=NULL where fk_adresse_livraison = 0;
-
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_soc (fk_soc);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_author (fk_user_author);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_user_valid (fk_user_valid);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_adresse_livraison (fk_adresse_livraison);
-ALTER TABLE llx_expedition ADD INDEX idx_expedition_fk_expedition_methode (fk_expedition_methode);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_adresse_livraison FOREIGN KEY (fk_adresse_livraison) REFERENCES llx_societe_adresse_livraison (rowid);
--- V4 ALTER TABLE llx_expedition ADD CONSTRAINT fk_expedition_fk_expedition_methode FOREIGN KEY (fk_expedition_methode) REFERENCES llx_expedition_methode (rowid);
-ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref);
-
-ALTER TABLE llx_expeditiondet CHANGE fk_commande_ligne fk_origin_line integer;
-ALTER TABLE llx_expeditiondet ADD COLUMN fk_entrepot integer after fk_origin_line;
-ALTER TABLE llx_expeditiondet ADD COLUMN rang integer DEFAULT 0 after qty;
--- V4.1 UPDATE llx_expeditiondet as ed SET ed.fk_entrepot = (SELECT e.fk_entrepot FROM llx_expedition AS e WHERE ed.fk_expedition = e.rowid);
-ALTER TABLE llx_expedition DROP COLUMN fk_entrepot;
-
-ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_expedition (fk_expedition);
-ALTER TABLE llx_expeditiondet ADD INDEX idx_expeditiondet_fk_entrepot (fk_entrepot);
--- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_expedition FOREIGN KEY (fk_expedition) REFERENCES llx_expedition (rowid);
--- V4 ALTER TABLE llx_expeditiondet ADD CONSTRAINT fk_expeditiondet_fk_entrepot FOREIGN KEY (fk_entrepot) REFERENCES llx_entrepot (rowid);
-
--- Modification livraison
-create table llx_co_liv
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_commande integer NOT NULL,
- fk_livraison integer NOT NULL,
-
- key(fk_commande),
- key(fk_livraison)
-)ENGINE=innodb;
-
--- V4 ALTER TABLE llx_livraison DROP INDEX fk_commande;
--- V4 ALTER TABLE llx_livraison DROP INDEX ref;
--- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_livraison;
--- V4 ALTER TABLE llx_livraisondet DROP INDEX fk_commande_ligne;
-ALTER TABLE llx_livraison DROP COLUMN total_ttc;
-
-ALTER TABLE llx_livraison add column total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_livraison MODIFY total_ht double(24,8) DEFAULT 0;
-ALTER TABLE llx_livraison MODIFY fk_adresse_livraison integer DEFAULT NULL;
-alter table llx_livraison add column ref_client varchar(30) after ref;
-alter table llx_livraison add column fk_soc integer NOT NULL after ref_client;
-UPDATE llx_livraison SET fk_adresse_livraison = NULL WHERE fk_adresse_livraison = 0;
--- V4.1 UPDATE llx_livraison as l SET l.fk_soc = (SELECT c.fk_soc FROM llx_commande AS c WHERE l.fk_commande = c.rowid);
-
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_soc (fk_soc);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_author (fk_user_author);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_user_valid (fk_user_valid);
-ALTER TABLE llx_livraison ADD INDEX idx_livraison_fk_adresse_livraison (fk_adresse_livraison);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
--- V4 ALTER TABLE llx_livraison ADD CONSTRAINT fk_livraison_fk_adresse_livraison FOREIGN KEY (fk_adresse_livraison) REFERENCES llx_societe_adresse_livraison (rowid);
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref);
-
-alter table llx_livraisondet add column fk_product integer after fk_livraison;
-alter table llx_livraisondet add column description text after fk_product;
-alter table llx_livraisondet add column subprice double(24,8) DEFAULT 0 after qty;
-alter table llx_livraisondet add column total_ht double(24,8) DEFAULT 0 after subprice;
-alter table llx_livraisondet add column rang integer DEFAULT 0 after total_ht;
-
-ALTER TABLE llx_livraisondet ADD INDEX idx_livraisondet_fk_expedition (fk_livraison);
--- V4 ALTER TABLE llx_livraisondet ADD CONSTRAINT fk_livraisondet_fk_livraison FOREIGN KEY (fk_livraison) REFERENCES llx_livraison (rowid);
-
-create table llx_pr_exp
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_propal integer NOT NULL,
- fk_expedition integer NOT NULL,
-
- key(fk_propal),
- key(fk_expedition)
-)ENGINE=innodb;
-
-create table llx_pr_liv
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_propal integer NOT NULL,
- fk_livraison integer NOT NULL,
-
- key(fk_propal),
- key(fk_livraison)
-)ENGINE=innodb;
-
-ALTER TABLE llx_paiement modify fk_bank integer NOT NULL DEFAULT 0;
-
-
-create table llx_element_element
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- sourceid integer NOT NULL,
- sourcetype varchar(12) NOT NULL,
- targetid integer NOT NULL,
- targettype varchar(12) NOT NULL
-) ENGINE=innodb;
-
-
-ALTER TABLE llx_element_element
- ADD UNIQUE INDEX idx_element_element_idx1 (sourceid, sourcetype, targetid, targettype);
-
-ALTER TABLE llx_element_element ADD INDEX idx_element_element_targetid (targetid);
-
-
-ALTER TABLE llx_actioncomm add column fk_user_mod integer after fk_user_author;
-ALTER TABLE llx_actioncomm add column fk_user_done integer after fk_user_action;
-
---drop table if exists llx_events;
-create table llx_events
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- type varchar(32) NOT NULL,
- dateevent datetime,
- fk_user integer,
- description varchar(250) NOT NULL,
- ip varchar(32) NOT NULL,
- fk_object integer
-) ENGINE=innodb;
-
-
-ALTER TABLE llx_events ADD INDEX idx_events_dateevent (dateevent);
-
-ALTER TABLE llx_c_forme_juridique ADD isvatexempted tinyint DEFAULT 0 NOT NULL after libelle;
-
-ALTER TABLE llx_facturedet ADD product_type integer DEFAULT NULL after total_ttc;
-ALTER TABLE llx_facture_fourn_det ADD product_type integer DEFAULT NULL after total_ttc;
-
--- V4.1 update llx_facturedet set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0);
--- V4.1 update llx_facture_fourn_det set product_type = 0 where fk_product in (select rowid from llx_product where fk_product_type = 0);
--- V4.1 update llx_facturedet set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1);
--- V4.1 update llx_facture_fourn_det set product_type = 1 where fk_product in (select rowid from llx_product where fk_product_type = 1);
--- V4.1 update llx_facturedet set product_type = 1 where product_type is null;
--- V4.1 update llx_facture_fourn_det set product_type = 1 where product_type is null;
-
-create table llx_c_prospectlevel
-(
- code varchar(12) PRIMARY KEY,
- label varchar(30),
- sortorder smallint,
- active smallint DEFAULT 1 NOT NULL
-) ENGINE=innodb;
-
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_UNKOWN', 'Unknown', 1);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_LOW', 'Low', 2);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_MEDIUM', 'Medium', 3);
-insert into llx_c_prospectlevel (code,label,sortorder) values ('PL_HIGH', 'High', 4);
-
-
-alter table llx_societe add column fk_prospectlevel varchar(12) after fournisseur;
-alter table llx_societe modify tva_assuj tinyint DEFAULT 1;
-
-
---update llx_actioncomm set datea = datep where datea is null and percent = 100;
---update llx_actioncomm set datea2 = datea where datea2 is null and percent = 100;
-update llx_actioncomm set datep = datea where datep is null and datea is not null;
-update llx_actioncomm set datep = datec where datep is null and datea is null;
-update llx_actioncomm set datep2 = datep where datep2 is null and percent = 100;
-
-
-alter table llx_projet modify fk_soc integer;
-
-update llx_rights_def set module='societe' where module='commercial' and perms='client' and subperms='voir';
-
-insert into llx_c_chargesociales (id, libelle, deductible, active, actioncompta) values (25, 'Impots revenus', 0,1,'TAXREV');
-
-alter table llx_socpeople add priv smallint NOT NULL DEFAULT 0 after jabberid;
-
-alter table llx_tva modify fk_bank integer;
-
-delete from llx_const where name='MAIN_USE_PREVIEW_TABS';
-
-alter table llx_menu_const drop column user;
-update llx_menu set leftmenu = '1' where leftmenu != '0';
-alter table llx_menu modify leftmenu varchar(1) default '1';
-
-
-create table llx_ecm_directories
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- label varchar(32) NOT NULL,
- fk_parent integer,
- description varchar(255) NOT NULL,
- cachenbofdoc integer NOT NULL DEFAULT 0,
- date_c datetime,
- date_m timestamp,
- fk_user_c integer,
- fk_user_m integer
-) ENGINE=innodb;
-
-create table llx_ecm_documents
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- ref varchar(16) NOT NULL,
- filename varchar(255) NOT NULL,
- filesize integer NOT NULL,
- filemime varchar(32) NOT NULL,
- fullpath_dol varchar(255) NOT NULL,
- fullpath_orig varchar(255) NOT NULL,
- description text,
- manualkeyword text,
- fk_create integer NOT NULL,
- fk_update integer,
- date_c datetime NOT NULL,
- date_u timestamp,
- fk_directory integer,
- fk_status smallint DEFAULT 0,
- private smallint DEFAULT 0
-) ENGINE=innodb;
-
-ALTER TABLE llx_bank modify num_chq varchar(50);
-
-ALTER TABLE llx_menu_const ADD UNIQUE KEY uk_menu_const(fk_menu, fk_constraint);
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (100, 'USLetter', 'Format Letter (A)', '216', '279', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (105, 'USLegal', 'Format Legal', '216', '356', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (110, 'USExecutive', 'Format Executive', '190', '254', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (115, 'USLedger', 'Format Ledger/Tabloid (B)', '279', '432', 'mm', 0);
-
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (200, 'Canadian P1', 'Format Canadian P1', '560', '860', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (205, 'Canadian P2', 'Format Canadian P2', '430', '560', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (210, 'Canadian P3', 'Format Canadian P3', '280', '430', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (215, 'Canadian P4', 'Format Canadian P4', '215', '280', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (220, 'Canadian P5', 'Format Canadian P5', '140', '215', 'mm', 0);
-INSERT INTO llx_c_paper_format (rowid, code, label, width, height, unit, active) VALUES (225, 'Canadian P6', 'Format Canadian P6', '107', '140', 'mm', 0);
-
-ALTER TABLE llx_commande_fournisseurdet DROP COLUMN price;
-
-alter table llx_adherent modify fk_user_mod integer;
-alter table llx_adherent modify fk_user_valid integer;
-
-create table llx_c_type_fees
-(
- id integer AUTO_INCREMENT PRIMARY KEY,
- code varchar(12) UNIQUE NOT NULL,
- libelle varchar(30),
- active tinyint DEFAULT 1 NOT NULL
-)ENGINE=innodb;
-
-
-alter table llx_deplacement modify type varchar(12) NOT NULL;
-alter table llx_deplacement modify km real;
-
-insert into llx_c_type_fees (code,libelle,active) values ('TF_OTHER', 'Other', 1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_TRIP', 'Trip', 1);
-insert into llx_c_type_fees (code,libelle,active) values ('TF_LUNCH', 'Lunch', 1);
-
-drop table llx_comfourn_facfourn;
-
-alter table llx_element_element modify sourcetype varchar(16) NOT NULL;
-alter table llx_element_element modify targettype varchar(16) NOT NULL;
-
-update llx_societe set fk_typent = 0 where fk_typent is null;
-
-ALTER TABLE llx_surveys_answers_summary ENGINE=innodb;
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
-
diff --git a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql
deleted file mode 100644
index 36d78dac8599b93a1e8b353883250d24554cb6f6..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.4.0-2.5.0.sql
+++ /dev/null
@@ -1,115 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.4.0 or higher.
---
-
-alter table llx_product add column price_min double(24,8) DEFAULT 0;
-alter table llx_product add column price_min_ttc double(24,8) DEFAULT 0;
-alter table llx_product add column finished tinyint DEFAULT NULL after canvas;
-
-alter table llx_product_price add column price_min double(24,8) default NULL;
-alter table llx_product_price add column price_min_ttc double(24,8) default NULL;
-
-alter table llx_societe add column gencod varchar(255);
-
-delete from llx_user_param where page <> '';
-
-alter table llx_expedition add column tracking_number varchar(50) after fk_expedition_methode;
-
-alter table llx_actioncomm add column location varchar(128) after percent;
-
--- remove enum type
-alter table llx_adherent_type modify column cotisation varchar(3) NOT NULL DEFAULT 'yes';
-alter table llx_adherent_type modify column vote varchar(3) NOT NULL DEFAULT 'yes';
-alter table llx_adherent modify column morphy varchar(3) NOT NULL;
-alter table llx_c_paper_format modify column unit varchar(5) NOT NULL;
-alter table llx_const modify column type varchar(6);
-alter table llx_menu modify column type varchar(4) NOT NULL;
-alter table llx_notify modify column objet_type varchar(24) NOT NULL;
-alter table llx_projet_task_actors modify column role varchar(5) DEFAULT 'admin';
-alter table llx_projet_task modify column statut varchar(6) DEFAULT 'open';
-alter table llx_rights_def modify column type varchar(1);
-
-ALTER TABLE llx_menu ADD COLUMN enabled varchar(255) NULL default '1' after perms;
-
-ALTER TABLE `llx_commandedet` ADD column `date_start` DATETIME DEFAULT NULL, ADD `date_end` DATETIME DEFAULT NULL ;
-
-alter table llx_categorie add column fk_soc integer DEFAULT NULL after description;
-
-alter table llx_product drop column nbvente;
-
-alter table llx_product add column import_key varchar(14);
-alter table llx_socpeople add column import_key varchar(14);
-alter table llx_facture add column import_key varchar(14);
-alter table llx_facturedet add column import_key varchar(14);
-alter table llx_commande add column import_key varchar(14);
-alter table llx_commandedet add column import_key varchar(14);
-alter table llx_facture_fourn add column import_key varchar(14);
-alter table llx_facture_fourn_det add column import_key varchar(14);
-
-alter table llx_commande modify column source smallint NULL;
-
-update llx_c_prospectlevel set code='PL_NONE', label='None' where code='PL_UNKOWN' or code='PL_NONE';
-
-update llx_societe set fk_prospectlevel=null where fk_prospectlevel='PL_UNKOWN';
-
-alter table llx_expedition add height integer;
-alter table llx_expedition add width integer;
-alter table llx_expedition add size_units integer;
-alter table llx_expedition add size integer;
-alter table llx_expedition add weight_units integer;
-alter table llx_expedition add weight integer;
-
-ALTER TABLE llx_paiement_facture ADD UNIQUE INDEX uk_paiement_facture(fk_paiement, fk_facture);
-ALTER TABLE llx_paiementfourn_facturefourn ADD UNIQUE INDEX uk_paiementfourn_facturefourn(fk_paiementfourn, fk_facturefourn);
-
-update llx_expedition_methode set code='ENL', libelle='Enlevement' where code='enlevement';
-update llx_expedition_methode set code='TRANS', libelle='Transporteur' where code='transporteur';
-
-alter table llx_fichinterdet modify date datetime;
-
-alter table llx_don modify fk_don_projet integer NULL;
-alter table llx_don modify fk_user_valid integer NULL;
-alter table llx_don add note_public text;
-alter table llx_don add model_pdf varchar(50);
-alter table llx_don add import_key varchar(14);
-
-ALTER TABLE llx_export_model DROP INDEX uk_export_model;
-ALTER TABLE llx_export_model ADD UNIQUE uk_export_model (label,type);
-
-alter table llx_adherent_options_label add column type varchar(8);
-alter table llx_adherent_options_label add column size integer DEFAULT 0;
-alter table llx_adherent_options_label add column pos integer DEFAULT 0;
-
--- Reverse option
-update llx_const set visible = 1, name = 'FACTURE_ENABLE_RECUR', value='1' where name = 'FACTURE_DISABLE_RECUR' and value = '0';
-delete from llx_const where name = 'FACTURE_DISABLE_RECUR' and value = '1';
-delete from llx_const where name like 'MAIN_FASTSEARCH_%';
-
-alter table llx_bank_account modify comment text;
-
-update llx_bank_account set ref = label where ref is null or ref = '';
-
--- 2.5.1
-update llx_actioncomm set datep = datea where datep is null;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL', 'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING', 'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING', 'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE', 'Contact fournisseur prestation', 1);
-
-alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL;
-
-alter table llx_expedition_methode change statut active tinyint DEFAULT 1;
-
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-
-
--- Not used. Just to be compatible with upgrade process of higher versions
-alter table llx_const add column entity integer DEFAULT 1 NOT NULL;
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql
deleted file mode 100644
index 5bfc011e579d6774b5cd08e9ccf5e1a8a1b3307f..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.5.0-2.6.0.sql
+++ /dev/null
@@ -1,139 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.5.0 or higher.
---
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (140,'order_supplier','internal', 'SALESREPFOLL', 'Responsable suivi de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (141,'order_supplier','internal', 'SHIPPING', 'Responsable reception de la commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (142,'order_supplier','external', 'BILLING', 'Contact fournisseur facturation commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (143,'order_supplier','external', 'CUSTOMER', 'Contact fournisseur suivi commande', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (145,'order_supplier','external', 'SHIPPING', 'Contact fournisseur livraison commande', 1);
-
-update llx_const set visible = 1 where name = 'PROPALE_ADD_DELIVERY_ADDRESS';
-
-delete from llx_const where name like 'MAIN_LOGEVENTS_%' and name not like 'MAIN_LOGEVENTS_USER%' and name not like 'MAIN_LOGEVENTS_GROUP%';
-delete from llx_events where type not like 'USER%' and type not like 'GROUP%';
-
-alter table llx_expedition_methode change statut active tinyint DEFAULT 1;
-
-update llx_actioncomm set datep = datea where datep is null;
-
-
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (1,'CATCH','Catch','Catch by client',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1);
-INSERT INTO llx_expedition_methode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0);
-UPDATE llx_expedition_methode set code='CATCH', libelle='Catch', description='Catch by client' where rowid=1;
-UPDATE llx_expedition_methode set code='TRANS', libelle='Transporter', description='Generic transporter' where rowid=2;
-UPDATE llx_expedition_methode set code='COLSUI', libelle='Colissimo Suivi', description='Colissimo Suivi' where rowid=3;
-
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (70, 'facture_fourn', 'internal', 'SALESREPFOLL', 'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (71, 'facture_fourn', 'external', 'BILLING', 'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (72, 'facture_fourn', 'external', 'SHIPPING', 'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (73, 'facture_fourn', 'external', 'SERVICE', 'Contact fournisseur prestation', 1);
-
-alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL;
-alter table llx_product add column pmp double(24,8) default 0 NOT NULL;
-
-alter table llx_product_stock modify column reel real;
-
-ALTER TABLE llx_bank ADD INDEX idx_bank_datev(datev);
-ALTER TABLE llx_bank ADD INDEX idx_bank_dateo(dateo);
-ALTER TABLE llx_bank ADD INDEX idx_bank_fk_account(fk_account);
-ALTER TABLE llx_bank ADD INDEX idx_bank_rappro(rappro);
-
-
-ALTER TABLE llx_mailing_cibles add column other varchar(255) NULL;
-
-ALTER TABLE llx_mailing_cibles ADD INDEX idx_mailing_cibles_email (email);
-
-ALTER TABLE llx_categorie ADD INDEX idx_categorie_type (type);
-
-ALTER TABLE llx_product drop column stock_propale;
-ALTER TABLE llx_product drop column stock_commande;
-ALTER TABLE llx_product add column stock integer after import_key;
-
-ALTER TABLE llx_product ADD INDEX idx_product_barcode (barcode);
-ALTER TABLE llx_product ADD INDEX idx_product_import_key (import_key);
-
-ALTER TABLE llx_adherent drop index login;
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login);
-
-ALTER TABLE llx_adherent add column fk_soc integer NULL after societe;
-ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_soc (fk_soc);
-ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-ALTER TABLE llx_adherent modify column fk_user_author integer NULL;
-
-ALTER TABLE llx_societe drop column rubrique;
-
--- SAINT PIERRE ET MIQUELON
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1931,193, '0','0','No VAT in SPM',1);
-
--- SAINT MARTIN
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2461,246, '0','0','VAT Rate 0',1);
-
-
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Regime auto-entrepreneur');
-
-
-alter table llx_user_param drop column page;
-
-alter table llx_commande_fournisseur_log add column comment varchar(255) NULL;
-
-delete from llx_categorie_association where fk_categorie_mere = fk_categorie_fille;
-
-
-alter table llx_societe add price_level tinyint(4) NULL;
-
-delete from llx_document_model where nom = 'huitre' and type = 'invoice';
-
-drop table llx_don_projet;
-
-alter table llx_facture_fourn_det add column date_start datetime DEFAULT NULL;
-alter table llx_facture_fourn_det add column date_end datetime DEFAULT NULL;
-
-alter table llx_commandedet add column product_type integer DEFAULT 0 after total_ttc;
-
-alter table llx_propaldet add column product_type integer DEFAULT 0 after total_ttc;
-alter table llx_propaldet add column date_start datetime DEFAULT NULL after product_type;
-alter table llx_propaldet add column date_end datetime DEFAULT NULL after date_start;
-
-alter table llx_commande_fournisseurdet add column product_type integer DEFAULT 0 after total_ttc;
-alter table llx_commande_fournisseurdet add column date_start datetime DEFAULT NULL after product_type;
-alter table llx_commande_fournisseurdet add column date_end datetime DEFAULT NULL after date_start;
-alter table llx_commande_fournisseur drop column product_type;
-alter table llx_commande_fournisseur drop column date_start;
-alter table llx_commande_fournisseur drop column date_end;
-
-drop table llx_models;
-
--- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet);
--- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
-
-ALTER TABLE llx_adherent modify fk_adherent_type integer NOT NULL;
-ALTER TABLE llx_adherent ADD INDEX idx_adherent_fk_adherent_type (fk_adherent_type);
--- V4.1 delete from llx_adherent where fk_adherent_type not in (select rowid from llx_adherent_type);
--- V4.1 ALTER TABLE llx_adherent ADD CONSTRAINT fk_adherent_adherent_type FOREIGN KEY (fk_adherent_type) REFERENCES llx_adherent_type (rowid);
-
--- Put at the end. Cas have duplicate values
-ALTER TABLE llx_categorie_association drop index idx_categorie_association_fk_categorie_fille;
-ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association (fk_categorie_mere, fk_categorie_fille);
-ALTER TABLE llx_categorie_association ADD UNIQUE INDEX uk_categorie_association_fk_categorie_fille (fk_categorie_fille);
-
--- Multi company
-ALTER TABLE llx_const ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name;
-ALTER TABLE llx_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER login;
-ALTER TABLE llx_usergroup ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-
-ALTER TABLE llx_const DROP INDEX name;
-ALTER TABLE llx_user DROP INDEX uk_user_login;
-ALTER TABLE llx_usergroup DROP INDEX nom;
-
-ALTER TABLE llx_const ADD UNIQUE INDEX uk_const (name, entity);
-ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
-ALTER TABLE llx_usergroup ADD UNIQUE INDEX uk_usergroup_name (nom, entity);
-
-
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
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
deleted file mode 100644
index be3b786e8a7eea7a7f1bc1921d5a8a3dba7b5dc5..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.6.0-2.7.0.sql
+++ /dev/null
@@ -1,476 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.6.0 or higher.
---
-
-alter table llx_tmp_caisse modify fk_tva integer NOT NULL;
-
-drop table llx_facture_stats;
-drop table llx_stock_valorisation;
-drop table llx_entrepot_valorisation;
-drop table llx_groupesociete_remise;
-drop table llx_groupesociete;
-
-update llx_actioncomm set datep = datec where datep is null and datec is not null;
-
--- Create new table for import module
-create table llx_import_model
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_user integer DEFAULT 0 NOT NULL,
- label varchar(50) NOT NULL,
- type varchar(20) NOT NULL,
- field text NOT NULL
-)ENGINE=innodb;
-
-update llx_bank_url set type='banktransfert' where type='?' and label='(banktransfert)';
-
-ALTER TABLE llx_import_model ADD UNIQUE INDEX uk_import_model (label,type);
-
-delete from llx_const where name = 'FACTURE_ENABLE_RECUR';
-
-alter table llx_facturedet_rec add column product_type integer DEFAULT 0 after fk_product;
-
-alter table llx_c_chargesociales change actioncompta code varchar(12) NOT NULL;
-alter table llx_c_chargesociales add column fk_pays integer DEFAULT 1 NOT NULL;
-
--- Usage of llx_menu_const and llx_menu_constraint is too complicated
--- so we made first change to remove it
-alter table llx_menu_const drop foreign key fk_menu_const_fk_menu;
-update llx_menu_constraint set action = '$conf->societe->enabled' where action = '$conf->commercial->enabled';
-
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_fk_soc (fk_soc);
-
-alter table llx_facture add column tms timestamp after date_valid;
-alter table llx_facture_fourn add column tms timestamp after datef;
-alter table llx_facture_fourn add column fk_facture_source integer after fk_user_valid;
-
-update llx_facture set tms = datec where tms <= 0;
-update llx_facture_fourn set tms = datec where tms <= 0;
-
-
--- Clean no more required parameters
-delete from llx_const where name = 'MAIN_MODULE_COMMERCIAL';
-delete from llx_const where name like 'MAIN_MODULE_%_DIR_OUTPUT';
-delete from llx_const where name like 'MAIN_MODULE_%_DIR_TEMP';
-delete from llx_const where name like 'PRODUIT_CONFIRM_DELETE_LINE';
-delete from llx_const where name = 'MAIN_MODULE_SYSLOG' and entity = 2;
-delete from llx_const where name = 'SYSLOG_FILE' and entity = 2;
-delete from llx_const where name = 'SYSLOG_LEVEL' and entity = 2;
-
-alter table llx_societe add column import_key varchar(14);
-
-
--- V4.1 delete from llx_paiementfourn where rowid not in (select fk_paiementfourn from llx_paiementfourn_facturefourn);
--- V4.1 delete from llx_paiementfourn_facturefourn where fk_facturefourn not in (select rowid from llx_facture_fourn);
-
-
-
--- Multi company
-ALTER TABLE llx_rights_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER module;
-ALTER TABLE llx_events ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER type;
-ALTER TABLE llx_boxes_def ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER file;
-ALTER TABLE llx_user_param ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_user;
-ALTER TABLE llx_societe ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-ALTER TABLE llx_socpeople ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
-ALTER TABLE llx_product ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_entrepot ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_chargesociales ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER libelle;
-ALTER TABLE llx_tva ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_bank_account ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_document_model ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER nom;
-ALTER TABLE llx_menu ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER menu_handler;
-ALTER TABLE llx_ecm_directories ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_mailing ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER titre;
-ALTER TABLE llx_categorie ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_propal ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_commande ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_commande_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_product_fournisseur ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref_fourn;
-ALTER TABLE llx_facture ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber;
-ALTER TABLE llx_expedition ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_facture_fourn ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER facnumber;
-ALTER TABLE llx_livraison ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_fichinter ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_contrat ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_c_barcode_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER code;
-ALTER TABLE llx_dolibarr_modules ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER numero;
-ALTER TABLE llx_bank_categ ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER label;
-ALTER TABLE llx_bordereau_cheque ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER number;
-ALTER TABLE llx_prelevement_bons ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_projet ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_adherent ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_adherent_type ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_adherent_options_label ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER name;
-ALTER TABLE llx_facture_rec ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER fk_soc;
-
-ALTER TABLE llx_rights_def DROP PRIMARY KEY;
-ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY;
-
-ALTER TABLE llx_adherent_options_label DROP PRIMARY KEY;
-ALTER TABLE llx_adherent_options_label MODIFY COLUMN name varchar(64) NOT NULL;
-ALTER TABLE llx_adherent_options_label ADD COLUMN rowid integer AUTO_INCREMENT PRIMARY KEY FIRST;
-
-ALTER TABLE llx_user_param DROP INDEX fk_user;
-ALTER TABLE llx_societe DROP INDEX uk_societe_prefix_comm;
-ALTER TABLE llx_societe DROP INDEX uk_societe_code_client;
-ALTER TABLE llx_product DROP INDEX uk_product_ref;
-ALTER TABLE llx_entrepot DROP INDEX label;
-ALTER TABLE llx_bank_account DROP INDEX uk_bank_account_label;
-ALTER TABLE llx_document_model DROP INDEX uk_document_model;
-ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
-ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;
-ALTER TABLE llx_propal DROP INDEX ref;
-ALTER TABLE llx_commande DROP INDEX ref;
-ALTER TABLE llx_commande_fournisseur DROP INDEX uk_commande_fournisseur_ref;
-ALTER TABLE llx_product_fournisseur DROP INDEX fk_product;
-ALTER TABLE llx_product_fournisseur DROP INDEX fk_soc;
-ALTER TABLE llx_facture DROP INDEX idx_facture_uk_facnumber;
-ALTER TABLE llx_expedition DROP INDEX idx_expedition_uk_ref;
-ALTER TABLE llx_facture_fourn DROP INDEX uk_facture_fourn_ref;
-ALTER TABLE llx_livraison DROP INDEX idx_expedition_uk_ref;
-ALTER TABLE llx_livraison DROP INDEX idx_livraison_uk_ref;
-ALTER TABLE llx_fichinter DROP INDEX ref;
-ALTER TABLE llx_prelevement_bons DROP INDEX ref;
-ALTER TABLE llx_projet DROP INDEX ref;
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_adherent DROP INDEX uk_adherent_login;
-ALTER TABLE llx_adherent_type DROP INDEX uk_adherent_type_libelle;
-ALTER TABLE llx_facture_rec DROP INDEX idx_facture_rec_uk_titre;
-
-ALTER TABLE llx_rights_def ADD PRIMARY KEY pk_rights_def (id, entity);
-ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-
-ALTER TABLE llx_user_param ADD UNIQUE INDEX uk_user_param (fk_user,param,entity);
-ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_prefix_comm (prefix_comm, entity);
-ALTER TABLE llx_societe ADD UNIQUE INDEX uk_societe_code_client (code_client, entity);
-ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_ref (ref, entity);
-ALTER TABLE llx_entrepot ADD UNIQUE INDEX uk_entrepot_label (label, entity);
-ALTER TABLE llx_bank_account ADD UNIQUE INDEX uk_bank_account_label (label, entity);
-ALTER TABLE llx_document_model ADD UNIQUE INDEX uk_document_model (nom, type, entity);
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, url, entity);
-ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label, type, entity);
-ALTER TABLE llx_propal ADD UNIQUE INDEX uk_propal_ref (ref, entity);
-ALTER TABLE llx_commande ADD UNIQUE INDEX uk_commande_ref (ref, entity);
-ALTER TABLE llx_commande_fournisseur ADD UNIQUE INDEX uk_commande_fournisseur_ref (ref, fk_soc, entity);
-ALTER TABLE llx_product_fournisseur ADD UNIQUE INDEX uk_product_fournisseur_ref (ref_fourn, fk_soc, entity);
-ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_product (fk_product, entity);
-ALTER TABLE llx_product_fournisseur ADD INDEX idx_product_fourn_fk_soc (fk_soc, entity);
-ALTER TABLE llx_facture ADD UNIQUE INDEX idx_facture_uk_facnumber (facnumber, entity);
-ALTER TABLE llx_expedition ADD UNIQUE INDEX idx_expedition_uk_ref (ref, entity);
-ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc, entity);
-ALTER TABLE llx_livraison ADD UNIQUE INDEX idx_livraison_uk_ref (ref, entity);
-ALTER TABLE llx_fichinter ADD UNIQUE INDEX uk_fichinter_ref (ref, entity);
-ALTER TABLE llx_contrat ADD UNIQUE INDEX uk_contrat_ref (ref, entity);
-ALTER TABLE llx_bordereau_cheque ADD UNIQUE INDEX uk_bordereau_cheque (number, entity);
-ALTER TABLE llx_prelevement_bons ADD UNIQUE INDEX uk_prelevement_bons_ref (ref, entity);
-ALTER TABLE llx_projet ADD UNIQUE INDEX uk_projet_ref (ref, entity);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity);
-ALTER TABLE llx_adherent ADD UNIQUE INDEX uk_adherent_login (login, entity);
-ALTER TABLE llx_adherent_type ADD UNIQUE INDEX uk_adherent_type_libelle (libelle, entity);
-ALTER TABLE llx_adherent_options_label ADD UNIQUE INDEX uk_adherent_options_label_name (name, entity);
-ALTER TABLE llx_facture_rec ADD UNIQUE INDEX idx_facture_rec_uk_titre (titre, entity);
-
-ALTER TABLE llx_projet ADD INDEX idx_projet_fk_soc (fk_soc);
--- V4.1 update llx_projet set fk_soc=null where fk_soc is not null and fk_soc not in (select rowid from llx_societe);
-ALTER TABLE llx_projet ADD CONSTRAINT fk_projet_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
-ALTER TABLE llx_facture_rec ADD CONSTRAINT fk_facture_rec_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
-
-
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_USER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_POPUP_CALENDAR' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_SERVER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MAIL_SMTP_PORT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_UPLOAD_DOC' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_FEATURES_LEVEL' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_SOCIETE' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_CONTACT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_PRODUITSERVICE' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SEARCHFORM_ADHERENT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SIZE_LISTE_LIMIT' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='MAIN_SHOW_WORKBOARD' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='SOCIETE_NOLIST_COURRIER' AND entity=1;
-UPDATE llx_const SET entity=0 WHERE name='GENBARCODE_LOCATION' AND entity=1;
-
-UPDATE llx_const SET entity=0 WHERE name='MAIN_MODULE_SYSLOG';
-UPDATE llx_const SET entity=0 WHERE name='SYSLOG_FILE';
-UPDATE llx_const SET entity=0 WHERE name='SYSLOG_LEVEL';
-
-
--- Fix to solve forgoten names on keys
-ALTER TABLE llx_dolibarr_modules drop primary KEY;
-ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-
-ALTER TABLE llx_events add column user_agent varchar(128) NULL after ip;
-
-
-alter table llx_commande_fournisseur add column ref_supplier varchar(30) after entity;
-
-alter table llx_mailing add column bgcolor varchar(8) after body;
-alter table llx_mailing add column bgimage varchar(255) after bgcolor;
-
--- Added US states
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (1101, 11, 1101, '', 0, 'United-States', 1);
---
--- Provinces US
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AL', 1101, '', 0, 'ALABAMA', 'Alabama', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AK', 1101, '', 0, 'ALASKA', 'Alaska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AZ', 1101, '', 0, 'ARIZONA', 'Arizona', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('AR', 1101, '', 0, 'ARKANSAS', 'Arkansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CA', 1101, '', 0, 'CALIFORNIA', 'California', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CO', 1101, '', 0, 'COLORADO', 'Colorado', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('CT', 1101, '', 0, 'CONNECTICUT', 'Connecticut', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('DE', 1101, '', 0, 'DELAWARE', 'Delaware', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('FL', 1101, '', 0, 'FLORIDA', 'Florida', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('GA', 1101, '', 0, 'GEORGIA', 'Georgia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('HI', 1101, '', 0, 'HAWAII', 'Hawaii', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ID', 1101, '', 0, 'IDAHO', 'Idaho', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IL', 1101, '', 0, 'ILLINOIS','Illinois', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IN', 1101, '', 0, 'INDIANA', 'Indiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('IA', 1101, '', 0, 'IOWA', 'Iowa', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KS', 1101, '', 0, 'KANSAS', 'Kansas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('KY', 1101, '', 0, 'KENTUCKY', 'Kentucky', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('LA', 1101, '', 0, 'LOUISIANA', 'Louisiana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ME', 1101, '', 0, 'MAINE', 'Maine', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MD', 1101, '', 0, 'MARYLAND', 'Maryland', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MA', 1101, '', 0, 'MASSACHUSSETTS', 'Massachusetts', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MI', 1101, '', 0, 'MICHIGAN', 'Michigan', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MN', 1101, '', 0, 'MINNESOTA', 'Minnesota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MS', 1101, '', 0, 'MISSISSIPPI', 'Mississippi', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MO', 1101, '', 0, 'MISSOURI', 'Missouri', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('MT', 1101, '', 0, 'MONTANA', 'Montana', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NE', 1101, '', 0, 'NEBRASKA', 'Nebraska', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NV', 1101, '', 0, 'NEVADA', 'Nevada', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NH', 1101, '', 0, 'NEW HAMPSHIRE', 'New Hampshire', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NJ', 1101, '', 0, 'NEW JERSEY', 'New Jersey', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NM', 1101, '', 0, 'NEW MEXICO', 'New Mexico', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NY', 1101, '', 0, 'NEW YORK', 'New York', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('NC', 1101, '', 0, 'NORTH CAROLINA', 'North Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('ND', 1101, '', 0, 'NORTH DAKOTA', 'North Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OH', 1101, '', 0, 'OHIO', 'Ohio', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OK', 1101, '', 0, 'OKLAHOMA', 'Oklahoma', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('OR', 1101, '', 0, 'OREGON', 'Oregon', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('PA', 1101, '', 0, 'PENNSYLVANIA', 'Pennsylvania', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('RI', 1101, '', 0, 'RHODE ISLAND', 'Rhode Island', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SC', 1101, '', 0, 'SOUTH CAROLINA', 'South Carolina', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('SD', 1101, '', 0, 'SOUTH DAKOTA', 'South Dakota', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TN', 1101, '', 0, 'TENNESSEE', 'Tennessee', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('TX', 1101, '', 0, 'TEXAS', 'Texas', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('UT', 1101, '', 0, 'UTAH', 'Utah', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VT', 1101, '', 0, 'VERMONT', 'Vermont', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('VA', 1101, '', 0, 'VIRGINIA', 'Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WA', 1101, '', 0, 'WASHINGTON', 'Washington', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WV', 1101, '', 0, 'WEST VIRGINIA', 'West Virginia', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WI', 1101, '', 0, 'WISCONSIN', 'Wisconsin', 1);
-insert into llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) values ('WY', 1101, '', 0, 'WYOMING', 'Wyoming', 1);
-
-alter table llx_facture_fourn_det add column ref varchar(50) after fk_product;
-alter table llx_facture_fourn_det add column label varchar(255) after ref;
-
-alter table llx_societe_rib modify column iban_prefix varchar(34);
-alter table llx_bank_account modify column iban_prefix varchar(34);
-
-
-alter table llx_projet add column datec date after fk_statut;
-
-delete from llx_action_def;
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (1,'NOTIFY_VAL_FICHINTER','Validation fiche intervention','Executed when a intervention is validated','ficheinter');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'NOTIFY_VAL_FAC','Validation facture client','Executed when a customer invoice is approved','facture');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (3,'NOTIFY_APP_ORDER_SUPPLIER','Approbation commande fournisseur','Executed when a supplier order is approved','order_supplier');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (4,'NOTIFY_REF_ORDER_SUPPLIER','Refus commande fournisseur','Executed when a supplier order is refused','order_supplier');
-
-
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 51, 5, '19','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 52, 5, '7','0','VAT reduced rate', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 53, 5, '0','0','VAT Rate 0', 1);
-
--- Add rule to avoid duplicate use of discount
-update llx_facturedet set fk_remise_except = null where fk_remise_except = 0;
-ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except);
-
--- Add Mauritius
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15201', 'Mauritius Private Company Limited By Shares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15202', 'Mauritius Company Limited By Guarantee', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15203', 'Mauritius Public Company Limited By Shares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15204', 'Mauritius Foreign Company', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15205', 'Mauritius GBC1 (Offshore Company)', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15206', 'Mauritius GBC2 (International Company)', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15207', 'Mauritius General Partnership', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15208', 'Mauritius Limited Partnership', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15209', 'Mauritius Sole Proprietorship', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15210', 'Mauritius Trusts', 1);
-
-insert into llx_c_currencies ( code, code_iso, active, label ) values ( 'MU', 'MUR', 1, 'Roupies mauritiennes');
-
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1521,152, '0','0','VAT Rate 0',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1522,152, '15','0','VAT Rate 15',1);
-
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15203, 152, 15203, '', 0, 'Grand Port', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15204, 152, 15204, '', 0, 'Moka', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15205, 152, 15205, '', 0, 'Pamplemousses', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15206, 152, 15206, '', 0, 'Plaines Wilhems', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15207, 152, 15207, '', 0, 'Port-Louis', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15208, 152, 15208, '', 0, 'Rivière du Rempart', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15209, 152, 15209, '', 0, 'Savanne', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15210, 152, 15210, '', 0, 'Rodrigues', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15211, 152, 15211, '', 0, 'Les îles Agaléga', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15212, 152, 15212, '', 0, 'Les écueils des Cargados Carajos', 1);
-
-alter table llx_const modify column name varchar(255) NOT NULL;
-alter table llx_const modify column value text NOT NULL;
-
--- SWEDEN (id 20)
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20, '25','0','VAT standard rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (202,20, '12','0','VAT reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (203,20, '6','0','VAT super-reduced rate',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (204,20, '0','0','VAT Rate 0', 1);
-
--- Regions Suisse (id pays=6)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (601, 6, 601, '', 1, 'Cantons', 1);
-
--- Cantons Suisse
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AG','ARGOVIE','Argovie',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BE','BERNE','Berne',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BL','BALE CAMPAGNE','Bâle Campagne',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'BS','BALE VILLE','Bâle Ville',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'FR','FRIBOURG','Fribourg',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GE','GENEVE','Genève',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GL','GLARIS','Glaris',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'GR','GRISONS','Grisons',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'JU','JURA','Jura',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'LU','LUCERNE','Lucerne',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NE','NEUCHATEL','Neuchâtel',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'NW','NIDWALD','Nidwald',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'OW','OBWALD','Obwald',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SG','SAINT-GALL','Saint-Gall',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SH','SCHAFFHOUSE','Schaffhouse',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SO','SOLEURE','Soleure',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'SZ','SCHWYZ','Schwyz',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TG','THURGOVIE','Thurgovie',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'TI','TESSIN','Tessin',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'UR','URI','Uri',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VD','VAUD','Vaud',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'VS','VALAIS','Valais',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZG','ZUG','Zug',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (601,'ZH','ZURICH','Zürich',1);
-
--- Regions spain (id pays=4)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (401, 4, 401, '', 0, 'Andalucia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (402, 4, 402, '', 0, 'Aragón', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (403, 4, 403, '', 0, 'Castilla y León', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (404, 4, 404, '', 0, 'Castilla la Mancha', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (405, 4, 405, '', 0, 'Canarias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (406, 4, 406, '', 0, 'Cataluña', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (407, 4, 407, '', 0, 'Comunidad de Ceuta', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (408, 4, 408, '', 0, 'Comunidad Foral de Navarra', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (409, 4, 409, '', 0, 'Comunidad de Melilla', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (410, 4, 410, '', 0, 'Cantabria', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (411, 4, 411, '', 0, 'Comunidad Valenciana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (412, 4, 412, '', 0, 'Extemadura', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (413, 4, 413, '', 0, 'Galicia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (414, 4, 414, '', 0, 'Islas Baleares', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (415, 4, 415, '', 0, 'La Rioja', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (416, 4, 416, '', 0, 'Comunidad de Madrid', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (417, 4, 417, '', 0, 'Región de Murcia', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (418, 4, 418, '', 0, 'Principado de Asturias', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (419, 4, 419, '', 0, 'Pais Vasco', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (420, 4, 420, '', 0, 'Otros', 1);
-
--- Provinces Spain
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 419, '', 19, 'PAIS VASCO', 'País Vasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 404, '', 4, 'ALBACETE', 'Albacete', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('03', 411, '', 11, 'ALICANTE', 'Alicante', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('04', 401, '', 1, 'ALMERIA', 'Almería', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('05', 403, '', 3, 'AVILA', 'Avila', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('06', 412, '', 12, 'BADAJOZ', 'Badajoz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('07', 414, '', 14, 'ISLAS BALEARES', 'Islas Baleares', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('08', 406, '', 6, 'BARCELONA', 'Barcelona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('09', 403, '', 8, 'BURGOS', 'Burgos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('10', 412, '', 12, 'CACERES', 'Cáceres', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('11', 401, '', 1, 'CADIz', 'Cádiz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('12', 411, '', 11, 'CASTELLON', 'Castellón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('13', 404, '', 4, 'CIUDAD REAL', 'Ciudad Real', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('14', 401, '', 1, 'CORDOBA', 'Córdoba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('15', 413, '', 13, 'LA CORUÑA', 'La Coruña', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('16', 404, '', 4, 'CUENCA', 'Cuenca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('17', 406, '', 6, 'GERONA', 'Gerona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('18', 401, '', 1, 'GRANADA', 'Granada', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('19', 404, '', 4, 'GUADALAJARA', 'Guadalajara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('20', 419, '', 19, 'GUIPUZCOA', 'Guipúzcoa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('21', 401, '', 1, 'HUELVA', 'Huelva', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('22', 402, '', 2, 'HUESCA', 'Huesca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('23', 401, '', 1, 'JAEN', 'Jaén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('24', 403, '', 3, 'LEON', 'León', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('25', 406, '', 6, 'LERIDA', 'Lérida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('26', 415, '', 15, 'LA RIOJA', 'La Rioja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('27', 413, '', 13, 'LUGO', 'Lugo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('28', 416, '', 16, 'MADRID', 'Madrid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('29', 401, '', 1, 'MALAGA', 'Málaga', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('30', 417, '', 17, 'MURCIA', 'Murcia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('31', 408, '', 8, 'NAVARRA', 'Navarra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('32', 413, '', 13, 'ORENSE', 'Orense', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('33', 418, '', 18, 'ASTURIAS', 'Asturias', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('34', 403, '', 3, 'PALENCIA', 'Palencia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('35', 405, '', 5, 'LAS PALMAS', 'Las Palmas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('36', 413, '', 13, 'PONTEVEDRA', 'Pontevedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('37', 403, '', 3, 'SALAMANCA', 'Salamanca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('38', 405, '', 5, 'STA. CRUZ DE TENERIFE', 'Sta. Cruz de Tenerife', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('39', 410, '', 10, 'CANTABRIA', 'Cantabria', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('40', 403, '', 3, 'SEGOVIA', 'Segovia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('41', 401, '', 1, 'SEVILLA', 'Sevilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('42', 403, '', 3, 'SORIA', 'Soria', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('43', 406, '', 6, 'TARRAGONA', 'Tarragona', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('44', 402, '', 2, 'TERUEL', 'Teruel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('45', 404, '', 5, 'TOLEDO', 'Toledo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('46', 411, '', 11, 'VALENCIA', 'Valencia', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('47', 403, '', 3, 'VALLADOLID', 'Valladolid', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('48', 419, '', 19, 'VIZCAYA', 'Vizcaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('49', 403, '', 3, 'ZAMORA', 'Zamora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('50', 402, '', 1, 'ZARAGOZA', 'Zaragoza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('51', 407, '', 7, 'CEUTA', 'Ceuta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('52', 409, '', 9, 'MELILLA', 'Melilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('53', 420, '', 20, 'OTROS', 'Otros', 1);
-
-
-alter table llx_product_price modify price_level smallint NULL DEFAULT 1;
-alter table llx_commandedet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_facturedet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_propaldet modify special_code integer UNSIGNED DEFAULT 0;
-alter table llx_societe modify special_code integer NULL;
-alter table llx_c_forme_juridique modify code integer NOT NULL;
-
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX idx_bank_class_lineid (lineid);
-ALTER TABLE llx_c_ecotaxe ADD UNIQUE INDEX uk_c_ecotaxe (code);
-ALTER TABLE llx_c_methode_commande_fournisseur ADD UNIQUE INDEX uk_c_methode_commande_fournisseur (code);
-
-ALTER TABLE llx_menu change user usertype integer NOT NULL default '0';
-
--- Rename index
-ALTER TABLE llx_adherent_options MODIFY COLUMN optid integer;
-ALTER TABLE llx_adherent_options DROP PRIMARY KEY;
-ALTER TABLE llx_adherent_options DROP INDEX uk_adherent_options;
-ALTER TABLE llx_adherent_options DROP INDEX idx_adherent_options;
-ALTER TABLE llx_adherent_options DROP INDEX adhid;
-ALTER TABLE llx_adherent_options CHANGE optid rowid integer AUTO_INCREMENT PRIMARY KEY;
-ALTER TABLE llx_adherent_options CHANGE adhid fk_member integer NOT NULL;
-ALTER TABLE llx_adherent_options ADD INDEX idx_adherent_options (fk_member);
-
-ALTER TABLE llx_adherent DROP INDEX idx_adherent_fk_soc;
-
-ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_propal (fk_propal);
--- V4.1 delete from llx_propaldet where fk_propal not in (select rowid from llx_propal);
-ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_propal FOREIGN KEY (fk_propal) REFERENCES llx_propal (rowid);
-
-ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid;
-ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid;
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);
-
-
--- Not used. Just to be compatible with 2.7 upgrade process or higher
-alter table llx_menu add column enabled varchar(255) NULL default '1';
diff --git a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql b/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
deleted file mode 100755
index 045f72cf9f5eec3d14c66df5f43140b863a9ebc4..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.7.0-2.8.0.sql
+++ /dev/null
@@ -1,211 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.7.0 or higher.
---
-
-ALTER TABLE llx_actioncomm CHANGE fk_projet fk_project integer;
-
-ALTER TABLE llx_don ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
-ALTER TABLE llx_don ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-
-ALTER TABLE llx_stock_mouvement ADD COLUMN label varchar(128);
-
-ALTER TABLE llx_deplacement ADD COLUMN ref varchar(30) DEFAULT NULL AFTER rowid;
-ALTER TABLE llx_deplacement ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_deplacement ADD COLUMN note_public text;
-
-ALTER TABLE llx_element_element DROP INDEX idx_element_element_idx1;
-ALTER TABLE llx_element_element DROP INDEX idx_element_element_targetid;
-ALTER TABLE llx_element_element CHANGE sourceid fk_source integer NOT NULL;
-ALTER TABLE llx_element_element CHANGE targetid fk_target integer NOT NULL;
-ALTER TABLE llx_element_element ADD UNIQUE INDEX idx_element_element_idx1 (fk_source, sourcetype, fk_target, targettype);
-ALTER TABLE llx_element_element ADD INDEX idx_element_element_fk_target (fk_target);
-
-ALTER TABLE llx_ecm_document RENAME TO llx_ecm_documents;
-ALTER TABLE llx_ecm_documents ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER ref;
-ALTER TABLE llx_ecm_documents ADD COLUMN crc varchar(32) DEFAULT '' NOT NULL AFTER private;
-ALTER TABLE llx_ecm_documents ADD COLUMN cryptkey varchar(50) DEFAULT '' NOT NULL AFTER crc;
-ALTER TABLE llx_ecm_documents ADD COLUMN cipher varchar(50) DEFAULT 'twofish' NOT NULL AFTER cryptkey;
-
-ALTER TABLE llx_facture_fourn_det MODIFY COLUMN qty real;
-
-
-ALTER TABLE llx_notify ADD COLUMN email VARCHAR(255);
-
-ALTER TABLE llx_c_currencies ADD COLUMN labelsing varchar(64);
-update llx_c_currencies set labelsing='Euro' where code_iso='EUR';
-update llx_c_currencies set labelsing='Dollar' where code_iso='USD';
-
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (5,'NOTIFY_VAL_ORDER','Validation commande client','Executed when a customer order is validated','order');
-insert into llx_action_def (rowid,code,titre,description,objet_type) values (6,'NOTIFY_VAL_PROPAL','Validation proposition client','Executed when a commercial proposal is validated','propal');
-
-UPDATE llx_c_type_contact SET element='project' WHERE element='projet';
-
-UPDATE llx_const set value='mail' where value='simplemail' and name='MAIN_MAIL_SENDMODE';
-
-ALTER TABLE llx_projet ADD COLUMN model_pdf varchar(50) AFTER note;
-
-ALTER TABLE llx_societe ADD COLUMN localtax1_assuj tinyint DEFAULT 0 after tva_assuj;
-ALTER TABLE llx_societe ADD COLUMN localtax2_assuj tinyint DEFAULT 0 after localtax1_assuj;
-
-ALTER TABLE llx_user ADD COLUMN photo varchar(255) after statut;
-
--- Create table of extra fields
-create table llx_extra_fields
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- entity integer DEFAULT 1 NOT NULL,
- object varchar(64) NOT NULL,
- assign integer,
- name varchar(64) NOT NULL,
- label varchar(64) NOT NULL,
- format varchar(8) NOT NULL,
- fieldsize integer,
- maxlength integer,
- options varchar(45),
- rank integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields ADD UNIQUE INDEX idx_extra_fields_name (name, entity);
-
--- Create table of possible values
-create table llx_extra_fields_options
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- fk_extra_fields integer NOT NULL,
- value varchar(255) NOT NULL,
- rank integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields_options ADD INDEX idx_extra_fields_options_fk_extra_fields (fk_extra_fields);
-ALTER TABLE llx_extra_fields_options ADD CONSTRAINT fk_extra_fields_options_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
-
--- Create table of values
-create table llx_extra_fields_values
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- entity integer DEFAULT 1 NOT NULL,
- datec datetime,
- datem datetime,
- fk_object integer NOT NULL,
- fk_extra_fields integer NOT NULL,
- value varchar(255),
- fk_user_create integer,
- fk_user_modif integer
-)ENGINE=innodb;
-
-ALTER TABLE llx_extra_fields_values ADD INDEX idx_extra_fields_values_fk_extra_fields (fk_extra_fields, entity);
-ALTER TABLE llx_extra_fields_values ADD CONSTRAINT fk_extra_fields_values_fk_extra_fields FOREIGN KEY (fk_extra_fields) REFERENCES llx_extra_fields (rowid);
-
-ALTER TABLE llx_bank_class DROP INDEX idx_bank_class_lineid;
-ALTER TABLE llx_bank_class DROP INDEX uk_bank_class_lineid;
-ALTER TABLE llx_bank_class ADD UNIQUE INDEX uk_bank_class_lineid (lineid, fk_categ);
-
-ALTER TABLE llx_rights_def MODIFY COLUMN module varchar(64);
-
--- Enhancement of project tasks
-ALTER TABLE llx_projet ADD COLUMN datee DATE AFTER dateo;
-ALTER TABLE llx_projet ADD COLUMN public integer;
-
-ALTER TABLE llx_projet_task ADD COLUMN datec datetime AFTER fk_task_parent;
-ALTER TABLE llx_projet_task ADD COLUMN tms timestamp AFTER datec;
-ALTER TABLE llx_projet_task ADD COLUMN dateo datetime AFTER tms;
-ALTER TABLE llx_projet_task ADD COLUMN datee datetime AFTER dateo;
-ALTER TABLE llx_projet_task ADD COLUMN datev datetime AFTER datee;
-ALTER TABLE llx_projet_task CHANGE title label varchar(255) NOT NULL;
-ALTER TABLE llx_projet_task ADD COLUMN description text AFTER label;
-ALTER TABLE llx_projet_task MODIFY description text;
-ALTER TABLE llx_projet_task MODIFY duration_effective real DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet_task ADD COLUMN progress integer DEFAULT 0 AFTER duration_effective;
-ALTER TABLE llx_projet_task ADD COLUMN priority integer DEFAULT 0 AFTER progress;
-ALTER TABLE llx_projet_task ADD COLUMN fk_milestone integer DEFAULT 0 AFTER priority;
-ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
-ALTER TABLE llx_projet_task ADD COLUMN fk_user_valid integer AFTER fk_user_modif;
-UPDATE llx_projet_task SET statut='1' WHERE statut='open';
-ALTER TABLE llx_projet_task CHANGE statut fk_statut smallint DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet_task CHANGE note note_private text;
-ALTER TABLE llx_projet_task ADD COLUMN note_public text AFTER note_private;
-ALTER TABLE llx_projet_task ADD COLUMN rang integer DEFAULT 0 AFTER note_public;
-
--- Delete old key
-ALTER TABLE llx_projet_task DROP INDEX fk_projet;
-ALTER TABLE llx_projet_task DROP INDEX fk_user_creat;
-ALTER TABLE llx_projet_task DROP INDEX statut;
--- Add new key
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_projet (fk_projet);
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_creat (fk_user_creat);
-ALTER TABLE llx_projet_task ADD INDEX idx_projet_task_fk_user_valid (fk_user_valid);
--- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet);
--- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user);
--- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid);
-ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_user_valid FOREIGN KEY (fk_user_valid) REFERENCES llx_user (rowid);
-
-ALTER TABLE llx_element_contact DROP FOREIGN KEY fk_element_contact_fk_c_type_contact;
-ALTER TABLE llx_element_contact DROP INDEX fk_element_contact_fk_c_type_contact;
-UPDATE llx_c_type_contact SET rowid='160' WHERE rowid='80';
-UPDATE llx_c_type_contact SET rowid='170' WHERE rowid='81';
-UPDATE llx_element_contact SET fk_c_type_contact='160' WHERE fk_c_type_contact='80';
-UPDATE llx_element_contact SET fk_c_type_contact='170' WHERE fk_c_type_contact='81';
-ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_contact_fk_c_type_contact FOREIGN KEY (fk_c_type_contact) REFERENCES llx_c_type_contact(rowid);
-
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (161, 'project', 'internal', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (171, 'project', 'external', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (180, 'project_task', 'internal', 'TASKEXECUTIVE', 'Responsable', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (181, 'project_task', 'internal', 'CONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (190, 'project_task', 'external', 'TASKEXECUTIVE', 'Responsable', 1);
-insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) values (191, 'project_task', 'external', 'CONTRIBUTOR', 'Intervenant', 1);
-
-ALTER TABLE llx_projet ADD COLUMN description text AFTER title;
-ALTER TABLE llx_projet CHANGE note note_private text;
-ALTER TABLE llx_projet ADD COLUMN note_public text AFTER note_private;
-ALTER TABLE llx_projet MODIFY fk_statut smallint DEFAULT 0 NOT NULL;
-ALTER TABLE llx_projet MODIFY fk_user_creat integer NOT NULL;
-
--- Uniformize code: change tva_taux to tva_tx
-ALTER TABLE llx_facturedet CHANGE tva_taux tva_tx real;
-ALTER TABLE llx_facture_fourn_det CHANGE tva_taux tva_tx double(6,3);
-ALTER TABLE llx_facturedet_rec CHANGE tva_taux tva_tx real DEFAULT 19.6;
-
--- Create table for entities
-create table llx_entity
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- label varchar(255) NOT NULL,
- description text,
- datec datetime,
- fk_user_creat integer,
- visible tinyint DEFAULT 1 NOT NULL,
- active tinyint DEFAULT 1 NOT NULL
-) ENGINE=innodb;
-
-INSERT INTO llx_entity (rowid, label, description, datec, fk_user_creat, visible, active) VALUES (1, 'Default Entity', 'This is the default entity', NOW(), 1, 1, 1);
-
--- Add constraint
--- V4.1 DELETE FROM llx_fichinterdet WHERE fk_fichinter NOT IN (SELECT rowid from llx_fichinter);
-ALTER TABLE llx_fichinterdet ADD INDEX idx_fichinterdet_fk_fichinter (fk_fichinter);
-ALTER TABLE llx_fichinterdet ADD CONSTRAINT fk_fichinterdet_fk_fichinter FOREIGN KEY (fk_fichinter) REFERENCES llx_fichinter (rowid);
-
-
-
--- This was created into 2.9.0 but we need them to avoid errors of migration to 2.8 using new classes
-alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-
-
--- This was created into 3.0.0 but we need them to avoid errors of migration to 2.8 using new classes
-ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line integer NULL AFTER fk_propal;
-ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande;
-ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
deleted file mode 100755
index d4c889d93987c162ea17414b8d5fc10e77f9025c..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
+++ /dev/null
@@ -1,329 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.8.0 or higher.
---
-
--- Add unique key
-ALTER TABLE llx_product_stock ADD UNIQUE INDEX uk_product_stock (fk_product,fk_entrepot);
-
-ALTER TABLE llx_product_stock drop column location;
-
--- Add missing table llx_product_association
-create table llx_product_association
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- fk_product_pere integer NOT NULL DEFAULT 0,
- fk_product_fils integer NOT NULL DEFAULT 0,
- qty double NULL
-)ENGINE=innodb;
-
-
-ALTER TABLE llx_product_association ADD UNIQUE INDEX uk_product_association (fk_product_pere, fk_product_fils);
-
-ALTER TABLE llx_product_association ADD INDEX idx_product_association_fils (fk_product_fils);
-
-
-
-ALTER TABLE llx_product ADD INDEX idx_product_label (label);
-
--- V4.1 DELETE FROM llx_projet_task WHERE fk_projet NOT IN (SELECT rowid from llx_projet);
--- V4.1 UPDATE llx_projet_task set fk_user_creat=NULL WHERE fk_user_creat IS NOT NULL AND fk_user_creat NOT IN (SELECT rowid from llx_user);
--- V4.1 UPDATE llx_projet_task set fk_user_valid=NULL WHERE fk_user_valid IS NOT NULL AND fk_user_valid NOT IN (SELECT rowid from llx_user);
-
-ALTER table llx_bank_account ADD COLUMN fk_pays integer DEFAULT 0 NOT NULL after domiciliation;
-ALTER TABLE llx_bank_account ADD COLUMN fk_departement integer DEFAULT NULL after domiciliation;
-ALTER TABLE llx_socpeople ADD COLUMN fk_departement integer DEFAULT NULL after ville;
-ALTER TABLE llx_adherent ADD COLUMN fk_departement integer DEFAULT NULL after ville;
-ALTER TABLE llx_entrepot ADD COLUMN fk_departement integer DEFAULT NULL after ville;
-
-ALTER TABLE llx_bookmark ADD COLUMN position integer DEFAULT 0;
-
--- Rename llx_product_det
-ALTER TABLE llx_product_det RENAME TO llx_product_lang;
-ALTER TABLE llx_product_lang ADD UNIQUE INDEX uk_product_lang (fk_product, lang);
--- V4.1 DELETE FROM llx_product_lang WHERE fk_product NOT IN (SELECT rowid from llx_product);
-ALTER TABLE llx_product_lang ADD CONSTRAINT fk_product_lang_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);
-
-ALTER TABLE llx_product ADD COLUMN virtual tinyint DEFAULT 0 NOT NULL AFTER tms;
-ALTER TABLE llx_product ADD COLUMN fk_parent integer DEFAULT 0 AFTER virtual;
-
-alter table llx_societe add column default_lang varchar(6) after price_level;
-alter table llx_socpeople add column default_lang varchar(6) after note;
-
-
-alter table llx_mailing add column joined_file1 varchar(255);
-alter table llx_mailing add column joined_file2 varchar(255);
-alter table llx_mailing add column joined_file3 varchar(255);
-alter table llx_mailing add column joined_file4 varchar(255);
-
-update llx_facture_fourn set fk_statut=2 where fk_statut=1 AND paye=1;
-
-alter table llx_facture_fourn add column close_code varchar(16) after remise;
-alter table llx_facture_fourn add column close_note varchar(128) after close_code;
-
--- Add local taxes
-alter table llx_facture add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_facture_rec add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_rec add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facturedet_rec add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facturedet_rec add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facturedet_rec add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_facturedet_rec add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_c_tva add column localtax1 double NOT NULL DEFAULT 0 after taux;
-alter table llx_c_tva add column localtax2 double NOT NULL DEFAULT 0 after localtax1;
-
-alter table llx_propal add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_propal add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_propaldet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_propaldet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_propaldet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_propaldet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_commande add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_commande add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_commandedet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_commandedet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_commandedet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_commandedet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_commande_fournisseur add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_commande_fournisseur add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_commande_fournisseurdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_commande_fournisseurdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_commande_fournisseurdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_commande_fournisseurdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_facture_fourn add column localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_fourn add column localtax2 double(24,8) DEFAULT 0 after localtax1;
-alter table llx_facture_fourn_det add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_facture_fourn_det add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_facture_fourn_det add column total_localtax1 double(24,8) DEFAULT 0 after tva;
-alter table llx_facture_fourn_det add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_product add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_product add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_product_price add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_product_price add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-
-alter table llx_contratdet add column localtax1_tx double(6,3) DEFAULT 0 after tva_tx;
-alter table llx_contratdet add column localtax2_tx double(6,3) DEFAULT 0 after localtax1_tx;
-alter table llx_contratdet add column total_localtax1 double(24,8) DEFAULT 0 after total_tva;
-alter table llx_contratdet add column total_localtax2 double(24,8) DEFAULT 0 after total_localtax1;
-
-alter table llx_product add column hidden tinyint DEFAULT 0;
-
-alter table llx_product add column length float DEFAULT NULL after weight_units;
-alter table llx_product add column length_units tinyint DEFAULT NULL after length;
-alter table llx_product add column surface float DEFAULT NULL after length_units;
-alter table llx_product add column surface_units tinyint DEFAULT NULL after surface;
-
-alter table llx_product add column accountancy_code_sell varchar(15) after fk_barcode_type;
-alter table llx_product add column accountancy_code_buy varchar(15) after accountancy_code_sell;
-
-ALTER TABLE llx_product drop column stock_loc;
-ALTER TABLE llx_product_stock add column location varchar(32);
-
-ALTER TABLE llx_expedition DROP FOREIGN KEY fk_expedition_fk_adresse_livraison;
-ALTER TABLE llx_expedition DROP INDEX idx_expedition_fk_adresse_livraison;
-ALTER TABLE llx_expedition ADD COLUMN ref_customer varchar(30) AFTER entity;
-ALTER TABLE llx_expedition ADD COLUMN date_delivery date DEFAULT NULL AFTER date_expedition;
-ALTER TABLE llx_expedition CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
-
-ALTER TABLE llx_livraison DROP FOREIGN KEY fk_livraison_fk_adresse_livraison;
-ALTER TABLE llx_livraison DROP INDEX idx_livraison_fk_adresse_livraison;
-ALTER TABLE llx_livraison change ref_client ref_customer varchar(30);
-ALTER TABLE llx_livraison change date_livraison date_delivery date DEFAULT NULL;
-ALTER TABLE llx_livraison CHANGE COLUMN fk_adresse_livraison fk_address integer DEFAULT NULL;
-
-ALTER TABLE llx_c_actioncomm MODIFY libelle varchar(48) NOT NULL;
-
-ALTER TABLE llx_facture MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY total double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture MODIFY amount double(24,8) DEFAULT 0 NOT NULL;
-
-ALTER TABLE llx_facturedet MODIFY tva_tx double(6,3);
-ALTER TABLE llx_facturedet MODIFY subprice double(24,8);
-ALTER TABLE llx_facturedet MODIFY price double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_ht double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_tva double(24,8);
-ALTER TABLE llx_facturedet MODIFY total_ttc double(24,8);
-
-ALTER TABLE llx_facture_rec MODIFY tva double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY total double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY total_ttc double(24,8) DEFAULT 0;
-ALTER TABLE llx_facture_rec MODIFY amount double(24,8) DEFAULT 0 NOT NULL;
-
-ALTER TABLE llx_facturedet_rec MODIFY tva_tx double(6,3);
-ALTER TABLE llx_facturedet_rec MODIFY subprice double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY price double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_ht double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_tva double(24,8);
-ALTER TABLE llx_facturedet_rec MODIFY total_ttc double(24,8);
-
-
-ALTER TABLE llx_adherent ADD COLUMN civilite varchar(6) after entity;
-
-ALTER TABLE llx_deplacement ADD COLUMN fk_projet integer DEFAULT 0 after fk_soc;
-
--- Custom list
-DROP TABLE llx_c_field_list;
-create table llx_c_field_list
-(
- rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
- element varchar(64) NOT NULL,
- entity integer DEFAULT 1 NOT NULL,
- name varchar(32) NOT NULL,
- alias varchar(32) NOT NULL,
- title varchar(32) NOT NULL,
- align varchar(6) DEFAULT 'left',
- sort tinyint DEFAULT 1 NOT NULL,
- search tinyint DEFAULT 0 NOT NULL,
- enabled varchar(255) DEFAULT 1,
- rang integer DEFAULT 0
-)ENGINE=innodb;
-
-INSERT INTO llx_c_field_list (rowid, element, entity, name, alias, title, align, sort, search, enabled, rang) VALUES
-(1, 'product_default', 1, 'p.ref', 'ref', 'Ref', 'left', 1, 1, '1', 1),
-(2, 'product_default', 1, 'p.label', 'label', 'Label', 'left', 1, 1, '1', 2),
-(3, 'product_default', 1, 'p.barcode', 'barcode', 'BarCode', 'center', 1, 1, '$conf->barcode->enabled', 3),
-(4, 'product_default', 1, 'p.tms', 'datem', 'DateModification', 'center', 1, 0, '1', 4),
-(5, 'product_default', 1, 'p.price', 'price', 'SellingPriceHT', 'right', 1, 0, '1', 5),
-(6, 'product_default', 1, 'p.price_ttc', 'price_ttc', 'SellingPriceTTC', 'right', 1, 0, '1', 6),
-(7, 'product_default', 1, 'p.stock', 'stock', 'Stock', 'right', 0, 0, '$conf->stock->enabled', 7),
-(8, 'product_default', 1, 'p.envente', 'status', 'Status', 'right', 1, 0, '1', 8);
-
-
-UPDATE llx_adherent SET pays = null where pays <= '0' and pays != '0';
-ALTER table llx_adherent MODIFY pays integer;
-
--- Drop old tables
-DROP TABLE llx_projet_milestone;
-ALTER TABLE llx_projet drop column fk_milestone;
-
-ALTER TABLE llx_deplacement ADD COLUMN fk_statut INTEGER DEFAULT 1 NOT NULL after type;
-
-drop table llx_appro;
-
-ALTER TABLE llx_events MODIFY COLUMN user_agent varchar(255) NULL;
-
-create table llx_categorie_member
-(
- fk_categorie integer NOT NULL,
- fk_member integer NOT NULL
-)ENGINE=innodb;
-
-ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member);
-ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_categorie (fk_categorie);
-ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_member (fk_member);
-
-ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_member_rowid FOREIGN KEY (fk_member) REFERENCES llx_adherent (rowid);
-
-ALTER TABLE llx_product ADD COLUMN canvas varchar(32) DEFAULT 'default@product';
-ALTER TABLE llx_product MODIFY COLUMN canvas varchar(32) DEFAULT 'default@product';
-UPDATE llx_product SET canvas = 'default@product' WHERE fk_product_type = 0 AND (canvas = '' OR canvas = 'default');
-UPDATE llx_product SET canvas = 'service@product' WHERE fk_product_type = 1 AND (canvas = '' OR canvas = 'service');
-UPDATE llx_product SET canvas = 'livre@droitpret' WHERE canvas = 'livre';
-UPDATE llx_product SET canvas = 'livrecontrat@droitpret' WHERE canvas = 'livrecontrat';
-UPDATE llx_product SET canvas = 'livrecouverture@droitpret' WHERE canvas = 'livrecouverture';
-
-
-ALTER TABLE llx_menu DROP INDEX idx_menu_uk_menu;
-
-ALTER TABLE llx_menu ADD UNIQUE INDEX idx_menu_uk_menu (menu_handler, fk_menu, position, url, entity);
-
-UPDATE llx_const SET name = 'MAIN_MODULE_PRODUCT' WHERE name = 'MAIN_MODULE_PRODUIT';
-
-UPDATE llx_expedition set ref_customer = NULL where ref_customer = '';
-
--- Add more predefined action codes --
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (30, 'AC_SUP_ORD', 'system', 'Send supplier order by email' ,'supplier_order');
-insert into llx_c_actioncomm (id, code, type, libelle, module) values (31, 'AC_SUP_INV', 'system', 'Send supplier invoice by email' ,'supplier_invoice');
-
--- Rename llx_societe_adresse_livraison
-ALTER TABLE llx_societe_adresse_livraison RENAME TO llx_societe_address;
-ALTER TABLE llx_societe_address CHANGE COLUMN nom name varchar(60);
-ALTER TABLE llx_societe_address CHANGE COLUMN fk_societe fk_soc integer DEFAULT 0;
-
--- Add new spanish VAT from July 2010
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 45, 4, '18','0','4','VAT standard rate from July 2010',1);
-insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,note,active) values ( 46, 4, '8','0','1','VAT reduced rate from July 2010',1);
-
--- Add Argentina Data
--- Regions Argentina (id pays=23)
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2301, 23, 2301, '', 0, 'Norte', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2302, 23, 2302, '', 0, 'Litoral', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2303, 23, 2303, '', 0, 'Cuyana', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2304, 23, 2304, '', 0, 'Central', 1);
-INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (2305, 23, 2305, '', 0, 'Patagonia', 1);
-
--- Provinces Argentina
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2301', 2301, '', 01, 'CATAMARCA', 'Catamarca', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2302', 2301, '', 02, 'YUJUY', 'Yujuy', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2303', 2301, '', 03, 'TUCAMAN', 'Tucamán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2304', 2301, '', 04, 'SANTIAGO DEL ESTERO', 'Santiago del Estero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2305', 2301, '', 05, 'SALTA', 'Salta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2306', 2302, '', 06, 'CHACO', 'Chaco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2307', 2302, '', 07, 'CORRIENTES', 'Corrientes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2308', 2302, '', 08, 'ENTRE RIOS', 'Entre Ríos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2309', 2302, '', 09, 'FORMOSA MISIONES', 'Formosa Misiones', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2310', 2302, '', 10, 'SANTA FE', 'Santa Fe', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2311', 2303, '', 11, 'LA RIOJA', 'La Rioja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2312', 2303, '', 12, 'MENDOZA', 'Mendoza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2313', 2303, '', 13, 'SAN JUAN', 'San Juan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2314', 2303, '', 14, 'SAN LUIS', 'San Luis', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2315', 2304, '', 15, 'CORDOBA', 'Córdoba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2316', 2304, '', 16, 'BUENOS AIRES', 'Buenos Aires', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2317', 2304, '', 17, 'CABA', 'Caba', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2318', 2305, '', 18, 'LA PAMPA', 'La Pampa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2319', 2305, '', 19, 'NEUQUEN', 'Neuquén', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2320', 2305, '', 20, 'RIO NEGRO', 'Río Negro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2321', 2305, '', 21, 'CHUBUT', 'Chubut', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2322', 2305, '', 22, 'SANTA CRUZ', 'Santa Cruz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2323', 2305, '', 23, 'TIERRA DEL FUEGO', 'Tierra del Fuego', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2324', 2305, '', 24, 'ISLAS MALVINAS', 'Islas Malvinas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2325', 2305, '', 25, 'ANTARTIDA', 'Antártida', 1);
-
--- Juridical status Argentina
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2301', 'Monotributista', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2302', 'Sociedad Civil', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2303', 'Sociedades Comerciales', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2304', 'Sociedades de Hecho', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2305', 'Sociedades Irregulares', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2306', 'Sociedad Colectiva', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2307', 'Sociedad en Comandita Simple', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2308', 'Sociedad de Capital e Industria', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2309', 'Sociedad Accidental o en participación', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2310', 'Sociedad de Responsabilidad Limitada', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2311', 'Sociedad Anónima', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2312', 'Sociedad Anónima con Participación Estatal Mayoritaria', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (23, '2313', 'Sociedad en Comandita por Acciones (arts. 315 a 324, LSC)', 1);
-
-
-DELETE from llx_const where name='USER_PASSWORD_GENERATED' and value='default';
-
-
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL;
-ALTER TABLE llx_boxes_def MODIFY note varchar(130);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note);
-
--- Fix bad old data
-UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%';
-
-
-update llx_const set value ='eldy' where name = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon');
-update llx_user_param set value ='eldy' where param = 'MAIN_THEME' and (value= 'rodolphe' or value='dev' or value='bluelagoon');
-
-
-ALTER TABLE llx_tmp_caisse MODIFY fk_article integer NOT NULL;
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
deleted file mode 100644
index b3fbcca8ed117e0a0d63c6ce5e4fef818157a1ba..0000000000000000000000000000000000000000
--- a/htdocs/install/mysql/migration/2.9.0-3.0.0.sql
+++ /dev/null
@@ -1,169 +0,0 @@
---
--- Be carefull to requests order.
--- This file must be loaded by calling /install/index.php page
--- when current version is 2.9.0 or higher.
---
--- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
--- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
--- To change type of field: ALTER TABLE llx_table MODIFY name varchar(60);
--- To remove a column: ALTER TABLE llx_table DROP COLUMN colname;
-
-ALTER TABLE llx_paiement MODIFY amount double(24,8);
-ALTER TABLE llx_paiement_facture MODIFY amount double(24,8);
-
--- Fix bad old data
-UPDATE llx_bank_url SET type='payment' WHERE type='?' AND label='(payment)' AND url LIKE '%compta/paiement/fiche.php%';
-
--- Add recuperableonly field
-ALTER TABLE llx_product add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx;
-ALTER TABLE llx_product_price add COLUMN recuperableonly integer NOT NULL DEFAULT '0' after tva_tx;
-
--- Rename envente into tosell and add tobuy
-ALTER TABLE llx_product CHANGE COLUMN envente tosell tinyint DEFAULT 1;
-ALTER TABLE llx_product add COLUMN tobuy tinyint DEFAULT 1 after tosell;
-ALTER TABLE llx_product_price CHANGE COLUMN envente tosell tinyint DEFAULT 1;
-
-ALTER TABLE llx_bank MODIFY COLUMN fk_type varchar(6);
-
-ALTER TABLE llx_boxes_def DROP INDEX uk_boxes_def;
-ALTER TABLE llx_boxes_def MODIFY file varchar(200) NOT NULL;
-ALTER TABLE llx_boxes_def MODIFY note varchar(130);
-ALTER TABLE llx_boxes_def ADD UNIQUE INDEX uk_boxes_def (file, entity, note);
-
-ALTER TABLE llx_notify_def MODIFY fk_contact integer NULL;
-ALTER TABLE llx_notify_def ADD COLUMN fk_user integer NULL after fk_contact;
-ALTER TABLE llx_notify_def ADD COLUMN type varchar(16) DEFAULT 'email';
-
-ALTER TABLE llx_notify MODIFY fk_contact integer NULL;
-ALTER TABLE llx_notify ADD COLUMN fk_user integer NULL after fk_contact;
-ALTER TABLE llx_notify ADD COLUMN type varchar(16) DEFAULT 'email';
-
-ALTER TABLE llx_actioncomm MODIFY label varchar(128) NOT NULL;
-
-ALTER TABLE llx_expedition MODIFY date_expedition datetime;
-ALTER TABLE llx_expedition MODIFY date_delivery datetime NULL;
-
-ALTER TABLE llx_societe ADD COLUMN canvas varchar(32) NULL AFTER default_lang;
-ALTER TABLE llx_societe MODIFY canvas varchar(32) NULL;
-
-ALTER TABLE llx_cond_reglement RENAME TO llx_c_payment_term;
-ALTER TABLE llx_expedition_methode RENAME TO llx_c_shipment_mode;
-
-ALTER TABLE llx_facturedet_rec ADD COLUMN special_code integer UNSIGNED DEFAULT 0 AFTER total_ttc;
-ALTER TABLE llx_facturedet_rec ADD COLUMN rang integer DEFAULT 0 AFTER special_code;
-
-ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_order integer;
-ALTER TABLE llx_actioncomm ADD COLUMN fk_supplier_invoice integer;
-
-ALTER TABLE llx_propaldet ADD COLUMN fk_parent_line integer NULL AFTER fk_propal;
-ALTER TABLE llx_commandedet ADD COLUMN fk_parent_line integer NULL AFTER fk_commande;
-ALTER TABLE llx_facturedet ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-ALTER TABLE llx_facturedet_rec ADD COLUMN fk_parent_line integer NULL AFTER fk_facture;
-
--- Remove old Spanish TVA
-UPDATE llx_c_tva SET taux = '18' WHERE rowid = 41;
-UPDATE llx_c_tva SET taux = '8' WHERE rowid = 42;
-DELETE FROM llx_c_tva WHERE rowid = 45;
-DELETE FROM llx_c_tva WHERE rowid = 46;
-
-
-ALTER TABLE llx_adherent ADD COLUMN import_key varchar(14);
-ALTER TABLE llx_categorie ADD COLUMN import_key varchar(14);
-
-
-ALTER TABLE llx_product ADD COLUMN customcode varchar(32) after note;
-ALTER TABLE llx_product ADD COLUMN fk_country integer after customcode;
-
-
-ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX idx_ecm_directories (label, fk_parent, entity);
-ALTER TABLE llx_ecm_documents ADD UNIQUE INDEX idx_ecm_documents (fullpath_dol);
-
--- Add modules facture fournisseur
-INSERT INTO llx_const (name, value, type, note, visible) values ('INVOICE_SUPPLIER_ADDON_PDF', 'canelle','chaine','',0);
-ALTER TABLE llx_facture_fourn ADD COLUMN model_pdf varchar(50) after note_public;
-
-CREATE TABLE llx_c_ziptown
-(
- rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
- code varchar(5) DEFAULT NULL,
- fk_county integer NOT NULL,
- zip varchar(10) NOT NULL,
- town varchar(255) NOT NULL,
- active tinyint NOT NULL DEFAULT 1
-) ENGINE=innodb;
-
-ALTER TABLE llx_c_ziptown ADD INDEX idx_c_ziptown_fk_county (fk_county);
-ALTER TABLE llx_c_ziptown ADD CONSTRAINT fk_c_ziptown_fk_county FOREIGN KEY (fk_county) REFERENCES llx_c_departements (rowid);
-
-ALTER TABLE llx_socpeople ADD COLUMN canvas varchar(32) NULL after default_lang;
-ALTER TABLE llx_socpeople MODIFY canvas varchar(32) NULL;
-
-UPDATE llx_socpeople SET canvas = 'default' WHERE canvas = 'default@contact';
-UPDATE llx_societe SET canvas = 'default' WHERE canvas = 'default@thirdparty';
-UPDATE llx_societe SET canvas = 'individual' WHERE canvas = 'individual@thirdparty';
-
-INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS','7','chaine','Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées',0);
-
-ALTER TABLE llx_actioncomm ADD COLUMN fulldayevent smallint NOT NULL default 0 after priority;
-
--- Enhance POS module
-DROP TABLE llx_tmp_caisse;
-CREATE TABLE llx_pos_tmp (
- id integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
- fk_article integer NOT NULL,
- qte real NOT NULL,
- fk_tva integer NOT NULL,
- remise_percent real NOT NULL,
- remise real NOT NULL,
- total_ht double(24,8) NOT NULL,
- total_tva double(24,8) NOT NULL,
- total_ttc double(24,8) NOT NULL
-) ENGINE=innodb;
-
--- Add external ref
-ALTER TABLE llx_facture ADD COLUMN ref_ext varchar(30) after entity;
-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(30) after entity;
-
-
-ALTER TABLE llx_mailing_cibles CHANGE COLUMN url source_url integer;
-ALTER TABLE llx_mailing_cibles MODIFY source_url varchar(160);
-ALTER TABLE llx_mailing_cibles ADD COLUMN source_id integer after source_url;
-ALTER TABLE llx_mailing_cibles ADD COLUMN source_type varchar(16) after source_id;
-
-ALTER TABLE llx_facture_rec DROP COLUMN frequency;
-ALTER TABLE llx_facture_rec ADD COLUMN frequency integer;
-ALTER TABLE llx_facture_rec ADD COLUMN unit_frequency varchar(2) DEFAULT 'd';
-ALTER TABLE llx_facture_rec ADD COLUMN date_when datetime DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN date_last_gen datetime DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_done integer DEFAULT NULL;
-ALTER TABLE llx_facture_rec ADD COLUMN nb_gen_max integer DEFAULT NULL;
-
-
-ALTER TABLE llx_user ADD COLUMN openid varchar(255);
-
--- Enhance Withdrawal module
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (7,'NOTIFY_TRN_WITHDRAW','Transmit withdraw','Executed when a withdrawal is transmited','withdraw');
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (8,'NOTIFY_CRD_WITHDRAW','Credite withdraw','Executed when a withdrawal is credited','withdraw');
-INSERT INTO llx_action_def (rowid,code,titre,description,objet_type) values (9,'NOTIFY_EMT_WITHDRAW','Emit withdraw','Executed when a withdrawal is emited','withdraw');
-
-ALTER TABLE llx_prelevement_notifications MODIFY action varchar(32);
-
-ALTER TABLE llx_c_tva ADD COLUMN accountancy_code varchar(15) DEFAULT NULL;
-
-
-UPDATE llx_c_actioncomm set module='invoice_supplier' WHERE module='supplier_invoice';
-UPDATE llx_c_actioncomm set module='order_supplier' WHERE module='supplier_order';
-UPDATE llx_documentmodel set type='invoice_supplier' WHERE type='supplier_invoice';
-UPDATE llx_documentmodel set type='order_supplier' WHERE type='supplier_order';
-UPDATE llx_c_type_contact set element='invoice_supplier' WHERE element='facture_fourn';
-UPDATE llx_c_type_contact set module='invoice_supplier' WHERE module='supplier_invoice';
-UPDATE llx_c_type_contact set module='order_supplier' WHERE module='supplier_order';
-
-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);
-
-ALTER TABLE llx_societe_remise MODIFY remise_client double(6,3) DEFAULT 0 NOT NULL;
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 8f79fbcf980ed7b35c77d9670dc5a56926d6cbef..f2d808cb2c174c69917b60116de44cf6940a3cd8 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -68,7 +68,7 @@ ALTER TABLE llx_projet_task_time ADD COLUMN task_datehour datetime after task_da
-- Localtaxes by thirds
ALTER TABLE llx_c_tva MODIFY COLUMN localtax1 varchar(10);
ALTER TABLE llx_c_tva MODIFY COLUMN localtax2 varchar(10);
-ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint(4) after entity;
+ALTER TABLE llx_localtax ADD COLUMN localtaxtype tinyint after entity;
ALTER TABLE llx_societe ADD COLUMN localtax1_value double(6,3) after localtax1_assuj;
ALTER TABLE llx_societe ADD COLUMN localtax2_value double(6,3) after localtax2_assuj;
@@ -940,7 +940,7 @@ create table llx_c_email_templates
position smallint, -- Position
topic text, -- Predefined topic
content text -- Predefined text
-)ENGINE=innodb;
+) ENGINE=innodb;
UPDATE llx_c_regions SET rowid = 0 where rowid = 1;
@@ -952,11 +952,11 @@ CREATE TABLE llx_holiday_types (
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
label varchar(45) NOT NULL,
description varchar(255) NOT NULL,
- affect int(1) NOT NULL,
- delay int(1) NOT NULL,
+ affect integer NOT NULL,
+ delay integer NOT NULL,
insertAt DATETIME NOT NULL,
updateAt DATETIME,
deleteAt DATETIME,
nbCongesDeducted varchar(255) NOT NULL,
nbCongesEveryMonth varchar(255) NOT NULL
-);
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_holiday_types.sql b/htdocs/install/mysql/tables/llx_holiday_types.sql
index 242483b59742e0e2c900c6f1363b0af15521adf2..d49a79f574879e36ec5a87f5fa2df78029596b76 100755
--- a/htdocs/install/mysql/tables/llx_holiday_types.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_types.sql
@@ -27,4 +27,4 @@ CREATE TABLE llx_holiday_types (
deleteAt DATETIME,
nbCongesDeducted varchar(255) NOT NULL,
nbCongesEveryMonth varchar(255) NOT NULL
-);
+) ENGINE=innodb;
diff --git a/test/phpunit/SqlTest.php b/test/phpunit/SqlTest.php
index b2c9409d6531b6d09a5bb487166c2307c45f796a..251709f847100426d9b0b95c5d14ce4795a526b8 100755
--- a/test/phpunit/SqlTest.php
+++ b/test/phpunit/SqlTest.php
@@ -139,25 +139,31 @@ class SqlTest extends PHPUnit_Framework_TestCase
$langs=$this->savlangs;
$db=$this->savdb;
- $filesarray = scandir(DOL_DOCUMENT_ROOT.'/install/mysql/tables');
- foreach($filesarray as $key => $file)
- {
- if (! preg_match('/\.sql$/',$file)) continue;
-
- print 'Check sql file '.$file."\n";
- $filecontent=file_get_contents(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$file);
-
- $result=strpos($filecontent,'`');
- print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
- $this->assertTrue($result===false, 'Found ON back quote. Bad.');
+ $listofsqldir = array(DOL_DOCUMENT_ROOT.'/install/mysql/tables', DOL_DOCUMENT_ROOT.'/install/mysql/migration');
- $result=strpos($filecontent,'int(');
- print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
- $this->assertTrue($result===false, 'Found int(x) instead of integer. Bad.');
-
- $result=strpos($filecontent,'ON DELETE CASCADE');
- print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
- $this->assertTrue($result===false, 'Found ON DELETE CASCADE. Bad.');
+ foreach ($listofsqldir as $dir)
+ {
+ print 'Process dir '.$dir."\n";
+ $filesarray = scandir($dir);
+ foreach($filesarray as $key => $file)
+ {
+ if (! preg_match('/\.sql$/',$file)) continue;
+
+ print 'Check sql file '.$file."\n";
+ $filecontent=file_get_contents($dir.'/'.$file);
+
+ $result=strpos($filecontent,'`');
+ print __METHOD__." Result for checking we don't have back quote = ".$result."\n";
+ $this->assertTrue($result===false, 'Found back quote into '.$file.'. Bad.');
+
+ $result=strpos($filecontent,'int(');
+ print __METHOD__." Result for checking we don't have 'int(' instead of 'integer' = ".$result."\n";
+ $this->assertTrue($result===false, 'Found int(x) instead of integer into '.$file.'. Bad.');
+
+ $result=strpos($filecontent,'ON DELETE CASCADE');
+ print __METHOD__." Result for checking we don't have 'ON DELETE CASCADE' = ".$result."\n";
+ $this->assertTrue($result===false, 'Found ON DELETE CASCADE into '.$file.'. Bad.');
+ }
}
return;