From c1e50c273ae89a48cbf8870255321b3e0ffd51f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Jun 2010 00:06:22 +0000 Subject: [PATCH] New: Added india to show state in address. --- htdocs/install/mysql/data/llx_10_c_regions.sql | 3 +++ htdocs/lib/pdf.lib.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index e17dc0ea401..077216a6cca 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -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 (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) 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); diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php index f5a6822f819..0a8b2e744ed 100644 --- a/htdocs/lib/pdf.lib.php +++ b/htdocs/lib/pdf.lib.php @@ -68,7 +68,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target // Recipient properties $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcontact->address); $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); } @@ -80,7 +80,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target // Recipient properties $stringaddress.="\n".$outputlangs->convToOutputCharset($targetcompany->address); $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); }