Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look: Ajout picto sur statut commercial

Browse Source
This commit is contained in:
Laurent Destailleur
2006-04-08 14:43:00 +00:00
parent 12fa5bf24b
commit 35e4b4a01a
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/index.php
View File

@@ -528,6 +528,8 @@ if ($conf->contrat->enabled && 0) // \todo A REFAIRE DEPUIS NOUVEAU CONTRAT
*/
if ($conf->propal->enabled && $user->rights->propale->lire)
{
$langs->load("propal");
$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref, p.fk_statut, ".$db->pdate("p.datep")." as dp";
if (!$user->rights->commercial->client->voir && !$socidp) $sql .= ", sc.fk_soc, sc.fk_user";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
@@ -560,7 +562,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print "<td align=\"right\">";
print dolibarr_print_date($obj->dp)."</td>\n";
print "<td align=\"right\">".price($obj->price)."</td>";
print "<td align=\"center\">".$propalstatic->LibStatut($objp->fk_statut,3)."</td>\n";
print "<td align=\"center\">".$propalstatic->LibStatut($obj->fk_statut,3)."</td>\n";
print "</tr>\n";
$i++;
$total += $obj->price;

7
htdocs/comm/prospect/prospects.php
View File

@@ -28,6 +28,7 @@
*/
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/prospect.class.php");
$langs->load("propal");
@@ -163,6 +164,8 @@ if ($resql)
$var=true;
$prospectstatic=new Prospect($db);
while ($i < min($num,$conf->liste_limit))
{
$obj = $db->fetch_object($resql);
@@ -179,9 +182,7 @@ if ($resql)
print "<td align=\"center\">".dolibarr_print_date($obj->datec)."</td>";
// Statut
print "<td align=\"center\">";
$transcode=$langs->trans("StatusProspect".$obj->fk_stcomm);
$libelle=($transcode!="StatusProspect".$obj->fk_stcomm?$transcode:$obj->stcomm);
print $libelle;
print $prospectstatic->LibStatut($obj->fk_stcomm,2);
print "</td>";
$sts = array(-1,0,1,2,3);

8
htdocs/prospect.class.php
View File

@@ -114,6 +114,14 @@ class Prospect extends Societe
global $langs;
$langs->load('customers');
if ($mode == 2)
{
if ($statut == -1) return img_action(0,-1).' '.$langs->trans("StatusProspect-1");
if ($statut == 0) return img_action(0, 0).' '.$langs->trans("StatusProspect0");
if ($statut == 1) return img_action(0, 1).' '.$langs->trans("StatusProspect1");
if ($statut == 2) return img_action(0, 2).' '.$langs->trans("StatusProspect2");
if ($statut == 3) return img_action(0, 3).' '.$langs->trans("StatusProspect3");
}
if ($mode == 4)
{
if ($statut == -1) return img_action(0,-1).' '.$langs->trans("StatusProspect-1");