From 886f5374bdb23a79256ef51f16c4dcf842c00863 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 25 Oct 2008 11:16:02 +0000
Subject: [PATCH] Move modules into modules directory

---
 htdocs/admin/confexped.php  |  2 +-
 htdocs/admin/expedition.php |  8 ++++----
 htdocs/admin/livraison.php  | 13 +++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 0ba0a6776c7..8c89b4619f8 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -65,7 +65,7 @@ else if ($_GET["action"] == 'disable_delivery')
 /*
  * Affiche page
  */
-$dir = DOL_DOCUMENT_ROOT."/expedition/mods/";
+$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/";
 $html=new Form($db);
 
 llxHeader("","");
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 9d907aa32eb..7d02ce98aa2 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -53,7 +53,7 @@ if ($_GET["action"] == 'specimen')
 	//$exp->fetch_commande();
 
 	// Charge le modele
-	$dir = DOL_DOCUMENT_ROOT . "/expedition/mods/pdf/";
+	$dir = DOL_DOCUMENT_ROOT . "/includes/modules/expedition/pdf/";
 	$file = "pdf_expedition_".$modele.".modules.php";
 	if (file_exists($dir.$file))
 	{
@@ -134,7 +134,7 @@ if ($_GET["action"] == 'setmethod' || $_GET["action"] == 'setmod')
 	$moduleid=$_GET["moduleid"];
 	$statut=$_GET["statut"];
 
-	require_once(DOL_DOCUMENT_ROOT."/expedition/mods/methode_expedition_$module.modules.php");
+	require_once(DOL_DOCUMENT_ROOT."/includes/modules/expedition/methode_expedition_$module.modules.php");
 
 	$class = "methode_expedition_$module";
 	$expem = new $class($db);
@@ -208,7 +208,7 @@ if ($_GET["action"] == 'setmod')
 /*
  * Affiche page
  */
-$dir = DOL_DOCUMENT_ROOT."/expedition/mods/";
+$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/";
 $html=new Form($db);
 
 
@@ -379,7 +379,7 @@ print "</tr>\n";
 
 clearstatcache();
 
-$dir = DOL_DOCUMENT_ROOT."/expedition/mods/pdf/";
+$dir = DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/";
 
 if(is_dir($dir))
 {
diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php
index 1b405833030..a6596a22cac 100644
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.php
@@ -60,7 +60,7 @@ if ($_GET["action"] == 'specimen')
 	//$sending->fetch_commande();
 
 	// Charge le modele
-	$dir = DOL_DOCUMENT_ROOT . "/livraison/mods/pdf/";
+	$dir = DOL_DOCUMENT_ROOT . "/includes/modules/livraison/pdf/";
 	$file = "pdf_".$modele.".modules.php";
 	if (file_exists($dir.$file))
 	{
@@ -141,7 +141,7 @@ if ($_POST["action"] == 'set_DELIVERY_FREE_TEXT')
 
 if ($_GET["action"] == 'setmod')
 {
-    // \todo Verifier si module numerotation choisi peut etre activ�
+    // \todo Verifier si module numerotation choisi peut etre active
     // par appel methode canBeActivated
 
 	dolibarr_set_const($db, "LIVRAISON_ADDON",$_GET["value"]);
@@ -149,9 +149,10 @@ if ($_GET["action"] == 'setmod')
 
 
 /*
- * Affiche page
+ * View
  */
-$dir = DOL_DOCUMENT_ROOT."/livraison/mods/";
+
+$dir = DOL_DOCUMENT_ROOT."/includes/modules/livraison/";
 $html=new Form($db);
 
 llxHeader("","");
@@ -209,7 +210,7 @@ if ($handle)
 		{
 			$file = substr($file, 0, strlen($file)-4);
 
-			require_once(DOL_DOCUMENT_ROOT ."/livraison/mods/".$file.".php");
+			require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/".$file.".php");
 
 			$module = new $file;
 
@@ -312,7 +313,7 @@ print "</tr>\n";
 
 clearstatcache();
 
-$dir = DOL_DOCUMENT_ROOT."/livraison/mods/pdf/";
+$dir = DOL_DOCUMENT_ROOT."/includes/modules/livraison/pdf/";
 
 if(is_dir($dir))
 {