Move mysql/pgsql/mssql dir into install directory.

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);

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

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
+htdocs/mymodule/sql/script1.sql
+htdocs/mymodule/sql/script2.sql

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/*

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)
 				{

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('<EFBFBD>',eregi_replace(";';",";'<EFBFBD>",$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";

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);