From 2df0d15ef7af516afd76891980f55b530a777b06 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Wed, 23 Dec 2009 08:43:16 +0000
Subject: [PATCH] Fix: obsolete

---
 htdocs/admin/facture.php                      | 22 +------------------
 .../pdf/pdf_expedition_merou.modules.php      |  3 ---
 .../modules/facture/pdf_crabe.modules.php     | 16 ++++++--------
 .../modules/facture/pdf_oursin.modules.php    | 16 ++++++--------
 .../livraison/pdf/pdf_sirocco.modules.php     | 19 ++++++----------
 .../livraison/pdf/pdf_typhon.modules.php      | 19 ++++++----------
 6 files changed, 29 insertions(+), 66 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 6cf25c108c5..7532638bd16 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -177,11 +177,6 @@ if ($_POST["action"] == 'set_enable_editdelete')
 	dolibarr_set_const($db, "FACTURE_ENABLE_EDITDELETE",$_POST["enable_editdelete"],'chaine',0,'',$conf->entity);
 }
 
-if ($_POST["action"] == 'set_use_bill_contact_as_recipient')
-{
-	dolibarr_set_const($db, "FACTURE_USE_BILL_CONTACT_AS_RECIPIENT",$_POST["use_bill_contact_as_recipient"],'chaine',0,'',$conf->entity);
-}
-
 if ($_POST["action"] == 'update' || $_POST["action"] == 'add')
 {
 	if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'',$conf->entity));
@@ -257,7 +252,7 @@ foreach ($conf->file->dol_document_root as $dirroot)
 
 					if (is_readable($dir.$filebis))
 					{
-						// Chargement de la classe de num�rotation
+						// Chargement de la classe de numerotation
 						require_once($dir.$filebis);
 						$classname = "mod_facture_".$file;
 						$module = new $classname($db);
@@ -613,21 +608,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';
 
-/*
- $var=! $var;
- print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
- print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
- print '<input type="hidden" name="action" value="set_use_bill_contact_as_recipient">';
- print '<tr '.$bc[$var].'><td>';
- print $langs->trans("UsBillingContactAsIncoiveRecipientIfExist");
- print '</td><td width="60" align="center">';
- print $html->selectyesno("use_bill_contact_as_recipient",$conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT,1);
- print '</td><td align="right">';
- print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
- print "</td></tr>\n";
- print '</form>';
- */
-
 $var=! $var;
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 5239470ffba..90d1a52e7ab 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -514,9 +514,6 @@ Class pdf_expedition_merou extends ModelePdfExpedition
 
 		if ($usecontact)
 		{
-			// On peut utiliser le nom de la societe du contact
-			//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
-			//else
 			$socname = $object->client->nom;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
 
diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php
index 2108f3ad3b8..1f7e40790f7 100644
--- a/htdocs/includes/modules/facture/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php
@@ -1097,15 +1097,13 @@ class pdf_crabe extends ModelePDFFactures
 
 			// If BILLING contact defined on invoice, we use it
 			$usecontact=false;
-			//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT)
-			//{
-				$arrayidcontact=$object->getIdContact('external','BILLING');
-				if (sizeof($arrayidcontact) > 0)
-				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
-				}
-			//}
+			$arrayidcontact=$object->getIdContact('external','BILLING');
+			if (sizeof($arrayidcontact) > 0)
+			{
+				$usecontact=true;
+				$result=$object->fetch_contact($arrayidcontact[0]);
+			}
+
 			if ($usecontact)
 			{
 				// On peut utiliser le nom de la societe du contact
diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php
index 939a8a0156a..5749db56ed1 100644
--- a/htdocs/includes/modules/facture/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php
@@ -884,15 +884,13 @@ class pdf_oursin extends ModelePDFFactures
 
 		// If BILLING contact defined on invoice, we use it
 		$usecontact=false;
-		//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT)
-		//{
-			$arrayidcontact=$object->getIdContact('external','BILLING');
-			if (sizeof($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
-		//}
+		$arrayidcontact=$object->getIdContact('external','BILLING');
+		if (sizeof($arrayidcontact) > 0)
+		{
+			$usecontact=true;
+			$result=$object->fetch_contact($arrayidcontact[0]);
+		}
+
 		if ($usecontact)
 		{
 			// On peut utiliser le nom de la societe du contact facturation
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 65b67ff22ff..87f1fe0a726 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -404,20 +404,15 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
 
 		// If SHIPPING contact defined on invoice, we use it
 		$usecontact=false;
-		//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT)
-		//{
-			$arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
-			if (sizeof($arrayidcontact) > 0)
-			{
-				$usecontact=true;
-				$result=$object->fetch_contact($arrayidcontact[0]);
-			}
-		//}
+		$arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
+		if (sizeof($arrayidcontact) > 0)
+		{
+			$usecontact=true;
+			$result=$object->fetch_contact($arrayidcontact[0]);
+		}
+
 		if ($usecontact)
 		{
-			// On peut utiliser le nom de la societe du contact
-			//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
-			//else
 			$socname = $object->client->nom;
 			$carac_client_name=$outputlangs->convToOutputCharset($socname);
 
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index 3c3e4025f2b..4fef10dd3af 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -574,20 +574,15 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 			// If SHIPPING contact defined on invoice, we use it
 			$usecontact=false;
-			//if ($conf->global->FACTURE_USE_BILL_CONTACT_AS_RECIPIENT)
-			//{
-				$arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
-				if (sizeof($arrayidcontact) > 0)
-				{
-					$usecontact=true;
-					$result=$object->fetch_contact($arrayidcontact[0]);
-				}
-			//}
+			$arrayidcontact=$object->commande->getIdContact('external','SHIPPING');
+			if (sizeof($arrayidcontact) > 0)
+			{
+				$usecontact=true;
+				$result=$object->fetch_contact($arrayidcontact[0]);
+			}
+
 			if ($usecontact)
 			{
-				// On peut utiliser le nom de la societe du contact
-				//if ($conf->global->FACTURE_USE_COMPANY_NAME_OF_BILL_CONTACT) $socname = $object->contact->socname;
-				//else
 				$socname = $object->client->nom;
 				$carac_client_name=$outputlangs->convToOutputCharset($socname);