diff --git a/build/dolibarr_mysql2pgsql.pl b/build/dolibarr_mysql2pgsql.pl index 020e71598df66e1ec78888dce84e0c6d66f1006e..3e25d553f05bccecb628f49499433c5165b86c3f 100644 --- a/build/dolibarr_mysql2pgsql.pl +++ b/build/dolibarr_mysql2pgsql.pl @@ -2,7 +2,7 @@ #------------------------------------------------------------------------------ # Ce script est une version modifiee de mysql2pgsql afin de: # - gerer les base mysql innodb -# - traiter tous les fichiers ../mysq/data/*.sql vers ./pgsql/data +# - traiter tous les fichiers mysql/data/*.sql vers pgsql/data # - gerer les autoincrement en SERIAL plutot qu'en sequenceurs # - utiliser le CHECK plutot que des sous-tables pour les types enum # - corriger de nombreux bugs @@ -36,8 +36,8 @@ my $table=""; ($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1; $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; -$SOURCE="$DIR/../mysql/tables"; -$DESTI="$DIR/../pgsql/tables"; +$SOURCE="$DIR/install/mysql/tables"; +$DESTI="$DIR/install/pgsql/tables"; # Recherche tous les fichiers .sql opendir(DIR, $SOURCE); diff --git a/build/exe/nsi/dolibarr.nsi b/build/exe/nsi/dolibarr.nsi index 830b577ca200a5c397f143f647e796bb35cda94a..c1910561030636ea73e8b3a8bbcb1f6523b09cb8 100644 --- a/build/exe/nsi/dolibarr.nsi +++ b/build/exe/nsi/dolibarr.nsi @@ -173,9 +173,8 @@ Section "Dolibarr" Dolibarr SetOutPath $INSTDIR File /x CVS /x .cvsignore /x Thumbs.db "..\..\*" File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\doc" + File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\dev" File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\htdocs" - File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\mysql" - File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\pgsql" File /r /x CVS /x .cvsignore /x Thumbs.db "..\..\scripts" ;Store install folder diff --git a/build/makepack-dolibarrmodule.conf b/build/makepack-dolibarrmodule.conf index 42655c85744c20830f0d8e7c2b43fc05eebef581..287b4a58d553d5fc5490335cd4a2eaa9179011ef 100644 --- a/build/makepack-dolibarrmodule.conf +++ b/build/makepack-dolibarrmodule.conf @@ -12,5 +12,5 @@ htdocs/includes/modules/modMyModule.class.php htdocs/includes/triggers/interface_mymodule.class.php htdocs/mymodule/page1.php htdocs/mymodule/page2.php -htdocs/mysql/mymodule/script1.sql -htdocs/mysql/mymodule/script2.sql \ No newline at end of file +htdocs/mymodule/sql/script1.sql +htdocs/mymodule/sql/script2.sql \ No newline at end of file diff --git a/build/zip/zip_exclude.txt b/build/zip/zip_exclude.txt index 9a65bc8bb400ad61fd48de38cee52d0fc08b8e0f..3286fd434c83aee9477baa5d1668d945d57f7eb5 100644 --- a/build/zip/zip_exclude.txt +++ b/build/zip/zip_exclude.txt @@ -46,7 +46,6 @@ */htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN */htdocs/oscommerce_ws/ws_client_demo/* */htdocs/theme/rodolphe/* -*/mssql/* */scripts/addons/* */scripts/courrier/* */scripts/lolix/* diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php index ffff7458cec65510123f0f0661e1befbd5702baf..5bc907b9f6901ea625e21c602f2cbb643153aa17 100644 --- a/htdocs/includes/modules/DolibarrModules.class.php +++ b/htdocs/includes/modules/DolibarrModules.class.php @@ -473,7 +473,7 @@ class DolibarrModules closedir($handle); } - // Run data.sql files + // Run .sql files $handle=@opendir($dir); // Dir may not exist if ($handle) { diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php index 76c15f535ce463842d383681ecd2a11ead023008..4ea3029294aa97dfa876d4394206951293ac2e21 100644 --- a/htdocs/install/etape2.php +++ b/htdocs/install/etape2.php @@ -118,7 +118,7 @@ if ($_POST["action"] == "set") if ($ok) { // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) - $dir = "../../mysql/tables/"; + $dir = "mysql/tables/"; $ok = 0; $handle=opendir($dir); @@ -218,7 +218,7 @@ if ($_POST["action"] == "set") if ($ok) { // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) - $dir = "../../mysql/tables/"; + $dir = "mysql/tables/"; $okkeys = 0; $handle=opendir($dir); @@ -328,9 +328,9 @@ if ($_POST["action"] == "set") if ($ok) { // For this file, we use directory according to database type - if ($choix==1) $dir = "../../mysql/functions/"; - elseif ($choix==2) $dir = "../../pgsql/functions/"; - elseif ($choix==3) $dir = "../../mssql/functions/"; + if ($choix==1) $dir = "mysql/functions/"; + elseif ($choix==2) $dir = "pgsql/functions/"; + elseif ($choix==3) $dir = "mssql/functions/"; // Creation donnees $file = "functions.sql"; @@ -350,7 +350,7 @@ if ($_POST["action"] == "set") } // Si plusieurs requetes, on boucle sur chaque - $listesql=split('�',eregi_replace(";';",";'�",$buffer)); + $listesql=split('�',eregi_replace(";';",";'�",$buffer)); foreach ($listesql as $buffer) { if (trim($buffer)) { @@ -396,7 +396,7 @@ if ($_POST["action"] == "set") if ($ok) { // We always choose in mysql directory (Conversion is done by driver to translate SQL syntax) - $dir = "../../mysql/data/"; + $dir = "mysql/data/"; // Creation donnees $file = "data.sql"; diff --git a/mssql/README b/htdocs/install/mssql/README similarity index 100% rename from mssql/README rename to htdocs/install/mssql/README diff --git a/mssql/functions/functions.sql b/htdocs/install/mssql/functions/functions.sql similarity index 100% rename from mssql/functions/functions.sql rename to htdocs/install/mssql/functions/functions.sql diff --git a/mysql/Makefile b/htdocs/install/mysql/Makefile similarity index 100% rename from mysql/Makefile rename to htdocs/install/mysql/Makefile diff --git a/mysql/README b/htdocs/install/mysql/README similarity index 100% rename from mysql/README rename to htdocs/install/mysql/README diff --git a/mysql/data/data.sql b/htdocs/install/mysql/data/data.sql similarity index 100% rename from mysql/data/data.sql rename to htdocs/install/mysql/data/data.sql diff --git a/mysql/functions/functions.sql b/htdocs/install/mysql/functions/functions.sql similarity index 100% rename from mysql/functions/functions.sql rename to htdocs/install/mysql/functions/functions.sql diff --git a/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql similarity index 100% rename from mysql/migration/2.0.0-2.1.0.sql rename to htdocs/install/mysql/migration/2.0.0-2.1.0.sql diff --git a/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql similarity index 100% rename from mysql/migration/2.1.0-2.2.0.sql rename to htdocs/install/mysql/migration/2.1.0-2.2.0.sql diff --git a/mysql/migration/2.2.0-2.4.0.sql b/htdocs/install/mysql/migration/2.2.0-2.4.0.sql similarity index 100% rename from mysql/migration/2.2.0-2.4.0.sql rename to htdocs/install/mysql/migration/2.2.0-2.4.0.sql diff --git a/mysql/migration/2.4.0-2.5.0.sql b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql similarity index 98% rename from mysql/migration/2.4.0-2.5.0.sql rename to htdocs/install/mysql/migration/2.4.0-2.5.0.sql index 42bdfdaac4a5d9eb9de08a2e5d5b7a469c8ff2f8..339a9b4627bb905ed19ef5b2ccab2059044aa064 100644 --- a/mysql/migration/2.4.0-2.5.0.sql +++ b/htdocs/install/mysql/migration/2.4.0-2.5.0.sql @@ -104,7 +104,7 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v alter table llx_product_stock add column pmp double(24,8) default 0 NOT NULL; -alter table llx_expedition_methode change statut active; +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); diff --git a/mysql/migration/2.5.0-2.6.0.sql b/htdocs/install/mysql/migration/2.5.0-2.6.0.sql similarity index 100% rename from mysql/migration/2.5.0-2.6.0.sql rename to htdocs/install/mysql/migration/2.5.0-2.6.0.sql diff --git a/mysql/migration/2.6.0-2.7.0.sql b/htdocs/install/mysql/migration/2.6.0-2.7.0.sql similarity index 100% rename from mysql/migration/2.6.0-2.7.0.sql rename to htdocs/install/mysql/migration/2.6.0-2.7.0.sql diff --git a/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql similarity index 100% rename from mysql/migration/repair.sql rename to htdocs/install/mysql/migration/repair.sql diff --git a/mysql/tables/llx_accountingaccount.key.sql b/htdocs/install/mysql/tables/llx_accountingaccount.key.sql similarity index 100% rename from mysql/tables/llx_accountingaccount.key.sql rename to htdocs/install/mysql/tables/llx_accountingaccount.key.sql diff --git a/mysql/tables/llx_accountingaccount.sql b/htdocs/install/mysql/tables/llx_accountingaccount.sql similarity index 100% rename from mysql/tables/llx_accountingaccount.sql rename to htdocs/install/mysql/tables/llx_accountingaccount.sql diff --git a/mysql/tables/llx_accountingdebcred.sql b/htdocs/install/mysql/tables/llx_accountingdebcred.sql similarity index 100% rename from mysql/tables/llx_accountingdebcred.sql rename to htdocs/install/mysql/tables/llx_accountingdebcred.sql diff --git a/mysql/tables/llx_accountingsystem.sql b/htdocs/install/mysql/tables/llx_accountingsystem.sql similarity index 100% rename from mysql/tables/llx_accountingsystem.sql rename to htdocs/install/mysql/tables/llx_accountingsystem.sql diff --git a/mysql/tables/llx_accountingtransaction.sql b/htdocs/install/mysql/tables/llx_accountingtransaction.sql similarity index 100% rename from mysql/tables/llx_accountingtransaction.sql rename to htdocs/install/mysql/tables/llx_accountingtransaction.sql diff --git a/mysql/tables/llx_action_def.sql b/htdocs/install/mysql/tables/llx_action_def.sql similarity index 100% rename from mysql/tables/llx_action_def.sql rename to htdocs/install/mysql/tables/llx_action_def.sql diff --git a/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql similarity index 100% rename from mysql/tables/llx_actioncomm.key.sql rename to htdocs/install/mysql/tables/llx_actioncomm.key.sql diff --git a/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql similarity index 100% rename from mysql/tables/llx_actioncomm.sql rename to htdocs/install/mysql/tables/llx_actioncomm.sql diff --git a/mysql/tables/llx_adherent.key.sql b/htdocs/install/mysql/tables/llx_adherent.key.sql similarity index 100% rename from mysql/tables/llx_adherent.key.sql rename to htdocs/install/mysql/tables/llx_adherent.key.sql diff --git a/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql similarity index 100% rename from mysql/tables/llx_adherent.sql rename to htdocs/install/mysql/tables/llx_adherent.sql diff --git a/mysql/tables/llx_adherent_options.sql b/htdocs/install/mysql/tables/llx_adherent_options.sql similarity index 100% rename from mysql/tables/llx_adherent_options.sql rename to htdocs/install/mysql/tables/llx_adherent_options.sql diff --git a/mysql/tables/llx_adherent_options_label.sql b/htdocs/install/mysql/tables/llx_adherent_options_label.sql similarity index 100% rename from mysql/tables/llx_adherent_options_label.sql rename to htdocs/install/mysql/tables/llx_adherent_options_label.sql diff --git a/mysql/tables/llx_adherent_type.key.sql b/htdocs/install/mysql/tables/llx_adherent_type.key.sql similarity index 100% rename from mysql/tables/llx_adherent_type.key.sql rename to htdocs/install/mysql/tables/llx_adherent_type.key.sql diff --git a/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql similarity index 100% rename from mysql/tables/llx_adherent_type.sql rename to htdocs/install/mysql/tables/llx_adherent_type.sql diff --git a/mysql/tables/llx_appro.sql b/htdocs/install/mysql/tables/llx_appro.sql similarity index 100% rename from mysql/tables/llx_appro.sql rename to htdocs/install/mysql/tables/llx_appro.sql diff --git a/mysql/tables/llx_bank.key.sql b/htdocs/install/mysql/tables/llx_bank.key.sql similarity index 100% rename from mysql/tables/llx_bank.key.sql rename to htdocs/install/mysql/tables/llx_bank.key.sql diff --git a/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql similarity index 100% rename from mysql/tables/llx_bank.sql rename to htdocs/install/mysql/tables/llx_bank.sql diff --git a/mysql/tables/llx_bank_account.key.sql b/htdocs/install/mysql/tables/llx_bank_account.key.sql similarity index 100% rename from mysql/tables/llx_bank_account.key.sql rename to htdocs/install/mysql/tables/llx_bank_account.key.sql diff --git a/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql similarity index 100% rename from mysql/tables/llx_bank_account.sql rename to htdocs/install/mysql/tables/llx_bank_account.sql diff --git a/mysql/tables/llx_bank_categ.sql b/htdocs/install/mysql/tables/llx_bank_categ.sql similarity index 100% rename from mysql/tables/llx_bank_categ.sql rename to htdocs/install/mysql/tables/llx_bank_categ.sql diff --git a/mysql/tables/llx_bank_class.sql b/htdocs/install/mysql/tables/llx_bank_class.sql similarity index 100% rename from mysql/tables/llx_bank_class.sql rename to htdocs/install/mysql/tables/llx_bank_class.sql diff --git a/mysql/tables/llx_bank_url.key.sql b/htdocs/install/mysql/tables/llx_bank_url.key.sql similarity index 100% rename from mysql/tables/llx_bank_url.key.sql rename to htdocs/install/mysql/tables/llx_bank_url.key.sql diff --git a/mysql/tables/llx_bank_url.sql b/htdocs/install/mysql/tables/llx_bank_url.sql similarity index 100% rename from mysql/tables/llx_bank_url.sql rename to htdocs/install/mysql/tables/llx_bank_url.sql diff --git a/mysql/tables/llx_bookmark.key.sql b/htdocs/install/mysql/tables/llx_bookmark.key.sql similarity index 100% rename from mysql/tables/llx_bookmark.key.sql rename to htdocs/install/mysql/tables/llx_bookmark.key.sql diff --git a/mysql/tables/llx_bookmark.sql b/htdocs/install/mysql/tables/llx_bookmark.sql similarity index 100% rename from mysql/tables/llx_bookmark.sql rename to htdocs/install/mysql/tables/llx_bookmark.sql diff --git a/mysql/tables/llx_bordereau_cheque.key.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql similarity index 100% rename from mysql/tables/llx_bordereau_cheque.key.sql rename to htdocs/install/mysql/tables/llx_bordereau_cheque.key.sql diff --git a/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql similarity index 100% rename from mysql/tables/llx_bordereau_cheque.sql rename to htdocs/install/mysql/tables/llx_bordereau_cheque.sql diff --git a/mysql/tables/llx_boxes.key.sql b/htdocs/install/mysql/tables/llx_boxes.key.sql similarity index 100% rename from mysql/tables/llx_boxes.key.sql rename to htdocs/install/mysql/tables/llx_boxes.key.sql diff --git a/mysql/tables/llx_boxes.sql b/htdocs/install/mysql/tables/llx_boxes.sql similarity index 100% rename from mysql/tables/llx_boxes.sql rename to htdocs/install/mysql/tables/llx_boxes.sql diff --git a/mysql/tables/llx_boxes_def.key.sql b/htdocs/install/mysql/tables/llx_boxes_def.key.sql similarity index 100% rename from mysql/tables/llx_boxes_def.key.sql rename to htdocs/install/mysql/tables/llx_boxes_def.key.sql diff --git a/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql similarity index 100% rename from mysql/tables/llx_boxes_def.sql rename to htdocs/install/mysql/tables/llx_boxes_def.sql diff --git a/mysql/tables/llx_c_actioncomm.sql b/htdocs/install/mysql/tables/llx_c_actioncomm.sql similarity index 100% rename from mysql/tables/llx_c_actioncomm.sql rename to htdocs/install/mysql/tables/llx_c_actioncomm.sql diff --git a/mysql/tables/llx_c_barcode_type.sql b/htdocs/install/mysql/tables/llx_c_barcode_type.sql similarity index 100% rename from mysql/tables/llx_c_barcode_type.sql rename to htdocs/install/mysql/tables/llx_c_barcode_type.sql diff --git a/mysql/tables/llx_c_chargesociales.sql b/htdocs/install/mysql/tables/llx_c_chargesociales.sql similarity index 100% rename from mysql/tables/llx_c_chargesociales.sql rename to htdocs/install/mysql/tables/llx_c_chargesociales.sql diff --git a/mysql/tables/llx_c_civilite.sql b/htdocs/install/mysql/tables/llx_c_civilite.sql similarity index 100% rename from mysql/tables/llx_c_civilite.sql rename to htdocs/install/mysql/tables/llx_c_civilite.sql diff --git a/mysql/tables/llx_c_currencies.key.sql b/htdocs/install/mysql/tables/llx_c_currencies.key.sql similarity index 100% rename from mysql/tables/llx_c_currencies.key.sql rename to htdocs/install/mysql/tables/llx_c_currencies.key.sql diff --git a/mysql/tables/llx_c_currencies.sql b/htdocs/install/mysql/tables/llx_c_currencies.sql similarity index 100% rename from mysql/tables/llx_c_currencies.sql rename to htdocs/install/mysql/tables/llx_c_currencies.sql diff --git a/mysql/tables/llx_c_departements.key.sql b/htdocs/install/mysql/tables/llx_c_departements.key.sql similarity index 100% rename from mysql/tables/llx_c_departements.key.sql rename to htdocs/install/mysql/tables/llx_c_departements.key.sql diff --git a/mysql/tables/llx_c_departements.sql b/htdocs/install/mysql/tables/llx_c_departements.sql similarity index 100% rename from mysql/tables/llx_c_departements.sql rename to htdocs/install/mysql/tables/llx_c_departements.sql diff --git a/mysql/tables/llx_c_ecotaxe.sql b/htdocs/install/mysql/tables/llx_c_ecotaxe.sql similarity index 100% rename from mysql/tables/llx_c_ecotaxe.sql rename to htdocs/install/mysql/tables/llx_c_ecotaxe.sql diff --git a/mysql/tables/llx_c_effectif.sql b/htdocs/install/mysql/tables/llx_c_effectif.sql similarity index 100% rename from mysql/tables/llx_c_effectif.sql rename to htdocs/install/mysql/tables/llx_c_effectif.sql diff --git a/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql similarity index 100% rename from mysql/tables/llx_c_forme_juridique.sql rename to htdocs/install/mysql/tables/llx_c_forme_juridique.sql diff --git a/mysql/tables/llx_c_methode_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_c_methode_commande_fournisseur.sql similarity index 100% rename from mysql/tables/llx_c_methode_commande_fournisseur.sql rename to htdocs/install/mysql/tables/llx_c_methode_commande_fournisseur.sql diff --git a/mysql/tables/llx_c_paiement.sql b/htdocs/install/mysql/tables/llx_c_paiement.sql similarity index 100% rename from mysql/tables/llx_c_paiement.sql rename to htdocs/install/mysql/tables/llx_c_paiement.sql diff --git a/mysql/tables/llx_c_paper_format.sql b/htdocs/install/mysql/tables/llx_c_paper_format.sql similarity index 100% rename from mysql/tables/llx_c_paper_format.sql rename to htdocs/install/mysql/tables/llx_c_paper_format.sql diff --git a/mysql/tables/llx_c_pays.key.sql b/htdocs/install/mysql/tables/llx_c_pays.key.sql similarity index 100% rename from mysql/tables/llx_c_pays.key.sql rename to htdocs/install/mysql/tables/llx_c_pays.key.sql diff --git a/mysql/tables/llx_c_pays.sql b/htdocs/install/mysql/tables/llx_c_pays.sql similarity index 100% rename from mysql/tables/llx_c_pays.sql rename to htdocs/install/mysql/tables/llx_c_pays.sql diff --git a/mysql/tables/llx_c_propalst.sql b/htdocs/install/mysql/tables/llx_c_propalst.sql similarity index 100% rename from mysql/tables/llx_c_propalst.sql rename to htdocs/install/mysql/tables/llx_c_propalst.sql diff --git a/mysql/tables/llx_c_prospectlevel.sql b/htdocs/install/mysql/tables/llx_c_prospectlevel.sql similarity index 100% rename from mysql/tables/llx_c_prospectlevel.sql rename to htdocs/install/mysql/tables/llx_c_prospectlevel.sql diff --git a/mysql/tables/llx_c_regions.key.sql b/htdocs/install/mysql/tables/llx_c_regions.key.sql similarity index 100% rename from mysql/tables/llx_c_regions.key.sql rename to htdocs/install/mysql/tables/llx_c_regions.key.sql diff --git a/mysql/tables/llx_c_regions.sql b/htdocs/install/mysql/tables/llx_c_regions.sql similarity index 100% rename from mysql/tables/llx_c_regions.sql rename to htdocs/install/mysql/tables/llx_c_regions.sql diff --git a/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql similarity index 100% rename from mysql/tables/llx_c_stcomm.sql rename to htdocs/install/mysql/tables/llx_c_stcomm.sql diff --git a/mysql/tables/llx_c_tva.sql b/htdocs/install/mysql/tables/llx_c_tva.sql similarity index 100% rename from mysql/tables/llx_c_tva.sql rename to htdocs/install/mysql/tables/llx_c_tva.sql diff --git a/mysql/tables/llx_c_type_contact.key.sql b/htdocs/install/mysql/tables/llx_c_type_contact.key.sql similarity index 100% rename from mysql/tables/llx_c_type_contact.key.sql rename to htdocs/install/mysql/tables/llx_c_type_contact.key.sql diff --git a/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql similarity index 100% rename from mysql/tables/llx_c_type_contact.sql rename to htdocs/install/mysql/tables/llx_c_type_contact.sql diff --git a/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql similarity index 100% rename from mysql/tables/llx_c_type_fees.sql rename to htdocs/install/mysql/tables/llx_c_type_fees.sql diff --git a/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql similarity index 100% rename from mysql/tables/llx_c_typent.sql rename to htdocs/install/mysql/tables/llx_c_typent.sql diff --git a/mysql/tables/llx_categorie.key.sql b/htdocs/install/mysql/tables/llx_categorie.key.sql similarity index 100% rename from mysql/tables/llx_categorie.key.sql rename to htdocs/install/mysql/tables/llx_categorie.key.sql diff --git a/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql similarity index 100% rename from mysql/tables/llx_categorie.sql rename to htdocs/install/mysql/tables/llx_categorie.sql diff --git a/mysql/tables/llx_categorie_association.key.sql b/htdocs/install/mysql/tables/llx_categorie_association.key.sql similarity index 100% rename from mysql/tables/llx_categorie_association.key.sql rename to htdocs/install/mysql/tables/llx_categorie_association.key.sql diff --git a/mysql/tables/llx_categorie_association.sql b/htdocs/install/mysql/tables/llx_categorie_association.sql similarity index 100% rename from mysql/tables/llx_categorie_association.sql rename to htdocs/install/mysql/tables/llx_categorie_association.sql diff --git a/mysql/tables/llx_categorie_fournisseur.sql b/htdocs/install/mysql/tables/llx_categorie_fournisseur.sql similarity index 100% rename from mysql/tables/llx_categorie_fournisseur.sql rename to htdocs/install/mysql/tables/llx_categorie_fournisseur.sql diff --git a/mysql/tables/llx_categorie_product.key.sql b/htdocs/install/mysql/tables/llx_categorie_product.key.sql similarity index 100% rename from mysql/tables/llx_categorie_product.key.sql rename to htdocs/install/mysql/tables/llx_categorie_product.key.sql diff --git a/mysql/tables/llx_categorie_product.sql b/htdocs/install/mysql/tables/llx_categorie_product.sql similarity index 100% rename from mysql/tables/llx_categorie_product.sql rename to htdocs/install/mysql/tables/llx_categorie_product.sql diff --git a/mysql/tables/llx_categorie_societe.key.sql b/htdocs/install/mysql/tables/llx_categorie_societe.key.sql similarity index 100% rename from mysql/tables/llx_categorie_societe.key.sql rename to htdocs/install/mysql/tables/llx_categorie_societe.key.sql diff --git a/mysql/tables/llx_categorie_societe.sql b/htdocs/install/mysql/tables/llx_categorie_societe.sql similarity index 100% rename from mysql/tables/llx_categorie_societe.sql rename to htdocs/install/mysql/tables/llx_categorie_societe.sql diff --git a/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql similarity index 100% rename from mysql/tables/llx_chargesociales.sql rename to htdocs/install/mysql/tables/llx_chargesociales.sql diff --git a/mysql/tables/llx_co_exp.sql b/htdocs/install/mysql/tables/llx_co_exp.sql similarity index 100% rename from mysql/tables/llx_co_exp.sql rename to htdocs/install/mysql/tables/llx_co_exp.sql diff --git a/mysql/tables/llx_co_fa.sql b/htdocs/install/mysql/tables/llx_co_fa.sql similarity index 100% rename from mysql/tables/llx_co_fa.sql rename to htdocs/install/mysql/tables/llx_co_fa.sql diff --git a/mysql/tables/llx_co_liv.sql b/htdocs/install/mysql/tables/llx_co_liv.sql similarity index 100% rename from mysql/tables/llx_co_liv.sql rename to htdocs/install/mysql/tables/llx_co_liv.sql diff --git a/mysql/tables/llx_co_pr.sql b/htdocs/install/mysql/tables/llx_co_pr.sql similarity index 100% rename from mysql/tables/llx_co_pr.sql rename to htdocs/install/mysql/tables/llx_co_pr.sql diff --git a/mysql/tables/llx_commande.key.sql b/htdocs/install/mysql/tables/llx_commande.key.sql similarity index 100% rename from mysql/tables/llx_commande.key.sql rename to htdocs/install/mysql/tables/llx_commande.key.sql diff --git a/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql similarity index 100% rename from mysql/tables/llx_commande.sql rename to htdocs/install/mysql/tables/llx_commande.sql diff --git a/mysql/tables/llx_commande_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseur.key.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseur.key.sql diff --git a/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseur.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseur.sql diff --git a/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseur_dispatch.key.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql diff --git a/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseur_dispatch.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql diff --git a/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseur_log.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql diff --git a/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql similarity index 100% rename from mysql/tables/llx_commande_fournisseurdet.sql rename to htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql diff --git a/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql similarity index 100% rename from mysql/tables/llx_commandedet.key.sql rename to htdocs/install/mysql/tables/llx_commandedet.key.sql diff --git a/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql similarity index 100% rename from mysql/tables/llx_commandedet.sql rename to htdocs/install/mysql/tables/llx_commandedet.sql diff --git a/mysql/tables/llx_compta.sql b/htdocs/install/mysql/tables/llx_compta.sql similarity index 100% rename from mysql/tables/llx_compta.sql rename to htdocs/install/mysql/tables/llx_compta.sql diff --git a/mysql/tables/llx_compta_account.sql b/htdocs/install/mysql/tables/llx_compta_account.sql similarity index 100% rename from mysql/tables/llx_compta_account.sql rename to htdocs/install/mysql/tables/llx_compta_account.sql diff --git a/mysql/tables/llx_compta_compte_generaux.sql b/htdocs/install/mysql/tables/llx_compta_compte_generaux.sql similarity index 100% rename from mysql/tables/llx_compta_compte_generaux.sql rename to htdocs/install/mysql/tables/llx_compta_compte_generaux.sql diff --git a/mysql/tables/llx_cond_reglement.sql b/htdocs/install/mysql/tables/llx_cond_reglement.sql similarity index 100% rename from mysql/tables/llx_cond_reglement.sql rename to htdocs/install/mysql/tables/llx_cond_reglement.sql diff --git a/mysql/tables/llx_const.key.sql b/htdocs/install/mysql/tables/llx_const.key.sql similarity index 100% rename from mysql/tables/llx_const.key.sql rename to htdocs/install/mysql/tables/llx_const.key.sql diff --git a/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql similarity index 100% rename from mysql/tables/llx_const.sql rename to htdocs/install/mysql/tables/llx_const.sql diff --git a/mysql/tables/llx_contrat.key.sql b/htdocs/install/mysql/tables/llx_contrat.key.sql similarity index 100% rename from mysql/tables/llx_contrat.key.sql rename to htdocs/install/mysql/tables/llx_contrat.key.sql diff --git a/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql similarity index 100% rename from mysql/tables/llx_contrat.sql rename to htdocs/install/mysql/tables/llx_contrat.sql diff --git a/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql similarity index 100% rename from mysql/tables/llx_contratdet.key.sql rename to htdocs/install/mysql/tables/llx_contratdet.key.sql diff --git a/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql similarity index 100% rename from mysql/tables/llx_contratdet.sql rename to htdocs/install/mysql/tables/llx_contratdet.sql diff --git a/mysql/tables/llx_contratdet_log.key.sql b/htdocs/install/mysql/tables/llx_contratdet_log.key.sql similarity index 100% rename from mysql/tables/llx_contratdet_log.key.sql rename to htdocs/install/mysql/tables/llx_contratdet_log.key.sql diff --git a/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql similarity index 100% rename from mysql/tables/llx_contratdet_log.sql rename to htdocs/install/mysql/tables/llx_contratdet_log.sql diff --git a/mysql/tables/llx_cotisation.key.sql b/htdocs/install/mysql/tables/llx_cotisation.key.sql similarity index 100% rename from mysql/tables/llx_cotisation.key.sql rename to htdocs/install/mysql/tables/llx_cotisation.key.sql diff --git a/mysql/tables/llx_cotisation.sql b/htdocs/install/mysql/tables/llx_cotisation.sql similarity index 100% rename from mysql/tables/llx_cotisation.sql rename to htdocs/install/mysql/tables/llx_cotisation.sql diff --git a/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql similarity index 100% rename from mysql/tables/llx_deplacement.sql rename to htdocs/install/mysql/tables/llx_deplacement.sql diff --git a/mysql/tables/llx_document.sql b/htdocs/install/mysql/tables/llx_document.sql similarity index 100% rename from mysql/tables/llx_document.sql rename to htdocs/install/mysql/tables/llx_document.sql diff --git a/mysql/tables/llx_document_generator.sql b/htdocs/install/mysql/tables/llx_document_generator.sql similarity index 100% rename from mysql/tables/llx_document_generator.sql rename to htdocs/install/mysql/tables/llx_document_generator.sql diff --git a/mysql/tables/llx_document_model.key.sql b/htdocs/install/mysql/tables/llx_document_model.key.sql similarity index 100% rename from mysql/tables/llx_document_model.key.sql rename to htdocs/install/mysql/tables/llx_document_model.key.sql diff --git a/mysql/tables/llx_document_model.sql b/htdocs/install/mysql/tables/llx_document_model.sql similarity index 100% rename from mysql/tables/llx_document_model.sql rename to htdocs/install/mysql/tables/llx_document_model.sql diff --git a/mysql/tables/llx_dolibarr_modules.key.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql similarity index 100% rename from mysql/tables/llx_dolibarr_modules.key.sql rename to htdocs/install/mysql/tables/llx_dolibarr_modules.key.sql diff --git a/mysql/tables/llx_dolibarr_modules.sql b/htdocs/install/mysql/tables/llx_dolibarr_modules.sql similarity index 100% rename from mysql/tables/llx_dolibarr_modules.sql rename to htdocs/install/mysql/tables/llx_dolibarr_modules.sql diff --git a/mysql/tables/llx_domain.sql b/htdocs/install/mysql/tables/llx_domain.sql similarity index 100% rename from mysql/tables/llx_domain.sql rename to htdocs/install/mysql/tables/llx_domain.sql diff --git a/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql similarity index 100% rename from mysql/tables/llx_don.sql rename to htdocs/install/mysql/tables/llx_don.sql diff --git a/mysql/tables/llx_droitpret_rapport.sql b/htdocs/install/mysql/tables/llx_droitpret_rapport.sql similarity index 100% rename from mysql/tables/llx_droitpret_rapport.sql rename to htdocs/install/mysql/tables/llx_droitpret_rapport.sql diff --git a/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql similarity index 100% rename from mysql/tables/llx_ecm_directories.sql rename to htdocs/install/mysql/tables/llx_ecm_directories.sql diff --git a/mysql/tables/llx_ecm_documents.sql b/htdocs/install/mysql/tables/llx_ecm_documents.sql similarity index 100% rename from mysql/tables/llx_ecm_documents.sql rename to htdocs/install/mysql/tables/llx_ecm_documents.sql diff --git a/mysql/tables/llx_element_contact.key.sql b/htdocs/install/mysql/tables/llx_element_contact.key.sql similarity index 100% rename from mysql/tables/llx_element_contact.key.sql rename to htdocs/install/mysql/tables/llx_element_contact.key.sql diff --git a/mysql/tables/llx_element_contact.sql b/htdocs/install/mysql/tables/llx_element_contact.sql similarity index 100% rename from mysql/tables/llx_element_contact.sql rename to htdocs/install/mysql/tables/llx_element_contact.sql diff --git a/mysql/tables/llx_element_element.key.sql b/htdocs/install/mysql/tables/llx_element_element.key.sql similarity index 100% rename from mysql/tables/llx_element_element.key.sql rename to htdocs/install/mysql/tables/llx_element_element.key.sql diff --git a/mysql/tables/llx_element_element.sql b/htdocs/install/mysql/tables/llx_element_element.sql similarity index 100% rename from mysql/tables/llx_element_element.sql rename to htdocs/install/mysql/tables/llx_element_element.sql diff --git a/mysql/tables/llx_energie_compteur.sql b/htdocs/install/mysql/tables/llx_energie_compteur.sql similarity index 100% rename from mysql/tables/llx_energie_compteur.sql rename to htdocs/install/mysql/tables/llx_energie_compteur.sql diff --git a/mysql/tables/llx_energie_compteur_groupe.sql b/htdocs/install/mysql/tables/llx_energie_compteur_groupe.sql similarity index 100% rename from mysql/tables/llx_energie_compteur_groupe.sql rename to htdocs/install/mysql/tables/llx_energie_compteur_groupe.sql diff --git a/mysql/tables/llx_energie_compteur_releve.sql b/htdocs/install/mysql/tables/llx_energie_compteur_releve.sql similarity index 100% rename from mysql/tables/llx_energie_compteur_releve.sql rename to htdocs/install/mysql/tables/llx_energie_compteur_releve.sql diff --git a/mysql/tables/llx_energie_groupe.sql b/htdocs/install/mysql/tables/llx_energie_groupe.sql similarity index 100% rename from mysql/tables/llx_energie_groupe.sql rename to htdocs/install/mysql/tables/llx_energie_groupe.sql diff --git a/mysql/tables/llx_entrepot.key.sql b/htdocs/install/mysql/tables/llx_entrepot.key.sql similarity index 100% rename from mysql/tables/llx_entrepot.key.sql rename to htdocs/install/mysql/tables/llx_entrepot.key.sql diff --git a/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql similarity index 100% rename from mysql/tables/llx_entrepot.sql rename to htdocs/install/mysql/tables/llx_entrepot.sql diff --git a/mysql/tables/llx_events.key.sql b/htdocs/install/mysql/tables/llx_events.key.sql similarity index 100% rename from mysql/tables/llx_events.key.sql rename to htdocs/install/mysql/tables/llx_events.key.sql diff --git a/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql similarity index 100% rename from mysql/tables/llx_events.sql rename to htdocs/install/mysql/tables/llx_events.sql diff --git a/mysql/tables/llx_expedition.key.sql b/htdocs/install/mysql/tables/llx_expedition.key.sql similarity index 100% rename from mysql/tables/llx_expedition.key.sql rename to htdocs/install/mysql/tables/llx_expedition.key.sql diff --git a/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql similarity index 100% rename from mysql/tables/llx_expedition.sql rename to htdocs/install/mysql/tables/llx_expedition.sql diff --git a/mysql/tables/llx_expedition_methode.sql b/htdocs/install/mysql/tables/llx_expedition_methode.sql similarity index 100% rename from mysql/tables/llx_expedition_methode.sql rename to htdocs/install/mysql/tables/llx_expedition_methode.sql diff --git a/mysql/tables/llx_expeditiondet.key.sql b/htdocs/install/mysql/tables/llx_expeditiondet.key.sql similarity index 100% rename from mysql/tables/llx_expeditiondet.key.sql rename to htdocs/install/mysql/tables/llx_expeditiondet.key.sql diff --git a/mysql/tables/llx_expeditiondet.sql b/htdocs/install/mysql/tables/llx_expeditiondet.sql similarity index 100% rename from mysql/tables/llx_expeditiondet.sql rename to htdocs/install/mysql/tables/llx_expeditiondet.sql diff --git a/mysql/tables/llx_export_compta.sql b/htdocs/install/mysql/tables/llx_export_compta.sql similarity index 100% rename from mysql/tables/llx_export_compta.sql rename to htdocs/install/mysql/tables/llx_export_compta.sql diff --git a/mysql/tables/llx_export_model.key.sql b/htdocs/install/mysql/tables/llx_export_model.key.sql similarity index 100% rename from mysql/tables/llx_export_model.key.sql rename to htdocs/install/mysql/tables/llx_export_model.key.sql diff --git a/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql similarity index 100% rename from mysql/tables/llx_export_model.sql rename to htdocs/install/mysql/tables/llx_export_model.sql diff --git a/mysql/tables/llx_fa_pr.sql b/htdocs/install/mysql/tables/llx_fa_pr.sql similarity index 100% rename from mysql/tables/llx_fa_pr.sql rename to htdocs/install/mysql/tables/llx_fa_pr.sql diff --git a/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql similarity index 100% rename from mysql/tables/llx_facture.key.sql rename to htdocs/install/mysql/tables/llx_facture.key.sql diff --git a/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql similarity index 100% rename from mysql/tables/llx_facture.sql rename to htdocs/install/mysql/tables/llx_facture.sql diff --git a/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql similarity index 100% rename from mysql/tables/llx_facture_fourn.key.sql rename to htdocs/install/mysql/tables/llx_facture_fourn.key.sql diff --git a/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql similarity index 100% rename from mysql/tables/llx_facture_fourn.sql rename to htdocs/install/mysql/tables/llx_facture_fourn.sql diff --git a/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql similarity index 100% rename from mysql/tables/llx_facture_fourn_det.key.sql rename to htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql diff --git a/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql similarity index 100% rename from mysql/tables/llx_facture_fourn_det.sql rename to htdocs/install/mysql/tables/llx_facture_fourn_det.sql diff --git a/mysql/tables/llx_facture_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_rec.key.sql similarity index 100% rename from mysql/tables/llx_facture_rec.key.sql rename to htdocs/install/mysql/tables/llx_facture_rec.key.sql diff --git a/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql similarity index 100% rename from mysql/tables/llx_facture_rec.sql rename to htdocs/install/mysql/tables/llx_facture_rec.sql diff --git a/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql similarity index 100% rename from mysql/tables/llx_facturedet.key.sql rename to htdocs/install/mysql/tables/llx_facturedet.key.sql diff --git a/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql similarity index 100% rename from mysql/tables/llx_facturedet.sql rename to htdocs/install/mysql/tables/llx_facturedet.sql diff --git a/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql similarity index 100% rename from mysql/tables/llx_facturedet_rec.sql rename to htdocs/install/mysql/tables/llx_facturedet_rec.sql diff --git a/mysql/tables/llx_fichinter.key.sql b/htdocs/install/mysql/tables/llx_fichinter.key.sql similarity index 100% rename from mysql/tables/llx_fichinter.key.sql rename to htdocs/install/mysql/tables/llx_fichinter.key.sql diff --git a/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql similarity index 100% rename from mysql/tables/llx_fichinter.sql rename to htdocs/install/mysql/tables/llx_fichinter.sql diff --git a/mysql/tables/llx_fichinterdet.sql b/htdocs/install/mysql/tables/llx_fichinterdet.sql similarity index 100% rename from mysql/tables/llx_fichinterdet.sql rename to htdocs/install/mysql/tables/llx_fichinterdet.sql diff --git a/mysql/tables/llx_fournisseur_ca.sql b/htdocs/install/mysql/tables/llx_fournisseur_ca.sql similarity index 100% rename from mysql/tables/llx_fournisseur_ca.sql rename to htdocs/install/mysql/tables/llx_fournisseur_ca.sql diff --git a/mysql/tables/llx_import_model.key.sql b/htdocs/install/mysql/tables/llx_import_model.key.sql similarity index 100% rename from mysql/tables/llx_import_model.key.sql rename to htdocs/install/mysql/tables/llx_import_model.key.sql diff --git a/mysql/tables/llx_import_model.sql b/htdocs/install/mysql/tables/llx_import_model.sql similarity index 100% rename from mysql/tables/llx_import_model.sql rename to htdocs/install/mysql/tables/llx_import_model.sql diff --git a/mysql/tables/llx_livraison.key.sql b/htdocs/install/mysql/tables/llx_livraison.key.sql similarity index 100% rename from mysql/tables/llx_livraison.key.sql rename to htdocs/install/mysql/tables/llx_livraison.key.sql diff --git a/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql similarity index 100% rename from mysql/tables/llx_livraison.sql rename to htdocs/install/mysql/tables/llx_livraison.sql diff --git a/mysql/tables/llx_livraisondet.key.sql b/htdocs/install/mysql/tables/llx_livraisondet.key.sql similarity index 100% rename from mysql/tables/llx_livraisondet.key.sql rename to htdocs/install/mysql/tables/llx_livraisondet.key.sql diff --git a/mysql/tables/llx_livraisondet.sql b/htdocs/install/mysql/tables/llx_livraisondet.sql similarity index 100% rename from mysql/tables/llx_livraisondet.sql rename to htdocs/install/mysql/tables/llx_livraisondet.sql diff --git a/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql similarity index 100% rename from mysql/tables/llx_mailing.sql rename to htdocs/install/mysql/tables/llx_mailing.sql diff --git a/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql similarity index 100% rename from mysql/tables/llx_mailing_cibles.key.sql rename to htdocs/install/mysql/tables/llx_mailing_cibles.key.sql diff --git a/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql similarity index 100% rename from mysql/tables/llx_mailing_cibles.sql rename to htdocs/install/mysql/tables/llx_mailing_cibles.sql diff --git a/mysql/tables/llx_menu.key.sql b/htdocs/install/mysql/tables/llx_menu.key.sql similarity index 100% rename from mysql/tables/llx_menu.key.sql rename to htdocs/install/mysql/tables/llx_menu.key.sql diff --git a/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql similarity index 100% rename from mysql/tables/llx_menu.sql rename to htdocs/install/mysql/tables/llx_menu.sql diff --git a/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql similarity index 100% rename from mysql/tables/llx_notify.sql rename to htdocs/install/mysql/tables/llx_notify.sql diff --git a/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql similarity index 100% rename from mysql/tables/llx_notify_def.sql rename to htdocs/install/mysql/tables/llx_notify_def.sql diff --git a/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql similarity index 100% rename from mysql/tables/llx_paiement.sql rename to htdocs/install/mysql/tables/llx_paiement.sql diff --git a/mysql/tables/llx_paiement_facture.key.sql b/htdocs/install/mysql/tables/llx_paiement_facture.key.sql similarity index 100% rename from mysql/tables/llx_paiement_facture.key.sql rename to htdocs/install/mysql/tables/llx_paiement_facture.key.sql diff --git a/mysql/tables/llx_paiement_facture.sql b/htdocs/install/mysql/tables/llx_paiement_facture.sql similarity index 100% rename from mysql/tables/llx_paiement_facture.sql rename to htdocs/install/mysql/tables/llx_paiement_facture.sql diff --git a/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql similarity index 100% rename from mysql/tables/llx_paiementcharge.sql rename to htdocs/install/mysql/tables/llx_paiementcharge.sql diff --git a/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql similarity index 100% rename from mysql/tables/llx_paiementfourn.sql rename to htdocs/install/mysql/tables/llx_paiementfourn.sql diff --git a/mysql/tables/llx_paiementfourn_facturefourn.key.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql similarity index 100% rename from mysql/tables/llx_paiementfourn_facturefourn.key.sql rename to htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.key.sql diff --git a/mysql/tables/llx_paiementfourn_facturefourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql similarity index 100% rename from mysql/tables/llx_paiementfourn_facturefourn.sql rename to htdocs/install/mysql/tables/llx_paiementfourn_facturefourn.sql diff --git a/mysql/tables/llx_pr_exp.sql b/htdocs/install/mysql/tables/llx_pr_exp.sql similarity index 100% rename from mysql/tables/llx_pr_exp.sql rename to htdocs/install/mysql/tables/llx_pr_exp.sql diff --git a/mysql/tables/llx_pr_liv.sql b/htdocs/install/mysql/tables/llx_pr_liv.sql similarity index 100% rename from mysql/tables/llx_pr_liv.sql rename to htdocs/install/mysql/tables/llx_pr_liv.sql diff --git a/mysql/tables/llx_prelevement_bons.key.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.key.sql similarity index 100% rename from mysql/tables/llx_prelevement_bons.key.sql rename to htdocs/install/mysql/tables/llx_prelevement_bons.key.sql diff --git a/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql similarity index 100% rename from mysql/tables/llx_prelevement_bons.sql rename to htdocs/install/mysql/tables/llx_prelevement_bons.sql diff --git a/mysql/tables/llx_prelevement_facture.key.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.key.sql similarity index 100% rename from mysql/tables/llx_prelevement_facture.key.sql rename to htdocs/install/mysql/tables/llx_prelevement_facture.key.sql diff --git a/mysql/tables/llx_prelevement_facture.sql b/htdocs/install/mysql/tables/llx_prelevement_facture.sql similarity index 100% rename from mysql/tables/llx_prelevement_facture.sql rename to htdocs/install/mysql/tables/llx_prelevement_facture.sql diff --git a/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql similarity index 100% rename from mysql/tables/llx_prelevement_facture_demande.sql rename to htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql diff --git a/mysql/tables/llx_prelevement_lignes.key.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql similarity index 100% rename from mysql/tables/llx_prelevement_lignes.key.sql rename to htdocs/install/mysql/tables/llx_prelevement_lignes.key.sql diff --git a/mysql/tables/llx_prelevement_lignes.sql b/htdocs/install/mysql/tables/llx_prelevement_lignes.sql similarity index 100% rename from mysql/tables/llx_prelevement_lignes.sql rename to htdocs/install/mysql/tables/llx_prelevement_lignes.sql diff --git a/mysql/tables/llx_prelevement_notifications.sql b/htdocs/install/mysql/tables/llx_prelevement_notifications.sql similarity index 100% rename from mysql/tables/llx_prelevement_notifications.sql rename to htdocs/install/mysql/tables/llx_prelevement_notifications.sql diff --git a/mysql/tables/llx_prelevement_rejet.sql b/htdocs/install/mysql/tables/llx_prelevement_rejet.sql similarity index 100% rename from mysql/tables/llx_prelevement_rejet.sql rename to htdocs/install/mysql/tables/llx_prelevement_rejet.sql diff --git a/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql similarity index 100% rename from mysql/tables/llx_product.key.sql rename to htdocs/install/mysql/tables/llx_product.key.sql diff --git a/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql similarity index 100% rename from mysql/tables/llx_product.sql rename to htdocs/install/mysql/tables/llx_product.sql diff --git a/mysql/tables/llx_product_ca.sql b/htdocs/install/mysql/tables/llx_product_ca.sql similarity index 100% rename from mysql/tables/llx_product_ca.sql rename to htdocs/install/mysql/tables/llx_product_ca.sql diff --git a/mysql/tables/llx_product_cnv_livre.sql b/htdocs/install/mysql/tables/llx_product_cnv_livre.sql similarity index 100% rename from mysql/tables/llx_product_cnv_livre.sql rename to htdocs/install/mysql/tables/llx_product_cnv_livre.sql diff --git a/mysql/tables/llx_product_cnv_livre_contrat.sql b/htdocs/install/mysql/tables/llx_product_cnv_livre_contrat.sql similarity index 100% rename from mysql/tables/llx_product_cnv_livre_contrat.sql rename to htdocs/install/mysql/tables/llx_product_cnv_livre_contrat.sql diff --git a/mysql/tables/llx_product_det.sql b/htdocs/install/mysql/tables/llx_product_det.sql similarity index 100% rename from mysql/tables/llx_product_det.sql rename to htdocs/install/mysql/tables/llx_product_det.sql diff --git a/mysql/tables/llx_product_fournisseur.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.key.sql similarity index 100% rename from mysql/tables/llx_product_fournisseur.key.sql rename to htdocs/install/mysql/tables/llx_product_fournisseur.key.sql diff --git a/mysql/tables/llx_product_fournisseur.sql b/htdocs/install/mysql/tables/llx_product_fournisseur.sql similarity index 100% rename from mysql/tables/llx_product_fournisseur.sql rename to htdocs/install/mysql/tables/llx_product_fournisseur.sql diff --git a/mysql/tables/llx_product_fournisseur_price.key.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql similarity index 100% rename from mysql/tables/llx_product_fournisseur_price.key.sql rename to htdocs/install/mysql/tables/llx_product_fournisseur_price.key.sql diff --git a/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql similarity index 100% rename from mysql/tables/llx_product_fournisseur_price.sql rename to htdocs/install/mysql/tables/llx_product_fournisseur_price.sql diff --git a/mysql/tables/llx_product_fournisseur_price_log.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql similarity index 100% rename from mysql/tables/llx_product_fournisseur_price_log.sql rename to htdocs/install/mysql/tables/llx_product_fournisseur_price_log.sql diff --git a/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql similarity index 100% rename from mysql/tables/llx_product_price.sql rename to htdocs/install/mysql/tables/llx_product_price.sql diff --git a/mysql/tables/llx_product_stock.key.sql b/htdocs/install/mysql/tables/llx_product_stock.key.sql similarity index 100% rename from mysql/tables/llx_product_stock.key.sql rename to htdocs/install/mysql/tables/llx_product_stock.key.sql diff --git a/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql similarity index 100% rename from mysql/tables/llx_product_stock.sql rename to htdocs/install/mysql/tables/llx_product_stock.sql diff --git a/mysql/tables/llx_product_subproduct.sql b/htdocs/install/mysql/tables/llx_product_subproduct.sql similarity index 100% rename from mysql/tables/llx_product_subproduct.sql rename to htdocs/install/mysql/tables/llx_product_subproduct.sql diff --git a/mysql/tables/llx_projet.key.sql b/htdocs/install/mysql/tables/llx_projet.key.sql similarity index 100% rename from mysql/tables/llx_projet.key.sql rename to htdocs/install/mysql/tables/llx_projet.key.sql diff --git a/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql similarity index 100% rename from mysql/tables/llx_projet.sql rename to htdocs/install/mysql/tables/llx_projet.sql diff --git a/mysql/tables/llx_projet_task.key.sql b/htdocs/install/mysql/tables/llx_projet_task.key.sql similarity index 100% rename from mysql/tables/llx_projet_task.key.sql rename to htdocs/install/mysql/tables/llx_projet_task.key.sql diff --git a/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql similarity index 100% rename from mysql/tables/llx_projet_task.sql rename to htdocs/install/mysql/tables/llx_projet_task.sql diff --git a/mysql/tables/llx_projet_task_actors.sql b/htdocs/install/mysql/tables/llx_projet_task_actors.sql similarity index 100% rename from mysql/tables/llx_projet_task_actors.sql rename to htdocs/install/mysql/tables/llx_projet_task_actors.sql diff --git a/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql similarity index 100% rename from mysql/tables/llx_projet_task_time.sql rename to htdocs/install/mysql/tables/llx_projet_task_time.sql diff --git a/mysql/tables/llx_propal.key.sql b/htdocs/install/mysql/tables/llx_propal.key.sql similarity index 100% rename from mysql/tables/llx_propal.key.sql rename to htdocs/install/mysql/tables/llx_propal.key.sql diff --git a/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql similarity index 100% rename from mysql/tables/llx_propal.sql rename to htdocs/install/mysql/tables/llx_propal.sql diff --git a/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql similarity index 100% rename from mysql/tables/llx_propaldet.sql rename to htdocs/install/mysql/tables/llx_propaldet.sql diff --git a/mysql/tables/llx_rights_def.key.sql b/htdocs/install/mysql/tables/llx_rights_def.key.sql similarity index 100% rename from mysql/tables/llx_rights_def.key.sql rename to htdocs/install/mysql/tables/llx_rights_def.key.sql diff --git a/mysql/tables/llx_rights_def.sql b/htdocs/install/mysql/tables/llx_rights_def.sql similarity index 100% rename from mysql/tables/llx_rights_def.sql rename to htdocs/install/mysql/tables/llx_rights_def.sql diff --git a/mysql/tables/llx_societe.key.sql b/htdocs/install/mysql/tables/llx_societe.key.sql similarity index 100% rename from mysql/tables/llx_societe.key.sql rename to htdocs/install/mysql/tables/llx_societe.key.sql diff --git a/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql similarity index 100% rename from mysql/tables/llx_societe.sql rename to htdocs/install/mysql/tables/llx_societe.sql diff --git a/mysql/tables/llx_societe_adresse_livraison.sql b/htdocs/install/mysql/tables/llx_societe_adresse_livraison.sql similarity index 100% rename from mysql/tables/llx_societe_adresse_livraison.sql rename to htdocs/install/mysql/tables/llx_societe_adresse_livraison.sql diff --git a/mysql/tables/llx_societe_commerciaux.sql b/htdocs/install/mysql/tables/llx_societe_commerciaux.sql similarity index 100% rename from mysql/tables/llx_societe_commerciaux.sql rename to htdocs/install/mysql/tables/llx_societe_commerciaux.sql diff --git a/mysql/tables/llx_societe_log.sql b/htdocs/install/mysql/tables/llx_societe_log.sql similarity index 100% rename from mysql/tables/llx_societe_log.sql rename to htdocs/install/mysql/tables/llx_societe_log.sql diff --git a/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql similarity index 100% rename from mysql/tables/llx_societe_prices.sql rename to htdocs/install/mysql/tables/llx_societe_prices.sql diff --git a/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql similarity index 100% rename from mysql/tables/llx_societe_remise.sql rename to htdocs/install/mysql/tables/llx_societe_remise.sql diff --git a/mysql/tables/llx_societe_remise_except.key.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.key.sql similarity index 100% rename from mysql/tables/llx_societe_remise_except.key.sql rename to htdocs/install/mysql/tables/llx_societe_remise_except.key.sql diff --git a/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql similarity index 100% rename from mysql/tables/llx_societe_remise_except.sql rename to htdocs/install/mysql/tables/llx_societe_remise_except.sql diff --git a/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql similarity index 100% rename from mysql/tables/llx_societe_rib.sql rename to htdocs/install/mysql/tables/llx_societe_rib.sql diff --git a/mysql/tables/llx_socpeople.key.sql b/htdocs/install/mysql/tables/llx_socpeople.key.sql similarity index 100% rename from mysql/tables/llx_socpeople.key.sql rename to htdocs/install/mysql/tables/llx_socpeople.key.sql diff --git a/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql similarity index 100% rename from mysql/tables/llx_socpeople.sql rename to htdocs/install/mysql/tables/llx_socpeople.sql diff --git a/mysql/tables/llx_stock_mouvement.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.key.sql similarity index 100% rename from mysql/tables/llx_stock_mouvement.key.sql rename to htdocs/install/mysql/tables/llx_stock_mouvement.key.sql diff --git a/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql similarity index 100% rename from mysql/tables/llx_stock_mouvement.sql rename to htdocs/install/mysql/tables/llx_stock_mouvement.sql diff --git a/mysql/tables/llx_surveys_answers.sql b/htdocs/install/mysql/tables/llx_surveys_answers.sql similarity index 100% rename from mysql/tables/llx_surveys_answers.sql rename to htdocs/install/mysql/tables/llx_surveys_answers.sql diff --git a/mysql/tables/llx_surveys_answers_summary.key.sql b/htdocs/install/mysql/tables/llx_surveys_answers_summary.key.sql similarity index 100% rename from mysql/tables/llx_surveys_answers_summary.key.sql rename to htdocs/install/mysql/tables/llx_surveys_answers_summary.key.sql diff --git a/mysql/tables/llx_surveys_answers_summary.sql b/htdocs/install/mysql/tables/llx_surveys_answers_summary.sql similarity index 100% rename from mysql/tables/llx_surveys_answers_summary.sql rename to htdocs/install/mysql/tables/llx_surveys_answers_summary.sql diff --git a/mysql/tables/llx_surveys_questions.sql b/htdocs/install/mysql/tables/llx_surveys_questions.sql similarity index 100% rename from mysql/tables/llx_surveys_questions.sql rename to htdocs/install/mysql/tables/llx_surveys_questions.sql diff --git a/mysql/tables/llx_texts.sql b/htdocs/install/mysql/tables/llx_texts.sql similarity index 100% rename from mysql/tables/llx_texts.sql rename to htdocs/install/mysql/tables/llx_texts.sql diff --git a/mysql/tables/llx_transaction_bplc.sql b/htdocs/install/mysql/tables/llx_transaction_bplc.sql similarity index 100% rename from mysql/tables/llx_transaction_bplc.sql rename to htdocs/install/mysql/tables/llx_transaction_bplc.sql diff --git a/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql similarity index 100% rename from mysql/tables/llx_tva.sql rename to htdocs/install/mysql/tables/llx_tva.sql diff --git a/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql similarity index 100% rename from mysql/tables/llx_user.key.sql rename to htdocs/install/mysql/tables/llx_user.key.sql diff --git a/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql similarity index 100% rename from mysql/tables/llx_user.sql rename to htdocs/install/mysql/tables/llx_user.sql diff --git a/mysql/tables/llx_user_alert.sql b/htdocs/install/mysql/tables/llx_user_alert.sql similarity index 100% rename from mysql/tables/llx_user_alert.sql rename to htdocs/install/mysql/tables/llx_user_alert.sql diff --git a/mysql/tables/llx_user_clicktodial.sql b/htdocs/install/mysql/tables/llx_user_clicktodial.sql similarity index 100% rename from mysql/tables/llx_user_clicktodial.sql rename to htdocs/install/mysql/tables/llx_user_clicktodial.sql diff --git a/mysql/tables/llx_user_entrepot.sql b/htdocs/install/mysql/tables/llx_user_entrepot.sql similarity index 100% rename from mysql/tables/llx_user_entrepot.sql rename to htdocs/install/mysql/tables/llx_user_entrepot.sql diff --git a/mysql/tables/llx_user_param.key.sql b/htdocs/install/mysql/tables/llx_user_param.key.sql similarity index 100% rename from mysql/tables/llx_user_param.key.sql rename to htdocs/install/mysql/tables/llx_user_param.key.sql diff --git a/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql similarity index 100% rename from mysql/tables/llx_user_param.sql rename to htdocs/install/mysql/tables/llx_user_param.sql diff --git a/mysql/tables/llx_user_rights.key.sql b/htdocs/install/mysql/tables/llx_user_rights.key.sql similarity index 100% rename from mysql/tables/llx_user_rights.key.sql rename to htdocs/install/mysql/tables/llx_user_rights.key.sql diff --git a/mysql/tables/llx_user_rights.sql b/htdocs/install/mysql/tables/llx_user_rights.sql similarity index 100% rename from mysql/tables/llx_user_rights.sql rename to htdocs/install/mysql/tables/llx_user_rights.sql diff --git a/mysql/tables/llx_usergroup.key.sql b/htdocs/install/mysql/tables/llx_usergroup.key.sql similarity index 100% rename from mysql/tables/llx_usergroup.key.sql rename to htdocs/install/mysql/tables/llx_usergroup.key.sql diff --git a/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql similarity index 100% rename from mysql/tables/llx_usergroup.sql rename to htdocs/install/mysql/tables/llx_usergroup.sql diff --git a/mysql/tables/llx_usergroup_rights.key.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.key.sql similarity index 100% rename from mysql/tables/llx_usergroup_rights.key.sql rename to htdocs/install/mysql/tables/llx_usergroup_rights.key.sql diff --git a/mysql/tables/llx_usergroup_rights.sql b/htdocs/install/mysql/tables/llx_usergroup_rights.sql similarity index 100% rename from mysql/tables/llx_usergroup_rights.sql rename to htdocs/install/mysql/tables/llx_usergroup_rights.sql diff --git a/mysql/tables/llx_usergroup_user.sql b/htdocs/install/mysql/tables/llx_usergroup_user.sql similarity index 100% rename from mysql/tables/llx_usergroup_user.sql rename to htdocs/install/mysql/tables/llx_usergroup_user.sql diff --git a/pgsql/README b/htdocs/install/pgsql/README similarity index 100% rename from pgsql/README rename to htdocs/install/pgsql/README diff --git a/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql similarity index 100% rename from pgsql/functions/functions.sql rename to htdocs/install/pgsql/functions/functions.sql diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 7c27393dba3b881672ee59628c73634a5d1b7cb2..f527bb1cc02515fc6547317acf095a3b31755aec 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -150,9 +150,9 @@ flush(); */ if ($ok) { - if ($choix==1) $dir = "../../mysql/migration/"; - elseif ($choix==2) $dir = "../../pgsql/migration/"; - else $dir = "../../mssql/migration/"; + if ($choix==1) $dir = "mysql/migration/"; + elseif ($choix==2) $dir = "pgsql/migration/"; + else $dir = "mssql/migration/"; $filelist=array(); $i = 0; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index fe47dde0b992c90b8e1ac5a5f54139490c58d046..024025b2f075d9a20c0912ac75024b1bb36cabd6 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -285,9 +285,9 @@ if (! isset($_GET["action"]) || eregi('upgrade',$_GET["action"])) */ if ($ok) { - if ($choix==1) $dir = "../../mysql/migration/"; - elseif ($choix==2) $dir = "../../pgsql/migration/"; - else $dir = "../../mssql/migration/"; + if ($choix==1) $dir = "mysql/migration/"; + elseif ($choix==2) $dir = "pgsql/migration/"; + else $dir = "mssql/migration/"; $filelist=array(); $i = 0; diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php index fe256d894388cc9ca121f70e099f7778bba61eff..5f7e3fc6ccf8bdd658b3461a32d851ecb39748d4 100644 --- a/htdocs/lib/databases/mssql.lib.php +++ b/htdocs/lib/databases/mssql.lib.php @@ -21,7 +21,7 @@ /** * \file htdocs/lib/databases/mssql.lib.php - * \brief Fichier de la classe permettant de g�rer une base mssql + * \brief Fichier de la classe permettant de gerer une base mssql * \version $Id$ */