Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Add dol_format_address PHPUnit tests

Browse Source
This commit is contained in:
Laurent Destailleur
2012-10-31 01:45:48 +01:00
parent 8ea48b28eb
commit 066bcbb469
3 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -696,7 +696,7 @@ function dol_format_address($object)
$ret .= ($ret ? "\n" : '' ).$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))
{
$ret.=", ".$object->departement;
$ret.=", ".$object->state;
}
if ($object->zip) $ret .= ', '.$object->zip;
}
@@ -705,7 +705,7 @@ function dol_format_address($object)
$ret .= ($ret ? "\n" : '' ).$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))
{
$ret.=", ".$object->departement;
$ret.=", ".$object->state;
}
if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
}