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

Fixed issue with merge error

Browse Source
This commit is contained in:
Rui Strecht 2017-10-09 11:44:10 +01:00
parent 1a5cdf2406
commit 6c0cb31c08
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commonobject.class.php
View File

@ -452,7 +452,7 @@ abstract class CommonObject
* @param int $withregion 1=Add region into address string
* @return string Full address string
*/
function getFullAddress($withcountry=0,$sep="\n",$withregion=0)function getFullAddress($withcountry=0,$sep="\n",$withregion=0)
function getFullAddress($withcountry=0,$sep="\n",$withregion=0)
{
if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
{