diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 761e81b641c..d07463ae027 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -292,7 +292,7 @@ class ActionComm extends CommonObject
 				$this->fk_propal = $obj->propalrowid;
 				if ($this->fk_propal)
 				{
-					$this->objet_url = img_object($langs->trans("ShowPropal"),'propal').' '.'<a href="'. DOL_URL_ROOT . '/comm/propal.php?propalid='.$this->fk_propal.'">'.$langs->trans("Propal").'</a>';
+					$this->objet_url = img_object($langs->trans("ShowPropal"),'propal').' '.'<a href="'. DOL_URL_ROOT . '/comm/propal.php?id='.$this->fk_propal.'">'.$langs->trans("Propal").'</a>';
 					$this->objet_url_type = 'propal';
 				}
 
diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index 3392238d63b..2910afac23e 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -78,7 +78,7 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
         	}
         	elseif ($origin == propal)
         	{
-        		Header("Location: ../comm/propal.php?action=editdelivery_adress&socid=".$socid."&propalid=".$originid);
+        		Header("Location: ../comm/propal.php?action=editdelivery_adress&socid=".$socid."&id=".$originid);
         		exit;
         	}
         	else
@@ -110,7 +110,7 @@ if ($_POST["action"] == 'add' || $_POST["action"] == 'update')
         	}
         	elseif ($origin == propal)
         	{
-        		Header("Location: ../comm/propal.php?propalid=".$originid);
+        		Header("Location: ../comm/propal.php?id=".$originid);
         		exit;
         	}
         	elseif ($origin == shipment)
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 417f75e8d09..25023e9d2a7 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -416,7 +416,7 @@ if ($socid > 0)
 			{
 				$objp = $db->fetch_object($resql);
 				print "<tr $bc[$var]>";
-				print "<td nowrap><a href=\"propal.php?propalid=$objp->propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a>\n";
+				print "<td nowrap><a href=\"propal.php?id=$objp->propalid\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a>\n";
 				if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 )
 				{
 					print " ".img_warning();
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 776a8aee47f..75aaa54f420 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -318,7 +318,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 			print '<td width="16" align="center" class="nobordernopadding">';
 			$filename=dol_sanitizeFileName($objp->ref);
 			$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($objp->ref);
-			$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
 			$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
 			print '</td></tr></table>';
 
@@ -578,7 +578,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
 				print '<td width="16" align="center" class="nobordernopadding">';
 				$filename=dol_sanitizeFileName($obj->ref);
 				$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($obj->ref);
-				$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$obj->propalid;
+				$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->propalid;
 				$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
 				print '</td></tr></table>';
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 20f99d495ec..f8b16d04816 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -37,7 +37,11 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 if ($conf->projet->enabled)   require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
-if ($conf->milestone->enabled) require_once(DOL_DOCUMENT_ROOT.'/milestone/lib/milestone.lib.php');
+if ($conf->milestone->enabled)
+{
+	require_once(DOL_DOCUMENT_ROOT.'/milestone/lib/milestone.lib.php');
+	require_once(DOL_DOCUMENT_ROOT.'/milestone/class/milestone.class.php');
+}
 
 $langs->load('companies');
 $langs->load('propal');
@@ -61,9 +65,9 @@ if (isset($_GET["socid"]))
 	$module='societe';
 	$dbtable='';
 }
-else if (isset($_GET["propalid"]) &&  $_GET["propalid"] > 0)
+else if (isset($_GET["id"]) &&  $_GET["id"] > 0)
 {
-	$objectid=$_GET["propalid"];
+	$objectid=$_GET["id"];
 	$module='propale';
 	$dbtable='propal';
 }
@@ -88,17 +92,17 @@ if ($_REQUEST["action"] == 'confirm_clone' && $_REQUEST['confirm'] == 'yes')
 	else
 	{
 		$object=new Propal($db);
-		$result=$object->createFromClone($_REQUEST['propalid']);
+		$result=$object->createFromClone($_REQUEST["id"]);
 		if ($result > 0)
 		{
-			header("Location: ".$_SERVER['PHP_SELF'].'?propalid='.$result);
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 			exit;
 		}
 		else
 		{
 			$mesg=$object->error;
 			$_GET['action']='';
-			$_GET['propalid']=$_REQUEST['propalid'];
+			$_GET['id']=$_REQUEST['id'];
 		}
 	}
 }
