Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix merge

Browse Source
This commit is contained in:
Philippe GRAND
2018-09-03 09:34:08 +02:00
parent 3de16a145e d2afffaeca
commit 7a0c19485e
103 changed files with 498 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/modulebuilder/template/class/myobject.class.php
View File

@@ -402,31 +402,31 @@ class MyObject extends CommonObject
{
return $this->labelstatus[$status];
}
if ($mode == 1)
elseif ($mode == 1)
{
return $this->labelstatus[$status];
}
if ($mode == 2)
elseif ($mode == 2)
{
if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status];
if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status];
}
if ($mode == 3)
elseif ($mode == 3)
{
if ($status == 1) return img_picto($this->labelstatus[$status],'statut4');
if ($status == 0) return img_picto($this->labelstatus[$status],'statut5');
}
if ($mode == 4)
elseif ($mode == 4)
{
if ($status == 1) return img_picto($this->labelstatus[$status],'statut4').' '.$this->labelstatus[$status];
if ($status == 0) return img_picto($this->labelstatus[$status],'statut5').' '.$this->labelstatus[$status];
}
if ($mode == 5)
elseif ($mode == 5)
{
if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4');
if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5');
}
if ($mode == 6)
elseif ($mode == 6)
{
if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut4');
if ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut5');
@@ -543,4 +543,4 @@ class MyObjectLine
// @var mixed Sample line property 2
public $prop2;
}
*/
*/