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

Fix: Overlapping of company name.

Browse Source 
Fix: Missing state for ome countries.
This commit is contained in:
Laurent Destailleur
2013-07-01 00:05:39 +02:00
parent 387c213aea
commit 10e28fa27a
9 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -703,7 +703,7 @@ function dol_format_address($object,$withcountry=0,$sep="\n")
// Address
$ret .= $object->address;
// Zip/Town/State
if (in_array($object->country_code,array('US','AU'))) // US: title firstname name \n address lines \n town, state, zip \n country
if (in_array($object->country_code,array('US','AU')) || ! empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) // US: title firstname name \n address lines \n town, state, zip \n country
{
$ret .= ($ret ? $sep : '' ).$object->town;
if ($object->state && in_array($object->country_code,$countriesusingstate))