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

Look: Modifications esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2006-04-01 02:20:23 +00:00
parent 43f5194a77
commit 8af82f4cb5
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/product.class.php
View File

@ -1563,7 +1563,7 @@ function get_each_prod()
/** /**
* \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée) * \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée)
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto
* \return string Libelle * \return string Libelle
*/ */
function getLibStatut($mode=0) function getLibStatut($mode=0)
@ -1574,7 +1574,7 @@ function get_each_prod()
/** /**
* \brief Renvoi le libellé d'un statut donne * \brief Renvoi le libellé d'un statut donne
* \param status Statut * \param status Statut
* \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court * \param mode 0=libellé long, 1=libellé court, 2=Picto + Libellé court, 3=Picto, 4=Picto + Libellé long, 5=Libellé court + Picto
* \return string Libellé du statut * \return string Libellé du statut
*/ */
function LibStatut($status,$mode=0) function LibStatut($status,$mode=0)
@ -1596,6 +1596,11 @@ function get_each_prod()
if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'),'statut5').' '.$langs->trans('ProductStatusNotOnSell'); if ($status == 0) return img_picto($langs->trans('ProductStatusNotOnSell'),'statut5').' '.$langs->trans('ProductStatusNotOnSell');
if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'),'statut4').' '.$langs->trans('ProductStatusOnSell'); if ($status == 1) return img_picto($langs->trans('ProductStatusOnSell'),'statut4').' '.$langs->trans('ProductStatusOnSell');
} }
if ($mode == 5)
{
if ($status == 0) return $langs->trans('ProductStatusNotOnSell').' '.img_picto($langs->trans('ProductStatusNotOnSell'),'statut5');
if ($status == 1) return $langs->trans('ProductStatusOnSell').' '.img_picto($langs->trans('ProductStatusOnSell'),'statut4');
}
return $langs->trans('Unknown'); return $langs->trans('Unknown');
} }

5
htdocs/product/liste.php
View File

@ -146,6 +146,7 @@ if ($resql)
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
Header("Location: fiche.php?id=$objp->rowid"); Header("Location: fiche.php?id=$objp->rowid");
exit;
} }
if (isset($_GET["envente"]) || isset($_POST["envente"])) if (isset($_GET["envente"]) || isset($_POST["envente"]))
@ -252,7 +253,7 @@ if ($resql)
} }
$var=!$var; $var=!$var;
print "<tr $bc[$var]><td>"; print '<tr '.$bc[$var].'><td nowrap="nowrap">';
print "<a href=\"fiche.php?id=$objp->rowid\">"; print "<a href=\"fiche.php?id=$objp->rowid\">";
if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service"); if ($objp->fk_product_type) print img_object($langs->trans("ShowService"),"service");
else print img_object($langs->trans("ShowProduct"),"product"); else print img_object($langs->trans("ShowProduct"),"product");
@ -265,7 +266,7 @@ if ($resql)
print '<td align="center">'.$objp->duration.'</td>'; print '<td align="center">'.$objp->duration.'</td>';
} }
print '<td align="right">'.price($objp->price).'</td>'; print '<td align="right">'.price($objp->price).'</td>';
print '<td align="left" nowrap="nowrap">'.$product_static->LibStatut($objp->statut,2).'</td>'; print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->statut,5).'</td>';
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }