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

New: Added india to show state in address.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-08 00:06:22 +00:00
parent 7e3791d847
commit c1e50c273a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/data/llx_10_c_regions.sql
View File

@ -129,6 +129,9 @@ INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, act
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8602, 8602, 86, NULL, NULL, 'Oriental', 1); INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8602, 8602, 86, NULL, NULL, 'Oriental', 1);
INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8603, 8603, 86, NULL, NULL, 'Occidental', 1); INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8603, 8603, 86, NULL, NULL, 'Occidental', 1);
-- Regions India (id pays=117)
insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (11701, 17, 11701, '', 0, 'India', 1);
-- Regions Mauritius (id pays=152) -- Regions Mauritius (id pays=152)
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1); INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15201, 152, 15201, '', 0, 'Rivière Noire', 1);
INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1); INSERT INTO llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) VALUES (15202, 152, 15202, '', 0, 'Flacq', 1);

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

@ -68,7 +68,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
// Recipient properties // Recipient properties
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address);
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->cp) . " " . $outputlangs->convToOutputCharset($targetcontact->ville);
if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US'))) if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US','IN')))
{ {
$stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement); $stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement);
} }
@ -80,7 +80,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
// Recipient properties // Recipient properties
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address);
$stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville); $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->cp) . " " . $outputlangs->convToOutputCharset($targetcompany->ville);
if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US'))) if ($targetcompany->departement && in_array($targetcompany->pays_code,array('US','IN')))
{ {
$stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement); $stringaddress.=" - ".$outputlangs->convToOutputCharset($targetcompany->departement);
} }