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

New: Add hidden option MAIN_PROFIDx_IN_ADDRESS

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-07 21:14:55 +00:00
parent 3aa18cfaa9
commit 7c08376335
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/langs/fr_FR/companies.lang
View File

@ -129,13 +129,13 @@ ProfId2PT=Id prof. 2 (Num sécurité social)
ProfId3PT=Id prof. 3 (Num enreg. commercial) ProfId3PT=Id prof. 3 (Num enreg. commercial)
ProfId4PT=Id prof. 4 (Conservatory) ProfId4PT=Id prof. 4 (Conservatory)
ProfId1TN=Id prof. 1 (RC) ProfId1TN=Id prof. 1 (RC)
ProfId2TN=Id prof. 2 (Matricule fiscale) ProfId2TN=Id prof. 2 (Matricule fiscal)
ProfId3TN=Id prof. 3 (Code en douane) ProfId3TN=Id prof. 3 (Code en douane)
ProfId4TN=Id prof. 4 (BAN) ProfId4TN=Id prof. 4 (BAN)
ProfId1ES= (CNAE) ProfId1ES=CNAE
ProfId2ES= (Num sécurité social) ProfId2ES=Num sécurité social
ProfId3ES= (IAE) ProfId3ES=IAE
ProfId4ES= (Num Collégiale) ProfId4ES=Num Collégiale
VATIntra=Numéro de TVA VATIntra=Numéro de TVA
VATIntraShort=Num TVA VATIntraShort=Num TVA
VATIntraVeryShort=N° TVA VATIntraVeryShort=N° TVA

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

@ -69,8 +69,6 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address);
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville)."\n"; $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville)."\n";
if ($targetcontact->pays_code && $targetcontact->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->pays_code))."\n"; if ($targetcontact->pays_code && $targetcontact->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->pays_code))."\n";
// Intra VAT
if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
} }
else else
{ {
@ -78,9 +76,13 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address);
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville)."\n"; $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville)."\n";
if ($targetcompany->pays_code && $targetcompany->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->pays_code))."\n"; if ($targetcompany->pays_code && $targetcompany->pays_code != $sourcecompany->pays_code) $stringaddress.=$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->pays_code))."\n";
// Intra VAT
if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
} }
// Intra VAT
if ($targetcompany->tva_intra) $stringaddress.="\n".$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
if ($conf->global->MAIN_PROFID1_IN_ADDRESS) $stringaddress.="\n".$outputlangs->transcountrynoentities("ProfId1",$targetcompany->pays_code).': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
if ($conf->global->MAIN_PROFID2_IN_ADDRESS) $stringaddress.="\n".$outputlangs->transcountrynoentities("ProfId2",$targetcompany->pays_code).': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
if ($conf->global->MAIN_PROFID3_IN_ADDRESS) $stringaddress.="\n".$outputlangs->transcountrynoentities("ProfId3",$targetcompany->pays_code).': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
if ($conf->global->MAIN_PROFID4_IN_ADDRESS) $stringaddress.="\n".$outputlangs->transcountrynoentities("ProfId4",$targetcompany->pays_code).': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
} }
return $stringaddress; return $stringaddress;