@@ -108,10 +112,10 @@ if ($_REQUEST['action'] == 'confirm_delete' && $_REQUEST['confirm'] == 'yes')
 {
 	if ($user->rights->propale->supprimer)
 	{
-		$propal = new Propal($db, 0, $_GET['propalid']);
-		$propal->fetch($_GET['propalid']);
+		$propal = new Propal($db, 0, $_GET["id"]);
+		$propal->fetch($_GET["id"]);
 		$result=$propal->delete($user);
-		$propalid = 0;
+		$id = 0;
 		$brouillon = 1;
 
 		if ($result > 0)
@@ -134,7 +138,7 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes'
 	if ($user->rights->propale->creer)
 	{
 		$propal = new Propal($db);
-		$propal->fetch($_GET['propalid']);
+		$propal->fetch($_GET["id"]);
 		$propal->fetch_client();
 		$result = $propal->delete_product($_GET['lineid']);
 
@@ -160,7 +164,7 @@ if ($_REQUEST['action'] == 'confirm_deleteline' && $_REQUEST['confirm'] == 'yes'
 if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes' && $user->rights->propale->valider)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$propal->fetch_client();
 
 	$result=$propal->valid($user);
@@ -187,21 +191,21 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes' &
 if ($_POST['action'] == 'setdate')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$result=$propal->set_date($user,dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']));
 	if ($result < 0) dol_print_error($db,$propal->error);
 }
 if ($_POST['action'] == 'setecheance')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$result=$propal->set_echeance($user,dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
 	if ($result < 0) dol_print_error($db,$propal->error);
 }
 if ($_POST['action'] == 'setdate_livraison')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$result=$propal->set_date_livraison($user,dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
 	if ($result < 0) dol_print_error($db,$propal->error);
 }
@@ -209,7 +213,7 @@ if ($_POST['action'] == 'setdate_livraison')
 if ($_POST['action'] == 'setdeliveryadress' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$result=$propal->set_adresse_livraison($user,$_POST['fk_address']);
 	if ($result < 0) dol_print_error($db,$propal->error);
 }
@@ -218,13 +222,16 @@ if ($_POST['action'] == 'setdeliveryadress' && $user->rights->propale->creer)
 if ($_POST['action'] == 'set_ref_client' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$propal->set_ref_client($user, $_POST['ref_client']);
 }
 
 // Add milestone
 if ($_POST['action'] == 'addmilestone')
 {
+	$propal = new Propal($db);
+	$propal->fetch($_GET["id"]);
+	
 	$milestone_error=0;
 	
 	if ($_POST['milestone_label'] == $langs->trans('Label') || $_POST['milestone_desc'] == $langs->trans('Description'))
@@ -232,6 +239,15 @@ if ($_POST['action'] == 'addmilestone')
 		$milestone_error++;
 		$mesg = '<div class="error">'.$langs->trans("ErrorMilestone").'</div>';
 	}
+	else 
+	{
+		$milestone = new Milestone($db);
+		
+		$milestone->label = $_POST['milestone_label'];
+		$milestone->description = $_POST['milestone_desc'];
+		$milestone->elementtype = $propal->element;
+		$milestone->fk_element = $propal->id;
+	}
 }
 
 /*
@@ -344,7 +360,7 @@ if ($_POST['action'] == 'add' && $user->rights->propale->creer)
 			}
 			propale_pdf_create($db, $id, $_REQUEST['model'], $outputlangs);
 
-			Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$id);
+			Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 			exit;
 		}
 		else
@@ -376,7 +392,7 @@ if ($_REQUEST['action'] == 'setstatut' && $user->rights->propale->cloturer)
 		else
 		{
 			$propal = new Propal($db);
-			$propal->fetch($_GET['propalid']);
+			$propal->fetch($_GET["id"]);
 			// prevent browser refresh from closing proposal several times
 			if ($propal->statut==1)
 			{
@@ -429,7 +445,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile']
 	$langs->load('mails');
 
 	$propal= new Propal($db);
-	$result=$propal->fetch($_POST['propalid']);
+	$result=$propal->fetch($_POST["id"]);
 	$result=$propal->fetch_thirdparty();
 
 	if ($result > 0)
@@ -532,7 +548,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile']
 						{
 							// Redirect here
 							// This avoid sending mail twice if going out and then back to page
-							Header('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&mesg='.urlencode($mesg));
+							Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&mesg='.urlencode($mesg));
 							exit;
 						}
 					}
@@ -581,7 +597,7 @@ if ($_GET['action'] == 'commande')
 	 *  Cloture de la propale
 	 */
 	$propal = new Propal($db);
-	$propal->fetch($propalid);
+	$propal->fetch($id);
 	$propal->create_commande($user);
 }
 
@@ -591,7 +607,7 @@ if ($_GET['action'] == 'modif' && $user->rights->propale->creer)
 	 *  Repasse la propale en mode brouillon
 	 */
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$propal->fetch_client();
 	$propal->set_draft($user);
 
@@ -614,8 +630,8 @@ if ($_POST['action'] == "setabsolutediscount" && $user->rights->propale->creer)
 	if ($_POST["remise_id"])
 	{
 		$prop = new Propal($db);
-		$prop->id=$_GET['propalid'];
-		$ret=$prop->fetch($_GET['propalid']);
+		$prop->id=$_GET["id"];
+		$ret=$prop->fetch($_GET["id"]);
 		if ($ret > 0)
 		{
 			$result=$prop->insert_discount($_POST["remise_id"]);
@@ -652,7 +668,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
 
 	if ($result >= 0 && isset($_POST['qty']) && (($_POST['np_price']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
 	{
-		$ret=$propal->fetch($_POST['propalid']);
+		$ret=$propal->fetch($_POST["id"]);
 		if ($ret < 0)
 		{
 			dol_print_error($db,$propal->error);
@@ -730,7 +746,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
 		{
 			// Insert line
 			$result=$propal->addline(
-			$_POST['propalid'],
+			$_POST["id"],
 			$desc,
 			$pu_ht,
 			$_POST['qty'],
@@ -779,7 +795,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer)
 if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST["save"] == $langs->trans("Save"))
 {
 	$propal = new Propal($db);
-	if (! $propal->fetch($_POST['propalid']) > 0)
+	if (! $propal->fetch($_POST["id"]) > 0)
 	{
 		dol_print_error($db,$propal->error);
 		exit;
@@ -840,7 +856,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST
 if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$propal->fetch_client();
 
 	if ($_REQUEST['model'])
@@ -866,7 +882,7 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
 	}
 	else
 	{
-		Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
+		Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$propal->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
 		exit;
 	}
 }
@@ -875,7 +891,7 @@ if ($_REQUEST['action'] == 'builddoc' && $user->rights->propale->creer)
 if ($_POST['action'] == 'classin')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET['id']);
 	$propal->setProject($_POST['projectid']);
 }
 
@@ -883,34 +899,34 @@ if ($_POST['action'] == 'classin')
 if ($_POST["action"] == 'setconditions')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_REQUEST['propalid']);
+	$propal->fetch($_REQUEST['id']);
 	$result = $propal->cond_reglement($_POST['cond_reglement_id']);
-	$_GET['propalid']=$_REQUEST['propalid'];
+	$_GET['id']=$_REQUEST['id'];
 }
 
 if ($_REQUEST['action'] == 'setremisepercent' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_REQUEST['propalid']);
+	$propal->fetch($_REQUEST["id"]);
 	$result = $propal->set_remise_percent($user, $_POST['remise_percent']);
-	$_GET['propalid']=$_REQUEST['propalid'];
+	$_GET["id"]=$_REQUEST["id"];
 }
 
 if ($_REQUEST['action'] == 'setremiseabsolue' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_REQUEST['propalid']);
+	$propal->fetch($_REQUEST["id"]);
 	$result = $propal->set_remise_absolue($user, $_POST['remise_absolue']);
-	$_GET['propalid']=$_REQUEST['propalid'];
+	$_GET["id"]=$_REQUEST["id"];
 }
 
 // Mode de reglement
 if ($_POST["action"] == 'setmode')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_REQUEST['propalid']);
+	$propal->fetch($_REQUEST["id"]);
 	$result = $propal->mode_reglement($_POST['mode_reglement_id']);
-	$_GET['propalid']=$_REQUEST['propalid'];
+	$_GET["id"]=$_REQUEST["id"];
 }
 
 /*
@@ -919,8 +935,8 @@ if ($_POST["action"] == 'setmode')
 
 if ($_GET['action'] == 'up' && $user->rights->propale->creer)
 {
-	$propal = new Propal($db, '', $_GET["propalid"]);
-	$propal->fetch($_GET['propalid']);
+	$propal = new Propal($db, '', $_GET["id"]);
+	$propal->fetch($_GET["id"]);
 	$propal->fetch_client();
 	$propal->line_up($_GET['rowid']);
 
@@ -936,14 +952,14 @@ if ($_GET['action'] == 'up' && $user->rights->propale->creer)
 	}
 	propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 
-	Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']);
+	Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
 	exit;
 }
 
 if ($_GET['action'] == 'down' && $user->rights->propale->creer)
 {
-	$propal = new Propal($db, '', $_GET["propalid"]);
-	$propal->fetch($_GET['propalid']);
+	$propal = new Propal($db, '', $_GET["id"]);
+	$propal->fetch($_GET['id']);
 	$propal->fetch_client();
 	$propal->line_down($_GET['rowid']);
 
@@ -959,7 +975,7 @@ if ($_GET['action'] == 'down' && $user->rights->propale->creer)
 	}
 	propale_pdf_create($db, $propal->id, $propal->modelpdf, $outputlangs);
 
-	Header ('Location: '.$_SERVER["PHP_SELF"].'?propalid='.$_GET["propalid"].'#'.$_GET['rowid']);
+	Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$_GET["id"].'#'.$_GET['rowid']);
 	exit;
 }
 
@@ -976,7 +992,7 @@ $companystatic=new Societe($db);
 
 $now=dol_now();
 
-$id = $_REQUEST['propalid']?$_REQUEST['propalid']:$_REQUEST['id'];
+$id = $_REQUEST['id']?$_REQUEST['id']:$_REQUEST['id'];
 $ref= $_REQUEST['ref'];
 
 if ($id > 0 || ! empty($ref))
@@ -1007,7 +1023,7 @@ if ($id > 0 || ! empty($ref))
 		//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1)
 		);
 		// Paiement incomplet. On demande si motif = escompte ou autre
-		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?propalid='.$propal->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$propal->ref),'confirm_clone',$formquestion,'yes',1);
+		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$propal->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$propal->ref),'confirm_clone',$formquestion,'yes',1);
 		if ($ret == 'html') print '<br>';
 	}
 
@@ -1016,7 +1032,7 @@ if ($id > 0 || ! empty($ref))
 	 */
 	if ($_GET['action'] == 'delete')
 	{
-		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?propalid='.$propal->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp'), 'confirm_delete','',0,1);
+		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$propal->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp'), 'confirm_delete','',0,1);
 		if ($ret == 'html') print '<br>';
 	}
 
