From 37a2f537c256011050c9c34a90c69d0c4aa8a18f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 30 Mar 2010 18:21:58 +0000 Subject: [PATCH] Qual: Removed deprecated code --- .../modules/commande/pdf_edison.modules.php | 33 +++++------------ .../modules/commande/pdf_einstein.modules.php | 35 ++++++------------- .../pdf/pdf_expedition_merou.modules.php | 16 ++------- .../modules/facture/pdf_crabe.modules.php | 16 ++------- .../modules/facture/pdf_oursin.modules.php | 16 ++------- .../livraison/pdf/pdf_sirocco.modules.php | 16 ++------- .../livraison/pdf/pdf_typhon.modules.php | 16 ++------- .../project/pdf/pdf_baleine.modules.php | 16 ++------- .../propale/pdf_propale_azur.modules.php | 32 +++++------------ .../propale/pdf_propale_jaune.modules.php | 32 +++++------------ htdocs/lib/pdf.lib.php | 30 +++++++++------- 11 files changed, 66 insertions(+), 192 deletions(-) diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index fa2050a0dd2..c6fe67e9026 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -560,19 +560,16 @@ class pdf_edison extends ModelePDFCommandes // If CUSTOMER contact defined on invoice, we use it $usecontact=false; - //if ($conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) - //{ - $arrayidcontact=$object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $usecontact=true; - $result=$object->fetch_contact($arrayidcontact[0]); - } - //} + $arrayidcontact=$object->getIdContact('external','CUSTOMER'); + if (sizeof($arrayidcontact) > 0) + { + $usecontact=true; + $result=$object->fetch_contact($arrayidcontact[0]); + } if ($usecontact) { - // Nom societe + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); // Customer name @@ -585,22 +582,10 @@ class pdf_edison extends ModelePDFCommandes } else { - // Customer name + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact suivi commande si c'est une societe - $arrayidcontact = $object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 52e41de9386..f07bb7f0806 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -820,47 +820,32 @@ class pdf_einstein extends ModelePDFCommandes // If CUSTOMER contact defined on invoice, we use it $usecontact=false; - //if ($conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) - //{ - $arrayidcontact=$object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $usecontact=true; - $result=$object->fetch_contact($arrayidcontact[0]); - } - //} + $arrayidcontact=$object->getIdContact('external','CUSTOMER'); + if (sizeof($arrayidcontact) > 0) + { + $usecontact=true; + $result=$object->fetch_contact($arrayidcontact[0]); + } if ($usecontact) { - // Nom societe + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); // Customer name $carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - // Customer properties + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; if ($object->contact->pays_code && $object->contact->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->contact->pays_code))."\n"; } else { - // Customer name + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact suivi commande si c'est une soci�t� - $arrayidcontact = $object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; 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 e698e1d979c..fdbebcbbeea 100644 --- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php +++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php @@ -531,22 +531,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','SHIPPING'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 11267b8aa56..ce363dcee90 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -1112,22 +1112,10 @@ class pdf_crabe extends ModelePDFFactures } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','BILLING'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Recipient + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index c800920eb4d..a48fc37470c 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -899,22 +899,10 @@ class pdf_oursin extends ModelePDFFactures } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','BILLING'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n"; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php index eac9577d248..be22382140b 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php @@ -406,22 +406,10 @@ class pdf_sirocco extends ModelePDFDeliveryOrder } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','SHIPPING'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php index 9efc6ac5a93..6be887146a0 100644 --- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php +++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php @@ -633,22 +633,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','SHIPPING'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php index 60b8520737f..60a5e4d5c14 100644 --- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php +++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php @@ -435,22 +435,10 @@ class pdf_baleine extends ModelePDFProjects $object->fetch_client(); - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact facturation si c'est une societe - $arrayidcontact = $object->getIdContact('external','PROJECTLEADER'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index 05d43f31768..843e2430658 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -890,15 +890,13 @@ class pdf_propale_azur extends ModelePDFPropales // If CUSTOMER contact defined, we use it $usecontact=false; - //if ($conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) - //{ - $arrayidcontact=$object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $usecontact=true; - $result=$object->fetch_contact($arrayidcontact[0]); - } - //} + $arrayidcontact=$object->getIdContact('external','CUSTOMER'); + if (sizeof($arrayidcontact) > 0) + { + $usecontact=true; + $result=$object->fetch_contact($arrayidcontact[0]); + } + if ($usecontact) { // On peut utiliser le nom de la societe du contact @@ -916,22 +914,10 @@ class pdf_propale_azur extends ModelePDFPropales } else { - // Nom client + // Recipient name $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); - // Nom du contact suivi propal si c'est une societe - $arrayidcontact = $object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php index b42ab83eee1..141cb2344b3 100644 --- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php @@ -585,15 +585,13 @@ class pdf_propale_jaune extends ModelePDFPropales // If CUSTOMER contact defined, we use it $usecontact=false; - //if ($conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) - //{ - $arrayidcontact=$object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $usecontact=true; - $result=$object->fetch_contact($arrayidcontact[0]); - } - //} + $arrayidcontact=$object->getIdContact('external','CUSTOMER'); + if (sizeof($arrayidcontact) > 0) + { + $usecontact=true; + $result=$object->fetch_contact($arrayidcontact[0]); + } + if ($usecontact) { // Nom societe @@ -611,24 +609,12 @@ class pdf_propale_jaune extends ModelePDFPropales } else { - // Nom client + // Recipient name $pdf->SetXY(102,$posy+3); $pdf->SetFont('Arial','B',11); $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L'); - // Nom du contact suivi propal si c'est une societe - $arrayidcontact = $object->getIdContact('external','CUSTOMER'); - if (sizeof($arrayidcontact) > 0) - { - $object->fetch_contact($arrayidcontact[0]); - // On verifie si c'est une societe ou un particulier - if( !preg_match('#'.$object->contact->getFullName($outputlangs,1).'#isU',$object->client->nom) ) - { - $carac_client .= "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); - } - } - - // Caracteristiques client + // Recipient properties $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->client->pays_code))."\n"; diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index 677d5820545..6d12adede69 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -37,20 +37,24 @@ */ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany,$targetcontact) { - $carac_emetteur = ''; - $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->address); - $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->cp).' '.$outputlangs->convToOutputCharset($sourcecompany->ville); - $carac_emetteur .= "\n"; - // Tel - if ($sourcecompany->tel) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ".$outputlangs->convToOutputCharset($sourcecompany->tel); - // Fax - if ($sourcecompany->fax) $carac_emetteur .= ($carac_emetteur ? ($sourcecompany->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax); - // EMail - if ($sourcecompany->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email); - // Web - if ($sourcecompany->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url); + $stringaddress = ''; + if (is_object($sourcecompany)) + { + $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->address); + $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->cp).' '.$outputlangs->convToOutputCharset($sourcecompany->ville); + $stringaddress .= "\n"; + // Tel + if ($sourcecompany->tel) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ".$outputlangs->convToOutputCharset($sourcecompany->tel); + // Fax + if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax); + // EMail + if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email); + // Web + if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url); + } - return $carac_emetteur; + + return $stringaddress; }