lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qual: Removed deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-30 18:21:58 +00:00
parent b6283b64e5
commit 37a2f537c2
11 changed files with 66 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -560,19 +560,16 @@ class pdf_edison extends ModelePDFCommandes
// If CUSTOMER contact defined on invoice, we use it // If CUSTOMER contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','CUSTOMER');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','CUSTOMER'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// Nom societe // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Customer name // Customer name
@ -585,22 +582,10 @@ class pdf_edison extends ModelePDFCommandes
} }
else else
{ {
// Customer name // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact suivi commande si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

35
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -820,47 +820,32 @@ class pdf_einstein extends ModelePDFCommandes
// If CUSTOMER contact defined on invoice, we use it // If CUSTOMER contact defined on invoice, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->COMMANDE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','CUSTOMER');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','CUSTOMER'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// Nom societe // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Customer name // Customer name
$carac_client = "\n".$outputlangs->convToOutputCharset($object->contact->getFullName($outputlangs,1,1)); $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->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->contact->cp) . " " . $outputlangs->convToOutputCharset($object->contact->ville)."\n"; $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"; 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 else
{ {
// Customer name // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact suivi commande si c'est une soci<63>t<EFBFBD> // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

16
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -531,22 +531,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

16
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -1112,22 +1112,10 @@ class pdf_crabe extends ModelePDFFactures
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

16
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -899,22 +899,10 @@ class pdf_oursin extends ModelePDFFactures
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; if ($object->client->pays_code && $object->client->pays_code != $this->emetteur->pays_code) $carac_client.=$outputlangs->trans("Country".$object->client->pays_code)."\n";

16
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -406,22 +406,10 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

16
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -633,22 +633,10 @@ class pdf_typhon extends ModelePDFDeliveryOrder
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

16
htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
View File

@ -435,22 +435,10 @@ class pdf_baleine extends ModelePDFProjects
$object->fetch_client(); $object->fetch_client();
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact facturation si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

32
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -890,15 +890,13 @@ class pdf_propale_azur extends ModelePDFPropales
// If CUSTOMER contact defined, we use it // If CUSTOMER contact defined, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','CUSTOMER');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','CUSTOMER'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// On peut utiliser le nom de la societe du contact // On peut utiliser le nom de la societe du contact
@ -916,22 +914,10 @@ class pdf_propale_azur extends ModelePDFPropales
} }
else else
{ {
// Nom client // Recipient name
$carac_client_name=$outputlangs->convToOutputCharset($object->client->nom); $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
// Nom du contact suivi propal si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

32
htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
View File

@ -585,15 +585,13 @@ class pdf_propale_jaune extends ModelePDFPropales
// If CUSTOMER contact defined, we use it // If CUSTOMER contact defined, we use it
$usecontact=false; $usecontact=false;
//if ($conf->global->PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT) $arrayidcontact=$object->getIdContact('external','CUSTOMER');
//{ if (sizeof($arrayidcontact) > 0)
$arrayidcontact=$object->getIdContact('external','CUSTOMER'); {
if (sizeof($arrayidcontact) > 0) $usecontact=true;
{ $result=$object->fetch_contact($arrayidcontact[0]);
$usecontact=true; }
$result=$object->fetch_contact($arrayidcontact[0]);
}
//}
if ($usecontact) if ($usecontact)
{ {
// Nom societe // Nom societe
@ -611,24 +609,12 @@ class pdf_propale_jaune extends ModelePDFPropales
} }
else else
{ {
// Nom client // Recipient name
$pdf->SetXY(102,$posy+3); $pdf->SetXY(102,$posy+3);
$pdf->SetFont('Arial','B',11); $pdf->SetFont('Arial','B',11);
$pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L'); $pdf->MultiCell(96,4, $outputlangs->convToOutputCharset($object->client->nom), 0, 'L');
// Nom du contact suivi propal si c'est une societe // Recipient properties
$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
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address); $carac_client.="\n".$outputlangs->convToOutputCharset($object->client->address);
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->cp) . " " . $outputlangs->convToOutputCharset($object->client->ville)."\n"; $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"; 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";

30
htdocs/lib/pdf.lib.php
View File

@ -37,20 +37,24 @@
*/ */
function pdf_build_address($outputlangs,$sourcecompany,$targetcompany,$targetcontact) function pdf_build_address($outputlangs,$sourcecompany,$targetcompany,$targetcontact)
{ {
$carac_emetteur = ''; $stringaddress = '';
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->address); if (is_object($sourcecompany))
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->cp).' '.$outputlangs->convToOutputCharset($sourcecompany->ville); {
$carac_emetteur .= "\n"; $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->address);
// Tel $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->convToOutputCharset($sourcecompany->cp).' '.$outputlangs->convToOutputCharset($sourcecompany->ville);
if ($sourcecompany->tel) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ".$outputlangs->convToOutputCharset($sourcecompany->tel); $stringaddress .= "\n";
// Fax // Tel
if ($sourcecompany->fax) $carac_emetteur .= ($carac_emetteur ? ($sourcecompany->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax); if ($sourcecompany->tel) $stringaddress .= ($stringaddress ? "\n" : '' ).$outputlangs->transnoentities("Phone").": ".$outputlangs->convToOutputCharset($sourcecompany->tel);
// EMail // Fax
if ($sourcecompany->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email); if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
// Web // EMail
if ($sourcecompany->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url); 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;
} }