@@ -1025,7 +1041,7 @@ if ($id > 0 || ! empty($ref))
 	 */
 	if ($_GET['action'] == 'ask_deleteline')
 	{
-		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
+		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$propal->id.'&lineid='.$_GET["lineid"], $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
 		if ($ret == 'html') print '<br>';
 	}
 
@@ -1054,7 +1070,7 @@ if ($id > 0 || ! empty($ref))
 			$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$propal->socid);
 		}
 
-		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?propalid='.$propal->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
+		$ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$propal->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
 		if ($ret == 'html') print '<br>';
 	}
 
@@ -1078,12 +1094,12 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
 	print $langs->trans('RefCustomer').'</td><td align="left">';
 	print '</td>';
-	if ($_GET['action'] != 'refclient' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
+	if ($_GET['action'] != 'refclient' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;id='.$propal->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="5">';
 	if ($user->rights->propale->creer && $_GET['action'] == 'refclient')
 	{
-		print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
+		print '<form action="propal.php?id='.$propal->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="set_ref_client">';
 		print '<input type="text" class="flat" size="20" name="ref_client" value="'.$propal->ref_client.'">';
@@ -1123,7 +1139,7 @@ if ($id > 0 || ! empty($ref))
 			// Remise dispo de type non avoir
 			$filter='fk_facture_source IS NULL';
 			print '<br>';
-			$html->form_remise_dispo($_SERVER["PHP_SELF"].'?propalid='.$propal->id,0,'remise_id',$societe->id,$absolute_discount,$filter);
+			$html->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$propal->id,0,'remise_id',$societe->id,$absolute_discount,$filter);
 		}
 	}
 	if ($absolute_creditnote)
@@ -1139,12 +1155,12 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Date');
 	print '</td>';
