diff --git a/htdocs/compta/prelevement/class/ligne-prelevement.class.php b/htdocs/compta/prelevement/class/ligne-prelevement.class.php index d7ed63915df..dd0657be34e 100644 --- a/htdocs/compta/prelevement/class/ligne-prelevement.class.php +++ b/htdocs/compta/prelevement/class/ligne-prelevement.class.php @@ -48,13 +48,17 @@ class LignePrelevement */ function LignePrelevement($DB, $user) { + global $conf,$langs; + $this->db = $DB ; $this->user = $user; // List of language codes for status - /*$this->statuts[0] = "Waiting"; - $this->statuts[2] = "Credited"; - $this->statuts[3] = "Refused";*/ + + $langs->load("withdrawals"); + $this->statuts[0]=$langs->trans("StatusWaiting"); + $this->statuts[2]=$langs->trans("StatusCredited"); + $this->statuts[3]=$langs->trans("StatusRefused"); } /** @@ -106,6 +110,52 @@ class LignePrelevement return $result; } + +/** + * Return status label of object + * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto + * @return string Label + */ + function getLibStatut($mode=0) + { + return $this->LibStatut($this->statut,$mode); + } + + /** + * Return status label for a status + * @param statut id statut + * @param mode 0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto + * @return string Label + */ + function LibStatut($statut,$mode=0) + { + global $langs; + + if ($mode == 0) + { + return $langs->trans($this->statuts[$statut]); + } + + if ($mode == 1) + { + if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); + if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut7').' '.$langs->trans($this->statuts[$statut]); + } + if ($mode == 2) + { + if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0'); + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut7'); + } + + if ($mode == 3) + { + if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0'); + if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut7'); + } + } } ?> diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index c1a8f3499ff..25933ad1368 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -93,9 +93,9 @@ if ($_GET["id"]) { $lipre = new LignePrelevement($db, $user); - $lipre->statuts[0] = $langs->trans("StatusWaiting"); - $lipre->statuts[2] = $langs->trans("StatusCredited"); - $lipre->statuts[3] = $langs->trans("StatusRefused"); + //$lipre->statuts[0] = $langs->trans("StatusWaiting"); + //$lipre->statuts[2] = $langs->trans("StatusCredited"); + //$lipre->statuts[3] = $langs->trans("StatusRefused"); if ($lipre->fetch($_GET["id"]) == 0) { diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index 3032be27682..22a2f5e08f1 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -128,8 +128,13 @@ if ($result) $obj = $db->fetch_object($result); print "
';
+ print " ";
+
print '';
print substr('000000'.$obj->rowid, -6);
print '
';
+ if ($obj->statut_ligne==0) print img_picto($langs->trans("StatusWaiting"),'statut0');
+ if ($obj->statut_ligne==2) print img_picto($langs->trans("StatusCredited"),'statut4');
+ if ($obj->statut_ligne==3) print img_picto($langs->trans("StatusRefused"),'statut7');
+ print " ";
+
print '';
print substr('000000'.$obj->rowid_ligne, -6);
print '
';
+ print '