Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 07:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

New: Add ES formated address country rule

Browse Source
This commit is contained in:
simnandez
2013-02-19 16:02:58 +01:00
parent df0f281efd
commit 9e3497cff3
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/functions.lib.php
View File

@@ -673,7 +673,7 @@ function dol_get_fiche_end($notab=0)
function dol_format_address($object)
{
$ret='';
$countriesusingstate=array('US','IN','GB');
$countriesusingstate=array('US','IN','GB','ES');
// Address
$ret .= $object->address;
@@ -696,6 +696,16 @@ function dol_format_address($object)
}
if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
}
else if (in_array($object->country_code,array('ES'))) // title firstname name \n address lines \n zip town \n state \n country
{
$ret .= ($ret ? "\n" : '' ).$object->zip;
$ret .= ' '.$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))
{
$ret.="\n".$object->state;
}
}
else // Other: title firstname name \n address lines \n zip town \n country
{
$ret .= ($ret ? "\n" : '' ).$object->zip;