From 8fe14361c3fdca484d8f38ccf53d9ba4be4326e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Jun 2011 00:08:06 +0000 Subject: [PATCH] Qual: Shorter legend --- htdocs/contrat/index.php | 2 +- htdocs/fourn/class/fournisseur.commande.class.php | 15 +++++++++++++-- htdocs/fourn/commande/index.php | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 65c479c088e..ca032d38e29 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -174,7 +174,7 @@ $var=true; $listofstatus=array(0,4,4,5); $bool=false; 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) { $var=!$var; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 8253308a104..50355ed6d70 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -476,13 +476,24 @@ class CommandeFournisseur extends Commande global $langs; $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]); } if ($mode == 1) { - return $langs->trans($this->statuts[$statut]); + return $langs->trans($statutshort[$statut]); } if ($mode == 2) { diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index d45eaae36ff..648a8afda5c 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -120,7 +120,7 @@ if ($resql) print "\n"; 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) { $var=!$var;