-	if ($_GET['action'] != 'editdate' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
+	if ($_GET['action'] != 'editdate' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($propal->brouillon && $_GET['action'] == 'editdate')
 	{
-		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
+		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="setdate">';
 		$html->select_date($propal->date,'re','','',0,"editdate");
@@ -1184,12 +1200,12 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateEndPropal');
 	print '</td>';
-	if ($_GET['action'] != 'editecheance' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	if ($_GET['action'] != 'editecheance' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($propal->brouillon && $_GET['action'] == 'editecheance')
 	{
-		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
+		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="setecheance">';
 		$html->select_date($propal->fin_validite,'ech','','','',"editecheance");
@@ -1217,12 +1233,12 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DeliveryDate');
 	print '</td>';
-	if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+	if ($_GET['action'] != 'editdate_livraison' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($_GET['action'] == 'editdate_livraison')
 	{
-		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
+		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		$html->select_date($propal->date_livraison,'liv_','','','',"editdate_livraison");
@@ -1244,17 +1260,17 @@ if ($id > 0 || ! empty($ref))
 		print $langs->trans('DeliveryAddress');
 		print '</td>';
 
-		if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socid='.$propal->socid.'&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
+		if ($_GET['action'] != 'editdelivery_adress' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdelivery_adress&amp;socid='.$propal->socid.'&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetDeliveryAddress'),1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 
 		if ($_GET['action'] == 'editdelivery_adress')
 		{
-			$html->form_address($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id);
+			$html->form_address($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'fk_address','propal',$propal->id);
 		}
 		else
 		{
-			$html->form_address($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'none','propal',$propal->id);
+			$html->form_address($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->fk_delivery_address,$_GET['socid'],'none','propal',$propal->id);
 		}
 		print '</td></tr>';
 	}
@@ -1264,16 +1280,16 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($_GET['action'] != 'editconditions' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	if ($_GET['action'] != 'editconditions' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($_GET['action'] == 'editconditions')
 	{
-		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->cond_reglement_id,'cond_reglement_id');
+		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->cond_reglement_id,'cond_reglement_id');
 	}
 	else
 	{
-		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->cond_reglement_id,'none');
+		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->cond_reglement_id,'none');
 	}
 	print '</td>';
 	print '</tr>';
@@ -1284,16 +1300,16 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($_GET['action'] != 'editmode' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	if ($_GET['action'] != 'editmode' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($_GET['action'] == 'editmode')
 	{
-		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->mode_reglement_id,'mode_reglement_id');
+		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->mode_reglement_id,'mode_reglement_id');
 	}
 	else
 	{
-		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->mode_reglement_id,'none');
+		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->mode_reglement_id,'none');
 	}
 	print '</td></tr>';
 
@@ -1306,16 +1322,16 @@ if ($id > 0 || ! empty($ref))
 		print $langs->trans('Project').'</td>';
 		if ($user->rights->propale->creer)
 		{
-			if ($_GET['action'] != 'classer') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classer&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
+			if ($_GET['action'] != 'classer') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classer&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
 			print '</tr></table>';
 			print '</td><td colspan="3">';
 			if ($_GET['action'] == 'classer')
 			{
-				$html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->fk_project, 'projectid');
+				$html->form_project($_SERVER['PHP_SELF'].'?id='.$propal->id, $propal->socid, $propal->fk_project, 'projectid');
 			}
 			else
 			{
-				$html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->fk_project, 'none');
+				$html->form_project($_SERVER['PHP_SELF'].'?id='.$propal->id, $propal->socid, $propal->fk_project, 'none');
 			}
 			print '</td></tr>';
 		}
@@ -1496,7 +1512,7 @@ if ($id > 0 || ! empty($ref))
 
 				if ($conf->global->PRODUIT_USE_MARKUP && $conf->use_javascript_ajax)
 				{
-					$formMarkup = '<form id="formMarkup" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">'."\n";
+					$formMarkup = '<form id="formMarkup" action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'" method="post">'."\n";
 					$formMarkup.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 					$formMarkup.= '<table class="border" width="100%">'."\n";
 					if ($objp->fk_product > 0)
@@ -1594,13 +1610,13 @@ if ($id > 0 || ! empty($ref))
 					}
 					else
 					{
-						print '<a href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=editline&amp;lineid='.$objp->rowid.'#'.$objp->rowid.'">';
+						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=editline&amp;lineid='.$objp->rowid.'#'.$objp->rowid.'">';
 						print img_edit();
 						print '</a>';
 					}
 					print '</td>';
 					print '<td align="center">';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->rowid.'">';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=ask_deleteline&amp;lineid='.$objp->rowid.'">';
 					print img_delete();
 					print '</a></td>';
 					if ($num > 1)
@@ -1608,13 +1624,13 @@ if ($id > 0 || ! empty($ref))
 						print '<td align="center">';
 						if ($i > 0)
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=up&amp;rowid='.$objp->rowid.'">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=up&amp;rowid='.$objp->rowid.'">';
 							print img_up();
 							print '</a>';
 						}
 						if ($i < $num-1)
 						{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=down&amp;rowid='.$objp->rowid.'">';
+							print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=down&amp;rowid='.$objp->rowid.'">';
 							print img_down();
 							print '</a>';
 						}
@@ -1632,10 +1648,9 @@ if ($id > 0 || ! empty($ref))
 			// Ligne en mode update
 			if ($propal->statut == 0 && $_GET["action"] == 'editline' && $user->rights->propale->creer && $_GET["lineid"] == $objp->rowid)
 			{
-				print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#'.$objp->rowid.'" method="post">';
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'#'.$objp->rowid.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="updateligne">';
-				print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
 				print '<input type="hidden" name="lineid" value="'.$_GET["lineid"].'">';
 				print '<tr '.$bc[$var].'>';
 				print '<td>';
@@ -1733,9 +1748,8 @@ if ($id > 0 || ! empty($ref))
 		print "</tr>\n";
 
 		// Add free products/services form
-		print '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#add" method="post">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'#add" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
 		print '<input type="hidden" name="action" value="addline">';
 
 		print '<tr '.$bc[$var].">\n";
@@ -1800,9 +1814,8 @@ if ($id > 0 || ! empty($ref))
 			print '<td align="right">'.$langs->trans('ReductionShort').'</td>';
 			print '<td colspan="4">&nbsp;</td>';
 			print '</tr>';
-			print '<form id="addpredefinedproduct" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'#add" method="post">';
+			print '<form id="addpredefinedproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'#add" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="propalid" value="'.$propal->id.'">';
 			print '<input type="hidden" name="action" value="addline">';
 
 			$var=!$var;
@@ -1855,7 +1868,7 @@ if ($id > 0 || ! empty($ref))
 		/*
 		 * Formulaire cloture (signe ou non)
 		 */
-		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">';
+		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'" method="post">';
 		$form_close.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$form_close.= '<table class="border" width="100%">';
 		$form_close.= '<tr><td width="150" align="left">'.$langs->trans('Note').'</td><td align="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
@@ -1892,14 +1905,14 @@ if ($id > 0 || ! empty($ref))
 			// Valid
 			if ($propal->statut == 0 && $user->rights->propale->valider)
 			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=validate"';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=validate"';
 				print '>'.$langs->trans('Validate').'</a>';
 			}
 
 			// Edit
 			if ($propal->statut == 1 && $user->rights->propale->creer)
 			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
 			}
 
 			// Send
@@ -1909,27 +1922,27 @@ if ($id > 0 || ! empty($ref))
 				$file = $conf->propale->dir_output . '/'.$propref.'/'.$propref.'.pdf';
 				if (file_exists($file))
 				{
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
 				}
 			}
 
 			// Close
 			if ($propal->statut == 1 && $user->rights->propale->cloturer)
 			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=statut#close"';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=statut#close"';
 				print '>'.$langs->trans('Close').'</a>';
 			}
 
 			// Clone
 			if ($propal->type == 0 && $user->rights->propale->creer)
 			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?propalid='.$propal->id.'&amp;action=clone&amp;object=propal">'.$langs->trans("ToClone").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$propal->id.'&amp;action=clone&amp;object=propal">'.$langs->trans("ToClone").'</a>';
 			}
 
 			// Delete
 			if ($user->rights->propale->supprimer)
 			{
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&amp;action=delete"';
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&amp;action=delete"';
 				print '>'.$langs->trans('Delete').'</a>';
 			}
 
@@ -1950,7 +1963,7 @@ if ($id > 0 || ! empty($ref))
 		 */
 		$filename=dol_sanitizeFileName($propal->ref);
 		$filedir=$conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
-		$urlsource=$_SERVER["PHP_SELF"]."?propalid=".$propal->id;
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$propal->id;
 		$genallowed=$user->rights->propale->creer;
 		$delallowed=$user->rights->propale->supprimer;
 
@@ -2020,8 +2033,8 @@ if ($id > 0 || ! empty($ref))
 		// Tableau des parametres complementaires
 		$formmail->param['action']='send';
 		$formmail->param['models']='propal_send';
-		$formmail->param['propalid']=$propal->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?propalid='.$propal->id;
+		$formmail->param['id']=$propal->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$propal->id;
 
 		// Init list of files
 		if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
@@ -2195,7 +2208,7 @@ else
 			print '<td width="16" align="right" class="nobordernopadding">';
 			$filename=dol_sanitizeFileName($objp->ref);
 			$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($objp->ref);
-			$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
 			$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
 			print '</td></tr></table>';
 
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index 40e7e8fe69c..afd31a97531 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -35,11 +35,11 @@ $langs->load('propal');
 $langs->load("bills");
 $langs->load('compta');
 
