Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecated property ->fk_departement is now ->state_id everywhere.

Browse Source
This commit is contained in:
Laurent Destailleur
2019-04-05 20:06:13 +02:00
parent 67760d6f41
commit 54714bc755
9 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1633,7 +1633,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->departement_id?(' ('.($object->departement_id).')'):'');
$ret .= ($object->state_id?(' ('.($object->state_id).')'):'');
}
else // Other: title firstname name \n address lines \n zip town \n country
{