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

Fix doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-10 18:38:22 +02:00
parent 8d9f52ee4b
commit 525f9841fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,10 +437,11 @@ abstract class CommonObject
/** /**
* Return full address of contact * Return full address of contact
* *
* @param Societe $object Object Societe or null * @param string $htmlkey HTML id to make banner content unique
* @param Object $object Object (thirdparty, thirdparty of contact for contact, null for a member)
* @return string Full address string * @return string Full address string
*/ */
function getBannerAddress($htmlkey, $object=null) function getBannerAddress($htmlkey, $object)
{ {
global $conf, $langs; global $conf, $langs;
@ -465,7 +466,7 @@ abstract class CommonObject
$outdone++; $outdone++;
} }
if (! in_array($object->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS) if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)
&& ! empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) && ! empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
{ {
$out.=($outdone?'<br>':'').$this->state; $out.=($outdone?'<br>':'').$this->state;