-$propalid = isset($_GET["propalid"])?$_GET["propalid"]:'';
+$id = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'propale', $propalid, 'propal');
+$result = restrictedArea($user, 'propale', $id, 'propal');
 
 
 /*
@@ -56,11 +56,11 @@ $html = new Form($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($_GET["propalid"] > 0)
+if ($_GET["id"] > 0)
 {
 	$propal = new Propal($db);
 
-	if ( $propal->fetch($_GET["propalid"], $user->societe_id) > 0)
+	if ( $propal->fetch($_GET["id"], $user->societe_id) > 0)
 	{
 		$soc = new Societe($db, $propal->socid);
 		$soc->fetch($propal->socid);
@@ -214,7 +214,7 @@ if ($_GET["propalid"] > 0)
 		}
 	} else {
 		// Propal non trouvee
-		print $langs->trans("ErrorPropalNotFound",$_GET["propalid"]);
+		print $langs->trans("ErrorPropalNotFound",$_GET["id"]);
 	}
 }
 
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index e06dc2b2654..0b11aa75145 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2127,15 +2127,15 @@ class Propal extends CommonObject
 		$result='';
 		if($option == '')
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$this->id. $get_params .'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$this->id. $get_params .'">';
 		}
 		if($option == 'compta')
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/compta/propal.php?propalid='.$this->id. $get_params .'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/compta/propal.php?id='.$this->id. $get_params .'">';
 		}
 		if($option == 'expedition')
 		{
-			$lien = '<a href="'.DOL_URL_ROOT.'/expedition/propal.php?propalid='.$this->id. $get_params .'">';
+			$lien = '<a href="'.DOL_URL_ROOT.'/expedition/propal.php?id='.$this->id. $get_params .'">';
 		}
 		$lienfin='</a>';
 
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 6cdb27466d7..820edca454c 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -35,11 +35,11 @@ $langs->load("orders");
 $langs->load("sendings");
 $langs->load("companies");
 
-$propalid = isset($_GET["propalid"])?$_GET["propalid"]:'';
+$id = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'propale', $propalid, 'propal');
+$result = restrictedArea($user, 'propale', $id, 'propal');
 
 
 /*
@@ -51,16 +51,16 @@ if ($_POST["action"] == 'addcontact' && $user->rights->propale->creer)
 
 	$result = 0;
 	$propal = new Propal($db);
-	$result = $propal->fetch($_GET["propalid"]);
+	$result = $propal->fetch($_GET["id"]);
 
-    if ($result > 0 && $_GET["propalid"] > 0)
+    if ($result > 0 && $_GET["id"] > 0)
     {
   		$result = $propal->add_contact($_POST["contactid"], $_POST["type"], $_POST["source"]);
     }
 
 	if ($result >= 0)
 	{
-		Header("Location: contact.php?propalid=".$propal->id);
+		Header("Location: contact.php?id=".$propal->id);
 		exit;
 	}
 	else
@@ -80,7 +80,7 @@ if ($_POST["action"] == 'addcontact' && $user->rights->propale->creer)
 if ($_POST["action"] == 'updateligne' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	if ($propal->fetch($_GET["propalid"]))
+	if ($propal->fetch($_GET["id"]))
 	{
 		$contact = $propal->detail_contact($_POST["elrowid"]);
 		$type = $_POST["type"];
@@ -105,7 +105,7 @@ if ($_POST["action"] == 'updateligne' && $user->rights->propale->creer)
 if ($_GET["action"] == 'swapstatut' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	if ($propal->fetch($_GET["propalid"]))
+	if ($propal->fetch($_GET["id"]))
 	{
 		$contact = $propal->detail_contact($_GET["ligne"]);
 		$id_type_contact = $contact->fk_c_type_contact;
@@ -130,12 +130,12 @@ if ($_GET["action"] == 'swapstatut' && $user->rights->propale->creer)
 if ($_GET["action"] == 'deleteline' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET["propalid"]);
+	$propal->fetch($_GET["id"]);
 	$result = $propal->delete_contact($_GET["lineid"]);
 
 	if ($result >= 0)
 	{
-		Header("Location: contact.php?propalid=".$propal->id);
+		Header("Location: contact.php?id=".$propal->id);
 		exit;
 	}
 	else {
@@ -162,8 +162,8 @@ $contactstatic=new Contact($db);
 /* *************************************************************************** */
 if (isset($mesg)) print $mesg;
 
-$id = $_GET['propalid'];
-$ref= $_GET['ref'];
+$id = $_GET["id"];
+$ref= $_GET["ref"];
 if ($id > 0 || ! empty($ref))
 {
 	$propal = New Propal($db);
@@ -233,11 +233,10 @@ if ($id > 0 || ! empty($ref))
 
 			$var = false;
 
-			print '<form action="contact.php?propalid='.$id.'" method="post">';
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="addcontact">';
 			print '<input type="hidden" name="source" value="internal">';
-			print '<input type="hidden" name="propalid" value="'.$id.'">';
 
 			// Ligne ajout pour contact interne
 			print "<tr $bc[$var]>";
@@ -251,7 +250,7 @@ if ($id > 0 || ! empty($ref))
 			print '</td>';
 
 			print '<td colspan="1">';
-			// On r�cup�re les id des users d�j� s�lectionn�s
+			// On recupere les id des users deja selectionnes
 			//$userAlreadySelected = $propal->getListContactId('internal');	// On ne doit pas desactiver un contact deja selectionner car on doit pouvoir le seclectionner une deuxieme fois pour un autre type
 			$html->select_users($user->id,'contactid',0,$userAlreadySelected);
 			print '</td>';
@@ -263,11 +262,10 @@ if ($id > 0 || ! empty($ref))
 
 			print '</form>';
 
-			print '<form action="contact.php?propalid='.$id.'" method="post">';
+			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="addcontact">';
 			print '<input type="hidden" name="source" value="external">';
-			print '<input type="hidden" name="propalid" value="'.$id.'">';
 
 			// Ligne ajout pour contact externe
 			$var=!$var;
@@ -279,7 +277,7 @@ if ($id > 0 || ! empty($ref))
 
 			print '<td colspan="1">';
 			$selectedCompany = isset($_GET["newcompany"])?$_GET["newcompany"]:$propal->client->id;
-			$selectedCompany = $formcompany->selectCompaniesForNewContact($propal, 'propalid', $selectedCompany, 'newcompany');
+			$selectedCompany = $formcompany->selectCompaniesForNewContact($propal, 'id', $selectedCompany, 'newcompany');
 			print '</td>';
 
 			print '<td colspan="1">';
@@ -368,7 +366,7 @@ if ($id > 0 || ! empty($ref))
 				// Statut
 				print '<td align="center">';
 				// Activation desativation du contact
-				if ($propal->statut >= 0) print '<a href="contact.php?propalid='.$propal->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
+				if ($propal->statut >= 0) print '<a href="contact.php?id='.$propal->id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
 				print $contactstatic->LibStatut($tab[$i]['status'],3);
 				if ($propal->statut >= 0) print '</a>';
 				print '</td>';
@@ -378,7 +376,7 @@ if ($id > 0 || ! empty($ref))
 				if ($user->rights->propale->creer)
 				{
 					print '&nbsp;';
-					print '<a href="contact.php?propalid='.$propal->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
+					print '<a href="contact.php?id='.$propal->id.'&amp;action=deleteline&amp;lineid='.$tab[$i]['rowid'].'">';
 					print img_delete();
 					print '</a>';
 				}
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index afc0e64ba90..f00b6d29153 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -37,7 +37,7 @@ $langs->load('other');
 
 $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
-$propalid = isset($_GET["propalid"])?$_GET["propalid"]:'';
+$id = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id)
@@ -46,7 +46,7 @@ if ($user->societe_id)
 	$action='';
 	$socid = $user->societe_id;
 }
