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

Fix: Currency translation and prof id in PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2008-07-31 14:16:17 +00:00
parent 0f69009664
commit baae1aa998
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/lib/company.lib.php
View File

@ -615,41 +615,56 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
{ {
global $conf; global $conf;
//$paramfreetext='FACTURE_FREE_TEXT'; $outputlangs->load("dict");
// Line of free text // Line of free text
$ligne=(! empty($conf->global->$paramfreetext))?$conf->global->$paramfreetext:""; $ligne=(! empty($conf->global->$paramfreetext))?$conf->global->$paramfreetext:"";
// First line of company infos // First line of company infos
// Juridical status
$ligne1=""; $ligne1="";
if ($fromcompany->forme_juridique_code) if ($fromcompany->forme_juridique_code)
{ {
$ligne1.=($ligne1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code); $ligne1.=($ligne1?" - ":"").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
} }
// Capital
if ($fromcompany->capital) if ($fromcompany->capital)
{ {
$ligne1.=($ligne1?" - ":"").$outputlangs->transnoentities("CapitalOf",$fromcompany->capital)." ".$outputlangs->transnoentities("Currency".$conf->monnaie); $ligne1.=($ligne1?" - ":"").$outputlangs->transnoentities("CapitalOf",$fromcompany->capital)." ".$outputlangs->transnoentities("Currency".$conf->monnaie);
} }
// Prof Id // Prof Id 1
if ($fromcompany->profid1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->profid2)) if ($fromcompany->profid1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->profid2))
{ {
$ligne1.=($ligne1?" - ":"").$outputlangs->transcountrynoentities("ProfId1",$fromcompany->pays_code).": ".$fromcompany->profid1; $field=$outputlangs->transcountrynoentities("ProfId1",$fromcompany->pays_code);
if (eregi('\((.*)\)',$field,$reg)) $field=$reg[1];
$ligne1.=($ligne1?" - ":"").$field.": ".$fromcompany->profid1;
} }
// Prof Id 2
if ($fromcompany->profid2) if ($fromcompany->profid2)
{ {
$ligne1.=($ligne1?" - ":"").$outputlangs->transcountrynoentities("ProfId2",$fromcompany->pays_code).": ".$fromcompany->profid2; $field=$outputlangs->transcountrynoentities("ProfId2",$fromcompany->pays_code);
if (eregi('\((.*)\)',$field,$reg)) $field=$reg[1];
$ligne1.=($ligne1?" - ":"").$field.": ".$fromcompany->profid2;
} }
// Second line of company infos // Second line of company infos
$ligne2=""; $ligne2="";
// Prof Id 3
if ($fromcompany->profid3) if ($fromcompany->profid3)
{ {
$ligne2.=($ligne2?" - ":"").$outputlangs->transcountrynoentities("ProfId3",$fromcompany->pays_code).": ".$fromcompany->profid3; $field=$outputlangs->transcountrynoentities("ProfId3",$fromcompany->pays_code);
if (eregi('\((.*)\)',$field,$reg)) $field=$reg[1];
$ligne2.=($ligne2?" - ":"").$field.": ".$fromcompany->profid3;
} }
// Prof Id 4
if ($fromcompany->profid4) if ($fromcompany->profid4)
{ {
$ligne2.=($ligne2?" - ":"").$outputlangs->transcountrynoentities("ProfId4",$fromcompany->pays_code).": ".$fromcompany->profid4; $field=$outputlangs->transcountrynoentities("ProfId4",$fromcompany->pays_code);
if (eregi('\((.*)\)',$field,$reg)) $field=$reg[1];
$ligne2.=($ligne2?" - ":"").$field.": ".$fromcompany->profid4;
} }
// IntraCommunautary VAT
if ($fromcompany->tva_intra != '') if ($fromcompany->tva_intra != '')
{ {
$ligne2.=($ligne2?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra; $ligne2.=($ligne2?" - ":"").$outputlangs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;