diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 97d31525a8a..958cb9835b7 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-#Thu Aug 13 19:26:05 CEST 2009
+#Sun Mar 21 19:12:06 CET 2010
 eclipse.preferences.version=1
 encoding/<project>=UTF-8
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php
index 1b53f80c6ed..b4fe62bcd10 100644
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 $path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
 require ($path."../htdocs/master.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 381f217871d..456af53eb4f 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -31,7 +31,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 
 $langs->load("admin");
 $langs->load("bills");
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index 0e46e86de8d..ab3be489781 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -27,7 +27,7 @@
  */
 
 require("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
 
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index b7c1a64f99a..10bcccdea64 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -33,7 +33,7 @@ require_once("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 if ($conf->facture->enabled) require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
 if (!empty($conf->global->MAIN_MODULE_CHRONODOCS)) require_once(DOL_DOCUMENT_ROOT."/chronodocs/chronodocs_entries.class.php");
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 3bbd0a6eb04..857655fee68 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -29,7 +29,7 @@ require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/client.class.php");
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
-if ($conf->propal->enabled)  require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)  require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/agenda.lib.php");
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index fb33613f950..a7bed3755ba 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -43,7 +43,7 @@ $langs->load('products');
 
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
-require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/actioncomm.class.php');
 
 $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index fa8ba605ad7..bfacc4aae11 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -27,7 +27,7 @@
  */
 
 require("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index c5273bddd2a..1ca4a5d7cb0 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -25,7 +25,7 @@
  */
 
 require ("./pre.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/html.formcompany.class.php');
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 18657669bf3..a7d2c47affe 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -27,7 +27,7 @@
  */
 
 require('./pre.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index 356a11d27af..97eed173c5d 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -27,7 +27,7 @@
 
 require('./pre.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 
 $langs->load('propal');
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index cdf9c01d14b..6a04938cb3d 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -27,7 +27,7 @@
  */
 
 require('./pre.inc.php');
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 
 $langs->load('propal');
diff --git a/htdocs/propal.class.php b/htdocs/comm/propal/propal.class.php
similarity index 100%
rename from htdocs/propal.class.php
rename to htdocs/comm/propal/propal.class.php
diff --git a/htdocs/comm/propal/stats/propalestats.class.php b/htdocs/comm/propal/stats/propalestats.class.php
index 69f54426353..5c2d2c65faf 100644
--- a/htdocs/comm/propal/stats/propalestats.class.php
+++ b/htdocs/comm/propal/stats/propalestats.class.php
@@ -26,7 +26,7 @@
  */
 
 include_once DOL_DOCUMENT_ROOT . "/stats.class.php";
-include_once DOL_DOCUMENT_ROOT . "/propal.class.php";
+include_once DOL_DOCUMENT_ROOT . "/comm/propal/propal.class.php";
 
 
 /**
@@ -76,7 +76,7 @@ class PropaleStats extends Stats
 
 
 	/**
-	 * Renvoie le nombre de proposition par mois pour une année donnée
+	 * Renvoie le nombre de proposition par mois pour une ann�e donn�e
 	 *
 	 */
 	function getNbByMonth($year)
@@ -94,7 +94,7 @@ class PropaleStats extends Stats
 	}
 
 	/**
-	 * Renvoie le nombre de propale par année
+	 * Renvoie le nombre de propale par ann�e
 	 *
 	 */
 	function getNbByYear()
@@ -110,7 +110,7 @@ class PropaleStats extends Stats
 		return $this->_getNbByYear($sql);
 	}
 	/**
-	 * Renvoie le nombre de propale par mois pour une année donnée
+	 * Renvoie le nombre de propale par mois pour une ann�e donn�e
 	 *
 	 */
 	function getAmountByMonth($year)
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 9598b202444..d1f665a5359 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -31,7 +31,7 @@ require_once(DOL_DOCUMENT_ROOT."/prospect.class.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formcompany.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 
 $langs->load('companies');
 $langs->load('projects');
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index d3640e94489..4c6a428829a 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -29,7 +29,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 
 if (!$user->rights->commande->lire)	accessforbidden();
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 8858d974fa7..c1c7868653f 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -37,7 +37,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 
 if (!$user->rights->commande->lire) accessforbidden();
 
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 4585c267b74..5c70819f2dc 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -29,7 +29,7 @@ require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 
 if (! $user->rights->commande->lire) accessforbidden();
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 16449550d6c..f3870529923 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -38,7 +38,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
-if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT.'/propal.class.php');
+if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT.'/comm/propal/propal.class.php');
 if ($conf->contrat->enabled)  require_once(DOL_DOCUMENT_ROOT.'/contrat/contrat.class.php');
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
 
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 2af4102bdb5..bb43d6afb33 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -29,7 +29,7 @@
 
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/projet/project.class.php');
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/commande.class.php');
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 58c9ea78e6f..d61d1e14511 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -29,7 +29,7 @@
 require("./pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
 if ($conf->projet->enabled)  require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
-if ($conf->propal->enabled)  require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)  require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
 if ($conf->projet->enabled)  require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
 
diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php
index 5d4cf854d34..45deea2ac41 100644
--- a/htdocs/expedition/expedition.class.php
+++ b/htdocs/expedition/expedition.class.php
@@ -26,7 +26,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
-if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 
 
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 9689ffd3db1..863228b125e 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
 if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
-if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 if ($conf->stock->enabled)    require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 5d8a48257e0..e0e11505bdd 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -33,7 +33,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php");
 if ($conf->produit->enabled || $conf->service->enabled)  require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
-if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 if ($conf->stock->enabled)    require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php");
 
diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index c068f6a08e8..7f4035a0791 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -63,7 +63,7 @@ class box_propales extends ModeleBoxes {
 
     	$this->max=$max;
 
-    	include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+    	include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
       $propalstatic=new Propal($db);
 
       $this->info_box_head = array('text' => $langs->trans("BoxTitleLastPropals",$max));
diff --git a/htdocs/index.php b/htdocs/index.php
index f4c6a4a7b8a..3d56f0c0c7c 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -133,7 +133,7 @@ if ($user->societe_id == 0)
 	DOL_DOCUMENT_ROOT."/adherents/adherent.class.php",
 	DOL_DOCUMENT_ROOT."/product/product.class.php",
 	DOL_DOCUMENT_ROOT."/service.class.php",
-	DOL_DOCUMENT_ROOT."/propal.class.php",
+	DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php",
 	DOL_DOCUMENT_ROOT."/commande/commande.class.php",
 	DOL_DOCUMENT_ROOT."/facture.class.php",
 	DOL_DOCUMENT_ROOT."/telephonie/lignetel.class.php",
@@ -322,7 +322,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 {
 	$langs->load("propal");
 
-	include_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+	include_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 	$board=new Propal($db);
 	$board->load_board($user,"opened");
 
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index d4df8a76d38..ecdc07aec0b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -32,7 +32,7 @@ if (! file_exists($conffile))
 require_once($conffile); if (! isset($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql';	// For backward compatibility
 require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php");
 require_once($dolibarr_main_document_root . '/facture.class.php');
-require_once($dolibarr_main_document_root . '/propal.class.php');
+require_once($dolibarr_main_document_root . '/comm/propal/propal.class.php');
 require_once($dolibarr_main_document_root . '/contrat/contrat.class.php');
 require_once($dolibarr_main_document_root . '/commande/commande.class.php');
 require_once($dolibarr_main_document_root . '/fourn/fournisseur.commande.class.php');
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 769b83c20fc..6140cdf352f 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -618,7 +618,7 @@ function show_actions_done($conf,$langs,$db,$objsoc,$objcon='')
 	if ($conf->agenda->enabled || ($conf->mailing->enabled && $objcon->email))
 	{
 		require_once(DOL_DOCUMENT_ROOT."/actioncomm.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 		require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 		require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 		$actionstatic=new ActionComm($db);
diff --git a/htdocs/livraison/livraison.class.php b/htdocs/livraison/livraison.class.php
index c813934238d..a097f61085a 100644
--- a/htdocs/livraison/livraison.class.php
+++ b/htdocs/livraison/livraison.class.php
@@ -29,7 +29,7 @@
 require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/expedition.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/stock/mouvementstock.class.php");
-if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)   require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 
 
diff --git a/htdocs/livraison/pre.inc.php b/htdocs/livraison/pre.inc.php
index ff1816e3ba0..253ab4ada5d 100644
--- a/htdocs/livraison/pre.inc.php
+++ b/htdocs/livraison/pre.inc.php
@@ -27,7 +27,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/livraison/livraison.class.php");
 if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
-if ($conf->propale->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propale->enabled) require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 
 $langs->load("orders");
 $langs->load("sendings");
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index fea457f2b5d..6775e788373 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -31,7 +31,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 023cb9c010f..5aeba4fc327 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -28,7 +28,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once DOL_DOCUMENT_ROOT."/fourn/fournisseur.product.class.php";
 
 $langs->load("products");
diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php
index 6f2563ee2d0..86a6bcc2aa7 100644
--- a/htdocs/product/stats/index.php
+++ b/htdocs/product/stats/index.php
@@ -25,7 +25,7 @@
  s*/
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 775a1be3715..be07b0f50a6 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -28,7 +28,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
 
 $langs->load("products");
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index e2ca515543e..9f2e8a39aa3 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -28,7 +28,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/project.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/project.lib.php");
-if ($conf->propal->enabled)      require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
+if ($conf->propal->enabled)      require_once(DOL_DOCUMENT_ROOT."/comm/propal/propal.class.php");
 if ($conf->facture->enabled)     require_once(DOL_DOCUMENT_ROOT."/facture.class.php");
 if ($conf->facture->enabled)     require_once(DOL_DOCUMENT_ROOT."/compta/facture/facture-rec.class.php");
 if ($conf->commande->enabled)    require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");