-$result = restrictedArea($user, 'propale', $propalid, 'propal');
+$result = restrictedArea($user, 'propale', $id, 'propal');
 
 // Get parameters
 $page=$_GET["page"];
@@ -72,7 +72,7 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 
 	$propal = new Propal($db);
 
-	if ($propal->fetch($propalid))
+	if ($propal->fetch($id))
     {
         $upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
 
@@ -108,8 +108,8 @@ if ($action=='delete')
 {
 	$propal = new Propal($db);
 
-	$propalid=$_GET["id"];
-	if ($propal->fetch($propalid))
+	$id=$_GET["id"];
+	if ($propal->fetch($id))
     {
         $upload_dir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
     	$file = $upload_dir . '/' . $_GET['urlfile'];	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
@@ -127,8 +127,8 @@ llxHeader();
 
 $html = new Form($db);
 
-$id = $_GET['propalid']?$_GET['propalid']:$_GET['id'];
-$ref= $_GET['ref'];
+$id = $_GET["id"];
+$ref= $_GET["ref"];
 if ($id > 0 || ! empty($ref))
 {
 	$propal = new Propal($db);
@@ -189,11 +189,11 @@ if ($id > 0 || ! empty($ref))
 
         // Affiche formulaire upload
        	$formfile=new FormFile($db);
-		$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id,'',0,0,$user->rights->propale->creer);
+		$formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/propal/document.php?id='.$propal->id,'',0,0,$user->rights->propale->creer);
 
 
 		// List of document
-		$param='&propalid='.$propal->id;
+		$param='&id='.$propal->id;
 		$formfile->list_of_documents($filearray,$propal,'propal',$param);
 
 	}
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index f9f7df6a29c..f6e4cfbee66 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -33,11 +33,11 @@ require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
 $langs->load('propal');
 $langs->load('compta');
 
-$propalid = isset($_GET["propalid"])?$_GET["propalid"]:'';
+$id = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'propale', $propalid, 'propal');
+$result = restrictedArea($user, 'propale', $id, 'propal');
 
 
 /*
@@ -47,7 +47,7 @@ $result = restrictedArea($user, 'propale', $propalid, 'propal');
 llxHeader();
 
 $propal = new Propal($db);
-$propal->fetch($_GET['propalid']);
+$propal->fetch($_GET["id"]);
 
 $societe = new Societe($db);
 $societe->fetch($propal->socid);
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index db2d20d2836..05399564068 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -34,11 +34,11 @@ $langs->load('propal');
 $langs->load('compta');
 $langs->load('bills');
 
-$propalid = isset($_GET["propalid"])?$_GET["propalid"]:'';
+$id = isset($_GET["id"])?$_GET["id"]:'';
 
 // Security check
 if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'propale', $propalid, 'propal');
+$result = restrictedArea($user, 'propale', $id, 'propal');
 
 
 
@@ -49,7 +49,7 @@ $result = restrictedArea($user, 'propale', $propalid, 'propal');
 if ($_POST["action"] == 'update_public' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 
 	$db->begin();
 
@@ -68,7 +68,7 @@ if ($_POST["action"] == 'update_public' && $user->rights->propale->creer)
 if ($_POST['action'] == 'update' && $user->rights->propale->creer)
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 
 	$db->begin();
 
@@ -94,8 +94,8 @@ llxHeader();
 
 $html = new Form($db);
 
-$id = $_GET['propalid'];
-$ref= $_GET['ref'];
+$id = $_GET["id"];
+$ref= $_GET["ref"];
 if ($id > 0 || ! empty($ref))
 {
 	if ($mesg) print $mesg;
@@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td valign="top" colspan="3">';
 			if ($_GET["action"] == 'edit')
 			{
-				print '<form method="post" action="note.php?propalid='.$propal->id.'">';
+				print '<form method="post" action="note.php?id='.$propal->id.'">';
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 				print '<input type="hidden" name="action" value="update_public">';
 				print '<textarea name="note_public" cols="80" rows="8">'.$propal->note_public."</textarea><br>";
@@ -194,7 +194,7 @@ if ($id > 0 || ! empty($ref))
 				print '<td valign="top" colspan="3">';
 				if ($_GET["action"] == 'edit')
 				{
-					print '<form method="post" action="note.php?propalid='.$propal->id.'">';
+					print '<form method="post" action="note.php?id='.$propal->id.'">';
 					print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 					print '<input type="hidden" name="action" value="update">';
 					print '<textarea name="note" cols="80" rows="8">'.$propal->note."</textarea><br>";
@@ -219,7 +219,7 @@ if ($id > 0 || ! empty($ref))
 			print '<div class="tabsAction">';
 			if ($user->rights->propale->creer && $_GET['action'] <> 'edit')
 			{
-				print '<a class="butAction" href="note.php?propalid='.$propal->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="note.php?id='.$propal->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
 			}
 			print '</div>';
 		}
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index f4bfb77d5a8..b89a3f17278 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
 	$var=!$var;
 ?>
 <tr <?php echo $bc[$var]; ?> ><td>
-	<a href="<?php echo DOL_URL_ROOT.'/compta/propal.php?propalid='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?></a></td>
+	<a href="<?php echo DOL_URL_ROOT.'/compta/propal.php?id='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?></a></td>
 	<td><?php echo $linkedObjectBlock->ref_client; ?></td>
 	<td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td>
 	<td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td>
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index 890d4872776..1ff352ca30c 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -223,7 +223,7 @@ if ($socid > 0)
 				$objp = $db->fetch_object($resql);
 				$var=!$var;
 				print "<tr $bc[$var]>";
-				print "<td><a href=\"../propal.php?propalid=$objp->propalid\">";
+				print "<td><a href=\"../propal.php?id=$objp->propalid\">";
 				print img_object($langs->trans("ShowPropal"),"propal");
 				print " ".$objp->ref."</a>\n";
 				if ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1)
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 13075ff2168..e18cd0fc37f 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -140,7 +140,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
                 $obj = $db->fetch_object($resql);
                 $var=!$var;
                 print '<tr '.$bc[$var].'><td>';
-                print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
+                print '<a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a>';
                 print '</td><td align="right">';
                 print price($obj->price);
                 print "</td></tr>";
@@ -202,7 +202,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
             {
                 $obj = $db->fetch_object($resql);
                 $var=!$var;
-                print "<tr $bc[$var]><td><a href=\"../propal.php?propalid=".$obj->propalid."\">";
+                print "<tr $bc[$var]><td><a href=\"../propal.php?id=".$obj->propalid."\">";
                 print img_object($langs->trans("ShowPropal"),"propal").' '.$obj->ref.'</a></td>';
 
                 print "<td><a href=\"fiche.php?id=".$obj->socid."\">".img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom."</a></td>\n";
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index dcd48b7f5c8..9053d1afd45 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -108,7 +108,7 @@ if ($_GET["id"] > 0) {
 		            // Propale
 		            $propal = new Propal($db);
 		            $propal->fetch($commande->propale_id);
-		            print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
+		            print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id.'">'.$propal->ref.'</a>';
 		        }
 		        print "</td></tr>";
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 8634fffb47f..d89fd1ee38b 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1022,7 +1022,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
 
 			$nbrow=10;
 
-			print '<form name="crea_commande" action="fiche.php" method="post">';
+			print '<form name="crea_commande" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 			print '<input type="hidden" name="action" value="add">';
 			print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n";
@@ -1495,7 +1495,7 @@ else
 				// Si source = propal
 				$propal = new Propal($db);
 				$propal->fetch($commande->propale_id);
-				print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
+				print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id.'">'.$propal->ref.'</a>';
 			}
 			print '</td>';
 			print '</tr>';
diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php
index 4b62f84d49d..6f7a59cee5c 100644
--- a/htdocs/compta/commande/fiche.php
+++ b/htdocs/compta/commande/fiche.php
@@ -235,7 +235,7 @@ if ($id > 0 || ! empty($ref))
 			// Si source = propal
 			$propal = new Propal($db);
 			$propal->fetch($commande->propale_id);
-			print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
+			print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id.'">'.$propal->ref.'</a>';
 		}
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index 0a0f7420264..4abb965f874 100644
--- a/htdocs/compta/propal.php
+++ b/htdocs/compta/propal.php
@@ -58,9 +58,9 @@ if (! empty($_GET["socid"]))
 	$module='societe';
 	$dbtable='';
 }
-else if (! empty($_GET["propalid"]))
+else if (! empty($_GET["id"]))
 {
-	$objectid=$_GET["propalid"];
+	$objectid=$_GET["id"];
 	$module='propale';
 	$dbtable='propal';
 }
@@ -79,40 +79,16 @@ if ($_GET["action"] == 'setstatut')
 {
 	// Close proposal
 	$propal = new Propal($db);
-	$propal->id = $_GET["propalid"];
+	$propal->id = $_GET["id"];
 	$propal->cloture($user, $_GET["statut"], $note);
 
 }
 
-if ( $action == 'delete' )
-{
-	$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal WHERE rowid = $propalid;";
-	if ( $db->query($sql) )
-	{
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE fk_propal = $propalid ;";
-		if ( $db->query($sql) )
-		{
-			print '<div class="ok">'.$langs->trans("Deleted").'</div>';
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
-	$propalid = 0;
-	$brouillon = 1;
-}
-
 // Set project
 if ($_POST['action'] == 'classin')
 {
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid']);
+	$propal->fetch($_GET["id"]);
 	$propal->setProject($_POST['projectid']);
 }
 
@@ -133,8 +109,8 @@ $propalstatic=new Propal($db);
 
 $now=gmmktime();
 
-$id = $_GET['propalid'];
-$ref= $_GET['ref'];
+$id = $_GET["id"];
+$ref= $_GET["ref"];
 if ($id > 0 || ! empty($ref))
 {
 	if ($mesg) print "$mesg<br>";
@@ -142,7 +118,7 @@ if ($id > 0 || ! empty($ref))
 	$product_static=new Product($db);
 
 	$propal = new Propal($db);
-	$propal->fetch($_GET['propalid'],$_GET["ref"]);
+	$propal->fetch($_GET["id"],$_GET["ref"]);
 
 	$societe = new Societe($db);
 	$societe->fetch($propal->socid);
@@ -168,7 +144,7 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
 	print $langs->trans('RefCustomer').'</td><td align="left">';
 	print '</td>';
-	if ($_GET['action'] != 'refclient' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
+	if ($_GET['action'] != 'refclient' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;id='.$propal->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="5">';
 	print $propal->ref_client;
@@ -229,16 +205,16 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($_GET['action'] != 'editconditions' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	if ($_GET['action'] != 'editconditions' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($_GET['action'] == 'editconditions')
 	{
-		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->cond_reglement_id,'cond_reglement_id');
+		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->cond_reglement_id,'cond_reglement_id');
 	}
 	else
 	{
-		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->cond_reglement_id,'none');
+		$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->cond_reglement_id,'none');
 	}
 	print '</td>';
 
@@ -248,16 +224,16 @@ if ($id > 0 || ! empty($ref))
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($_GET['action'] != 'editmode' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
+	if ($_GET['action'] != 'editmode' && $propal->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetMode'),1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($_GET['action'] == 'editmode')
 	{
-		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->mode_reglement_id,'mode_reglement_id');
+		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->mode_reglement_id,'mode_reglement_id');
 	}
 	else
 	{
-		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->mode_reglement_id,'none');
+		$html->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$propal->id,$propal->mode_reglement_id,'none');
 	}
 	print '</td></tr>';
 
@@ -270,16 +246,16 @@ if ($id > 0 || ! empty($ref))
 		print $langs->trans('Project').'</td>';
 		if (1 == 2 && $user->rights->propale->creer)
 		{
-			if ($_GET['action'] != 'classer') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classer&amp;propalid='.$propal->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
+			if ($_GET['action'] != 'classer') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classer&amp;id='.$propal->id.'">'.img_edit($langs->trans('SetProject')).'</a></td>';
 			print '</tr></table>';
 			print '</td><td colspan="3">';
 			if ($_GET['action'] == 'classer')
 			{
-				$html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->fk_project, 'projectid');
+				$html->form_project($_SERVER['PHP_SELF'].'?id='.$propal->id, $propal->socid, $propal->fk_project, 'projectid');
 			}
 			else
 			{
-				$html->form_project($_SERVER['PHP_SELF'].'?propalid='.$propal->id, $propal->socid, $propal->fk_project, 'none');
+				$html->form_project($_SERVER['PHP_SELF'].'?id='.$propal->id, $propal->socid, $propal->fk_project, 'none');
 			}
 			print '</td></tr>';
 		}
@@ -506,7 +482,7 @@ if ($id > 0 || ! empty($ref))
 		$arraypropal=$propal->getInvoiceArrayList();
 		if ($propal->statut == 2 && is_array($arraypropal) && sizeof($arraypropal) > 0)
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=setstatut&statut=4&socid='.$propal->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$propal->id.'&action=setstatut&statut=4&socid='.$propal->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 		}
 	}
 	print "</div>";
@@ -521,7 +497,7 @@ if ($id > 0 || ! empty($ref))
 	 */
 	$filename=dol_sanitizeFileName($propal->ref);
 	$filedir=$conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
-	$urlsource=$_SERVER["PHP_SELF"]."?propalid=".$propal->id;
+	$urlsource=$_SERVER["PHP_SELF"]."?id=".$propal->id;
 	$genallowed=0;
 	$delallowed=0;
 
@@ -683,7 +659,7 @@ else
 
 			$filename=dol_sanitizeFileName($objp->ref);
 			$filedir=$conf->propale->dir_output . '/' . dol_sanitizeFileName($objp->ref);
-			$urlsource=$_SERVER['PHP_SELF'].'?propalid='.$objp->propalid;
+			$urlsource=$_SERVER['PHP_SELF'].'?id='.$objp->propalid;
 			$formfile->show_documents('propal',$filename,$filedir,$urlsource,'','','',1,'',1);
 
 			print '</td></tr></table>';
diff --git a/htdocs/compta/stats/comp.php b/htdocs/compta/stats/comp.php
index bbff5fff20c..2ba12be65c3 100644
--- a/htdocs/compta/stats/comp.php
+++ b/htdocs/compta/stats/comp.php
@@ -89,7 +89,7 @@ function propals ($db, $year, $month)
 
 		print "<td><a href=\"comp.php?socid=".$objp->socid."\">".$objp->nom."</a></td>\n";
 
-		print "<td><a href=\"".DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->propalid."\">".$objp->ref."</a></td>\n";
+		print "<td><a href=\"".DOL_URL_ROOT."/comm/propal.php?id=".$objp->propalid."\">".$objp->ref."</a></td>\n";
 
 		print "<td align=\"right\">".dol_print_date($db->jdate($objp->dp))."</td>\n";
 
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 892a749b730..166559903fd 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -363,7 +363,7 @@ if ($_GET["action"] == 'create')
 			}
 			if ($origin == 'propal' && $conf->propal->enabled)
 			{
-				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/fiche.php?propalid='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
+				print $langs->trans("RefProposal").'</td><td colspan="3"><a href="'.DOL_URL_ROOT.'/comm/fiche.php?id='.$object->id.'">'.img_object($langs->trans("ShowProposal"),'propal').' '.$object->ref;
 			}
 			print '</a></td>';
 			print "</tr>\n";
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index c00f49a420c..fbb3ec51600 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -242,7 +242,7 @@ if ($id > 0 || ! empty($ref))
 			// Si source = propal
 			$propal = new Propal($db);
 			$propal->fetch($commande->propale_id);
