From 38551dd4686712323f925011151ed2223c06e05e Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Mon, 2 Feb 2015 16:17:07 +0100
Subject: [PATCH] [CORE] retrait de liens ou champs inutile (#new_ask_price).

---
 htdocs/comm/askpricesupplier/document.php |  4 +++-
 htdocs/comm/askpricesupplier/note.php     | 12 ++++++++---
 htdocs/core/lib/askpricesupplier.lib.php  | 26 -----------------------
 htdocs/langs/fr_FR/askpricesupplier.lang  |  4 ++--
 4 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/htdocs/comm/askpricesupplier/document.php b/htdocs/comm/askpricesupplier/document.php
index 0644f932629..6c76496e329 100644
--- a/htdocs/comm/askpricesupplier/document.php
+++ b/htdocs/comm/askpricesupplier/document.php
@@ -109,6 +109,7 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Ref client
+	/* PHFAVRE retrait en temporaire
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 	print $langs->trans('RefCustomer').'</td><td align="left">';
@@ -118,7 +119,8 @@ if ($object->id > 0)
 	print $object->ref_client;
 	print '</td>';
 	print '</tr>';
-
+	*/
+	
 	// Customer
 	print "<tr><td>".$langs->trans("Company")."</td>";
 	print '<td colspan="3">'.$object->thirdparty->getNomUrl(1).'</td></tr>';
diff --git a/htdocs/comm/askpricesupplier/note.php b/htdocs/comm/askpricesupplier/note.php
index e681121db05..d0034a99338 100644
--- a/htdocs/comm/askpricesupplier/note.php
+++ b/htdocs/comm/askpricesupplier/note.php
@@ -87,6 +87,7 @@ if ($id > 0 || ! empty($ref))
 			print '</td></tr>';
 
 			// Ref client
+			/* PHFAVRE retrait en temporaire
 			print '<tr><td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 			print $langs->trans('RefCustomer').'</td><td align="left">';
@@ -96,7 +97,8 @@ if ($id > 0 || ! empty($ref))
 			print $object->ref_client;
 			print '</td>';
 			print '</tr>';
-
+			*/
+			
 			// Customer
 			if ( is_null($object->client) )
 				$object->fetch_thirdparty();
@@ -104,6 +106,7 @@ if ($id > 0 || ! empty($ref))
 			print '<td colspan="3">'.$object->client->getNomUrl(1).'</td></tr>';
 
 			// Ligne info remises tiers
+			/* PHFAVRE retrait en temporaire
 			print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
 			if ($societe->remise_percent) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_percent);
 			else print $langs->trans("CompanyHasNoRelativeDiscount");
@@ -113,7 +116,8 @@ if ($id > 0 || ! empty($ref))
 			else print $langs->trans("CompanyHasNoAbsoluteDiscount");
 			print '.';
 			print '</td></tr>';
-
+			*/
+			
 			// Date
 			print '<tr><td>'.$langs->trans('Date').'</td><td colspan="3">';
 			print dol_print_date($object->date,'daytext');
@@ -121,6 +125,7 @@ if ($id > 0 || ! empty($ref))
 			print '</tr>';
 
 			// Date fin propal
+			/* PHFAVRE retrait en temporaire
 			print '<tr>';
 			print '<td>'.$langs->trans('DateEndAsk').'</td><td colspan="3">';
 			if ($object->fin_validite)
@@ -134,7 +139,8 @@ if ($id > 0 || ! empty($ref))
 			}
 			print '</td>';
 			print '</tr>';
-
+			*/
+			
 			print "</table>";
 
 			print '<br>';
diff --git a/htdocs/core/lib/askpricesupplier.lib.php b/htdocs/core/lib/askpricesupplier.lib.php
index 0cdf15a09a0..54ecea18345 100644
--- a/htdocs/core/lib/askpricesupplier.lib.php
+++ b/htdocs/core/lib/askpricesupplier.lib.php
@@ -43,32 +43,6 @@ function askpricesupplier_prepare_head($object)
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if ((empty($conf->commande->enabled) &&	((! empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-	|| (! empty($conf->livraison_bon->enabled) && $user->rights->expedition->livraison->lire))))
-	{
-		$langs->load("sendings");
-		$head[$h][0] = DOL_URL_ROOT.'/expedition/askpricesupplier.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text=$langs->trans("Shipment");
-		if ($conf->livraison_bon->enabled)  $text.='/'.$langs->trans("Receivings");
-		$head[$h][1] = $text;
-		$head[$h][2] = 'shipping';
-		$h++;
-	}
-	if (! empty($conf->global->MAIN_USE_PREVIEW_TABS))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/apercu.php?id='.$object->id;
-		$head[$h][1] = $langs->trans("Preview");
-		$head[$h][2] = 'preview';
-		$h++;
-	}
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-		$head[$h][0] = DOL_URL_ROOT.'/comm/askpricesupplier/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		$head[$h][2] = 'contact';
-		$h++;
-	}
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
diff --git a/htdocs/langs/fr_FR/askpricesupplier.lang b/htdocs/langs/fr_FR/askpricesupplier.lang
index 96b4c784cfc..8640ec23358 100644
--- a/htdocs/langs/fr_FR/askpricesupplier.lang
+++ b/htdocs/langs/fr_FR/askpricesupplier.lang
@@ -66,8 +66,8 @@ AskpricesupplierStatusDraftShort=Brouillon
 AskpricesupplierStatusValidatedShort=Validée
 AskpricesupplierStatusOpenedShort=Ouverte
 AskpricesupplierStatusClosedShort=Fermée
-AskpricesupplierStatusSignedShort=Signée
-AskpricesupplierStatusNotSignedShort=Non signée
+AskpricesupplierStatusSignedShort=Acceptée
+AskpricesupplierStatusNotSignedShort=Refusée
 AskpricesupplierStatusBilledShort=Facturée
 AskpricesupplierToClose=Demandes de prix à fermer
 AskpricesupplierToBill=Demandes de prix signées à facturer