Memory optimization
This commit is contained in:
parent
f3c9d38f82
commit
bbef8b0ce6
@ -1835,7 +1835,6 @@ class Contrat extends CommonObject
|
|||||||
}
|
}
|
||||||
if ($mode == 4 || $mode == 6 || $mode == 7)
|
if ($mode == 4 || $mode == 6 || $mode == 7)
|
||||||
{
|
{
|
||||||
$line=new ContratLigne($this->db);
|
|
||||||
$text='';
|
$text='';
|
||||||
if ($mode == 4)
|
if ($mode == 4)
|
||||||
{
|
{
|
||||||
@ -1846,13 +1845,13 @@ class Contrat extends CommonObject
|
|||||||
$text.='</span>';
|
$text.='</span>';
|
||||||
}
|
}
|
||||||
$text.=($mode == 7?'<div class="inline-block">':'');
|
$text.=($mode == 7?'<div class="inline-block">':'');
|
||||||
$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.$line->LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
|
$text.=($mode != 7 || $this->nbofserviceswait > 0) ? ($this->nbofserviceswait.ContratLigne::LibStatut(0,3,-1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesopened || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
|
||||||
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.$line->LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
|
$text.=($mode != 7 || $this->nbofservicesopened > 0) ? ($this->nbofservicesopened.ContratLigne::LibStatut(4,3,0,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesexpired || $this->nbofservicesclosed)?' ':'') : '';
|
||||||
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.$line->LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' ':'') : '';
|
$text.=($mode != 7 || $this->nbofservicesexpired > 0) ? ($this->nbofservicesexpired.ContratLigne::LibStatut(4,3,1,'class="paddingleft2 inline-block valigntextbottom"')).(($mode != 7 || $this->nbofservicesclosed)?' ':'') : '';
|
||||||
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
$text.=($mode == 7?'</div><div class="inline-block">':'');
|
||||||
$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.$line->LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
|
$text.=($mode != 7 || $this->nbofservicesclosed > 0) ? ($this->nbofservicesclosed.ContratLigne::LibStatut(5,3,-1,'class="paddingleft2 inline-block valigntextbottom"')) : '';
|
||||||
$text.=($mode == 7?'</div>':'');
|
$text.=($mode == 7?'</div>':'');
|
||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
@ -2544,7 +2543,7 @@ class ContratLigne extends CommonObjectLine
|
|||||||
* @param string $moreatt More attribute
|
* @param string $moreatt More attribute
|
||||||
* @return string Libelle
|
* @return string Libelle
|
||||||
*/
|
*/
|
||||||
function LibStatut($statut,$mode,$expired=-1,$moreatt='')
|
static function LibStatut($statut,$mode,$expired=-1,$moreatt='')
|
||||||
{
|
{
|
||||||
global $langs;
|
global $langs;
|
||||||
$langs->load("contracts");
|
$langs->load("contracts");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user