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

Fix: use getDocumentsLink method

Browse Source
This commit is contained in:
Regis Houssin
2012-09-15 09:02:20 +02:00
parent 4220229573
commit be13602c71
28 changed files with 194 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -739,12 +739,12 @@ function dol_format_address($object)
}
else if (in_array($object->country_code,array('GB'))) // UK: title firstname name \n address lines \n town state \n zip \n country
{
$ret .= ($ret ? "\n" : '' ).$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))
{
$ret.=", ".$object->departement;
}
if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
$ret .= ($ret ? "\n" : '' ).$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))
{
$ret.=", ".$object->departement;
}
if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
}
else // Other: title firstname name \n address lines \n zip town \n country
{