Move artichow and smarty libs into includes directory with other libraries.

build/exe/doliwamp/doliwamp.iss

@@ -83,11 +83,9 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Dolibarr
-Source: "external-libs\*.*"; DestDir: "{app}\www\dolibarr\external-libs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,telephonie\*,*\conf.php,*\install.forced.php,*\modBookmark4u.class.php,*\modDocument.class.php,*\modDroitPret.class.php,*\modEditeur.class.php,*\modPostnuke.class.php,*\modTelephonie.class.php,*\interface_modEditeur_Editeur.class.php*,*\rodolphe"
 Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*"
 Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,xdebug\*"
-Source: "mysql\*.*"; DestDir: "{app}\www\dolibarr\mysql"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
 ; Config files

doc/dev/dolibarr-doxygen.conf

@@ -557,7 +557,6 @@ EXCLUDE                = mssql \
                          dev \
                          doc \
                          documents \
-                         external-libs \
                          htdocs/conf/conf.php \
                          htdocs/includes/adodbtime \
                          htdocs/includes/barcode \

htdocs/conf/conf.php.example

@@ -168,7 +168,7 @@ $dolibarr_main_force_https="0";
 # Parameters not used yet
 # dolibarr_smarty_libs_dir,dolibarr_smarty_compile,dolibarr_smarty_cache
 # Examples:
-# $dolibarr_smarty_libs_dir="/var/www/dolibarr/external-libs/smarty/libs/";
+# $dolibarr_smarty_libs_dir="/var/www/dolibarr/htdocs/includes/smarty/libs/";
 # $dolibarr_smarty_compile="/var/www/dolibarr/documents/temp/smarty_templates";
 # $dolibarr_smarty_cache="/var/www/dolibarr/documents/temp/smarty_cache";
 #

htdocs/core/dolgraph.class.php

@@ -424,7 +424,7 @@ class DolGraph
 		$class='';
 		if ($this->type == 'bars')  $class='BarPlot';
 		if ($this->type == 'lines') $class='LinePlot';
-		include_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/".$class.".class.php";
+		include_once DOL_DOCUMENT_ROOT."/includes/artichow/".$class.".class.php";
 
 		// Definition de couleurs
 		$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
@@ -586,8 +586,8 @@ class DolGraph
 	 */
 	function BarLineAnnualArtichow($file='', $barvalues, $linevalues, $legends='')
 	{
-		require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
-		require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
+		require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
+		require_once DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php";
 
 		$graph = new Graph(240, 200);
 
@@ -685,8 +685,8 @@ class DolGraph
 
 		if (( sizeof($barvalues) * sizeof($linevalues) ) > 0)
 		{
-			require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
-			require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/LinePlot.class.php";
+			require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
+			require_once DOL_DOCUMENT_ROOT."/includes/artichow/LinePlot.class.php";
 
 			$graph = new Graph(540, 200);
 
@@ -772,7 +772,7 @@ class DolGraph
 	 */
 	function BarAnnualArtichow($file='', $values='', $legends='')
 	{
-		require_once DOL_DOCUMENT_ROOT."/../external-libs/Artichow/BarPlot.class.php";
+		require_once DOL_DOCUMENT_ROOT."/includes/artichow/BarPlot.class.php";
 
 		$ok = 0;
 		foreach($values as $val)