Qual: Shorter legend
This commit is contained in:
parent
baf173bb80
commit
8fe14361c3
@ -174,7 +174,7 @@ $var=true;
|
|||||||
$listofstatus=array(0,4,4,5); $bool=false;
|
$listofstatus=array(0,4,4,5); $bool=false;
|
||||||
foreach($listofstatus as $status)
|
foreach($listofstatus as $status)
|
||||||
{
|
{
|
||||||
$dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,0,($bool?1:0)),'values'=>array(0=>($nb[$status.$bool]?$nb[$status.$bool]:0)));
|
$dataseries[]=array('label'=>$staticcontratligne->LibStatut($status,1,($bool?1:0)),'values'=>array(0=>($nb[$status.$bool]?$nb[$status.$bool]:0)));
|
||||||
if (! $conf->use_javascript_ajax)
|
if (! $conf->use_javascript_ajax)
|
||||||
{
|
{
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|||||||
@ -476,13 +476,24 @@ class CommandeFournisseur extends Commande
|
|||||||
global $langs;
|
global $langs;
|
||||||
$langs->load('orders');
|
$langs->load('orders');
|
||||||
|
|
||||||
if ($mode == 0)
|
// List of language codes for status
|
||||||
|
$statutshort[0] = 'StatusOrderDraftShort';
|
||||||
|
$statutshort[1] = 'StatusOrderValidatedShort';
|
||||||
|
$statutshort[2] = 'StatusOrderApprovedShort';
|
||||||
|
$statutshort[3] = 'StatusOrderOnProcessShort';
|
||||||
|
$statutshort[4] = 'StatusOrderReceivedPartiallyShort';
|
||||||
|
$statutshort[5] = 'StatusOrderReceivedAllShort';
|
||||||
|
$statutshort[6] = 'StatusOrderCanceledShort';
|
||||||
|
$statutshort[7] = 'StatusOrderCanceledShort';
|
||||||
|
$statutshort[9] = 'StatusOrderRefusedShort';
|
||||||
|
|
||||||
|
if ($mode == 0)
|
||||||
{
|
{
|
||||||
return $langs->trans($this->statuts[$statut]);
|
return $langs->trans($this->statuts[$statut]);
|
||||||
}
|
}
|
||||||
if ($mode == 1)
|
if ($mode == 1)
|
||||||
{
|
{
|
||||||
return $langs->trans($this->statuts[$statut]);
|
return $langs->trans($statutshort[$statut]);
|
||||||
}
|
}
|
||||||
if ($mode == 2)
|
if ($mode == 2)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -120,7 +120,7 @@ if ($resql)
|
|||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
foreach (array(0,1,2,3,4,5,6) as $statut)
|
foreach (array(0,1,2,3,4,5,6) as $statut)
|
||||||
{
|
{
|
||||||
$dataseries[]=array('label'=>$commandestatic->LibStatut($statut,0),'values'=>array(0=>(isset($vals[$statut])?$vals[$statut]:0)));
|
$dataseries[]=array('label'=>$commandestatic->LibStatut($statut,1),'values'=>array(0=>(isset($vals[$statut])?$vals[$statut]:0)));
|
||||||
if (! $conf->use_javascript_ajax)
|
if (! $conf->use_javascript_ajax)
|
||||||
{
|
{
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user