Merge pull request #13568 from atm-maxime/10.0

FIX #13535 : state in italian address
This commit is contained in:
Laurent Destailleur 2020-04-12 17:03:24 +02:00 committed by GitHub
commit 8e6de35d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1651,7 +1651,7 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
{
$ret .= ($ret ? $sep : '' ).$object->zip;
$ret .= ($object->town?(($object->zip?' ':'').$object->town):'');
$ret .= ($object->state_id?(' ('.($object->state_id).')'):'');
$ret .= ($object->state_code?(' ('.($object->state_code).')'):'');
}
else // Other: title firstname name \n address lines \n zip town \n country
{