lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance function getFullAddress

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-30 01:59:28 +00:00
parent 8f6cf9838c
commit 474ce69f89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/societe/class/societe.class.php
View File

@ -1402,12 +1402,12 @@ class Societe extends CommonObject
* @param nobr Do not use br * @param nobr Do not use br
* @return string Full address string * @return string Full address string
*/ */
function getFullAddress($withcountry=0,$nobr=0) function getFullAddress($withcountry=0,$sep="\n")
{ {
$ret=''; $ret='';
$ret.=($this->address?$this->address.($nobr?" ":"\n"):''); $ret.=($this->address?$this->address.$sep:'');
$ret.=trim($this->zip.' '.$this->town); $ret.=trim($this->zip.' '.$this->town);
if ($withcountry) $ret.=' '.$this->pays; if ($withcountry) $ret.=($this->pays?$sep.$this->pays:'');
return trim($ret); return trim($ret);
} }