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

Trad: Traduction sur expdition commande

Browse Source
This commit is contained in:
Laurent Destailleur 2006-05-01 21:53:00 +00:00
parent 119460723f
commit 4ef541e5de
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/commande/commande.class.php
View File

@ -1442,35 +1442,35 @@ class Commande
} }
if ($mode == 2) if ($mode == 2)
{ {
if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6').' '.$this->status_label_short[$statut]; if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->status_label_short[$statut];
if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->status_label_short[$statut]; if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->status_label_short[$statut];
if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->status_label_short[$statut]; if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->status_label_short[$statut];
if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->status_label_short[$statut]; if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->status_label_short[$statut];
if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5').' '.$this->status_label_short[$statut]; if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->status_label_short[$statut];
} }
if ($mode == 3) if ($mode == 3)
{ {
if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6'); if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3'); if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5'); if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6');
} }
if ($mode == 4) if ($mode == 4)
{ {
if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut6').' '.$this->statuts[$statut]; if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$this->statuts[$statut];
if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->statuts[$statut]; if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$this->statuts[$statut];
if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->statuts[$statut]; if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$this->statuts[$statut];
if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->statuts[$statut]; if ($statut==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3').' '.$this->statuts[$statut];
if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut5').' '.$this->statuts[$statut]; if ($statut==3) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$this->statuts[$statut];
} }
if ($mode == 5) if ($mode == 5)
{ {
if ($statut==-1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut6'); if ($statut==-1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5');
if ($statut==0) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderDraft'),'statut0'); if ($statut==0) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderDraft'),'statut0');
if ($statut==1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderValidated'),'statut1'); if ($statut==1) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderValidated'),'statut1');
if ($statut==2) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3'); if ($statut==2) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
if ($statut==3) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut5'); if ($statut==3) return $this->status_label_short[$statut].' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6');
} }
} }

12
htdocs/expedition/commande.php
View File

@ -356,6 +356,10 @@ if ($_GET["id"] > 0)
{ {
print '<td align="center">'.$langs->trans("Stock").'</td>'; print '<td align="center">'.$langs->trans("Stock").'</td>';
} }
else
{
print '<td>&nbsp;</td>';
}
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;
@ -406,19 +410,23 @@ if ($_GET["id"] > 0)
print '<td align="center">'.$product->stock_reel.'</td>'; print '<td align="center">'.$product->stock_reel.'</td>';
} }
} }
else
{
print '<td>&nbsp;</td>';
}
print "</tr>"; print "</tr>";
$i++; $i++;
$var=!$var; $var=!$var;
} }
$db->free(); $db->free();
print "</table>";
if (! $num) if (! $num)
{ {
print $langs->trans("NoArticleOfTypeProduct").'<br>'; print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
} }
print "</table>";
} }
else else
{ {

1
htdocs/langs/fr_FR/orders.lang
View File

@ -62,6 +62,7 @@ RefCdeClient=R
RefCdeClientShort=Réf. com. client RefCdeClientShort=Réf. com. client
SendOrderByMail=Envoi commande par mail SendOrderByMail=Envoi commande par mail
ActionsOnOrder=Actions sur la commande ActionsOnOrder=Actions sur la commande
NoArticleOfTypeProduct=Pas d'article de type 'produit' et donc expédiable dans cette commande
# Sources # Sources
OrderSource0=Proposition commerciale OrderSource0=Proposition commerciale
OrderSource1=Internet OrderSource1=Internet