Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: uniformize code

Browse Source 
Fix: if the contact's address is empty, it uses one of the company
This commit is contained in:
Regis Houssin
2009-12-23 10:07:48 +00:00
parent 2df0d15ef7
commit 3b5735bd9c
41 changed files with 177 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -800,7 +800,7 @@ class pdf_einstein extends ModelePDFCommandes
// Sender properties
$carac_emetteur = '';
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->adresse);
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->address);
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->cp).' '.$outputlangs->convToOutputCharset($this->emetteur->ville);
$carac_emetteur .= "\n";
// Tel
@@ -870,7 +870,7 @@ class pdf_einstein extends ModelePDFCommandes
}
// Caracteristiques client
$carac_client.="\n".$outputlangs->convToOutputCharset($object->client->adresse);
$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";
}