-			print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
+			print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id.'">'.$propal->ref.'</a>';
 		}
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index 03b34b4645c..c26532e661f 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -103,12 +103,12 @@ class box_propales extends ModeleBoxes {
 
         		$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
         		'logo' => $this->boximg,
-        		'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
+        		'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
 
         		$this->info_box_contents[$i][1] = array('td' => 'align="left"',
         		'text' => $objp->ref,
         		'text2'=> $late,
-        		'url' => DOL_URL_ROOT."/comm/propal.php?propalid=".$objp->rowid);
+        		'url' => DOL_URL_ROOT."/comm/propal.php?id=".$objp->rowid);
 
 				$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
                 'logo' => 'company',
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index 8dcc901faa1..e780ba4c9e0 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -212,7 +212,7 @@ function propale_pdf_create($db, $id, $modele, $outputlangs)
 
 /**
  \brief      Supprime l'image de previsualitation, pour le cas de regeneration de propal
- \param	    db  		objet base de donn�e
+ \param	    db  		objet base de donnee
  \param	    propalid	id de la propal a effacer
  \param     propalref reference de la propal si besoin
  */
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index b6e43b06d20..d5c68861971 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -590,7 +590,7 @@ function show_actions_todo($conf,$langs,$db,$objsoc,$objcon='')
 
 					if ($obj->propalrowid)
 					{
-						print '<td width="140"><a href="propal.php?propalid='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
+						print '<td width="140"><a href="propal.php?id='.$obj->propalrowid.'">'.img_object($langs->trans("ShowAction"),"task");
 						$transcode=$langs->trans("Action".$obj->acode);
 						$libelle=($transcode!="Action".$obj->acode?$transcode:$obj->libelle);
 						print $libelle;
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index b25ad7e4e5b..be5abfd50e9 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -35,7 +35,7 @@ function propal_prepare_head($propal)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?id='.$propal->id;
 	$head[$h][1] = $langs->trans('CommercialCard');
 	$head[$h][2] = 'comm';
 	$h++;
@@ -45,7 +45,7 @@ function propal_prepare_head($propal)
 	|| ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->lire))))
 	{
 		$langs->load("sendings");
-		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?propalid='.$propal->id;
+		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$propal->id;
 		if ($conf->expedition_bon->enabled) $text=$langs->trans("Sendings");
 		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
 		$head[$h][1] = $text;
@@ -53,30 +53,30 @@ function propal_prepare_head($propal)
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/propal.php?id='.$propal->id;
 	$head[$h][1] = $langs->trans('AccountancyCard');
 	$head[$h][2] = 'compta';
 	$h++;
 
 	if ($conf->use_preview_tabs)
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?propalid='.$propal->id;
+		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/apercu.php?id='.$propal->id;
 		$head[$h][1] = $langs->trans("Preview");
 		$head[$h][2] = 'preview';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$propal->id;
 	$head[$h][1] = $langs->trans('ProposalContact');
 	$head[$h][2] = 'contact';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$propal->id;
 	$head[$h][1] = $langs->trans('Notes');
 	$head[$h][2] = 'note';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$propal->id;
 	/*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
 	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
@@ -85,7 +85,7 @@ function propal_prepare_head($propal)
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?propalid='.$propal->id;
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?id='.$propal->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index f49b4e57aef..bfb2d5ced3b 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -436,7 +436,7 @@ if ($_POST["action"] == 'addinpropal')
 	);
 	if ($result > 0)
 	{
-		Header("Location: ".DOL_URL_ROOT."/comm/propal.php?propalid=".$propal->id);
+		Header("Location: ".DOL_URL_ROOT."/comm/propal.php?id=".$propal->id);
 		return;
 	}
 
@@ -1311,7 +1311,7 @@ if ($product->id && $_GET["action"] == '' && $product->status)
 					print '<input type="hidden" name="action" value="addinpropal">';
 					print "<tr $bc[$var]>";
 					print "<td nowrap>";
-					print "<a href=\"../comm/propal.php?propalid=".$objp->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a></td>\n";
+					print "<a href=\"../comm/propal.php?id=".$objp->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a></td>\n";
 					print "<td><a href=\"../comm/fiche.php?socid=".$objp->socid."\">".dol_trunc($objp->nom,18)."</a></td>\n";
 					print "<td nowrap=\"nowrap\">".dol_print_date($objp->dp,"%d %b")."</td>\n";
 					print '<td><input type="hidden" name="propalid" value="'.$objp->propalid.'">';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 1e72fdb05e2..26e3ed8db97 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -151,7 +151,7 @@ if ($_GET["id"] || $_GET["ref"])
 					$var=!$var;
 
 					print "<tr $bc[$var]>";
-					print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' ';
+					print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' ';
 					print $objp->ref;
 					print "</a></td>\n";
 					print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';