Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: Le champ de tri apparait dans un style a part. Ajout de la rfrence du contrat dans la liste.

Browse Source
This commit is contained in:
Laurent Destailleur
2004-10-31 17:48:42 +00:00
parent b201336cea
commit 5bfabae8e1
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
htdocs/contrat/enservice.php
View File

@@ -20,13 +20,28 @@
* $Source$
*
*/
/*!
\file htdocs/contrat/enservice.php
\ingroup contrat
\brief Page liste des contrats en service
\version $Revision$
*/
require("./pre.inc.php");
llxHeader();
$langs->load("products");
$langs->load("companies");
llxHeader();
$sortfield = isset($_GET["sortfield"])?$_GET["sortfield"]:$_POST["sortfield"];
$sortorder = isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"];
$page = isset($_GET["page"])?$_GET["page"]:$_POST["page"];
$statut=isset($_GET["statut"])?$_GET["statut"]:1;
$socid=$_GET["socid"];
if ($page == -1) {
$page = 0 ;
}
/*
* S<>curit<69> acc<63>s client
*/
@@ -36,6 +51,9 @@ if ($user->societe_id > 0)
$socid = $user->societe_id;
}
if ($page == -1) { $page = 0 ; }
$limit = $conf->liste_limit;
$offset = $limit * $page ;
@@ -49,7 +67,7 @@ if ($sortorder == "")
$sortorder="ASC";
}
$sql = "SELECT s.nom, c.rowid as cid, c.enservice, p.label, p.rowid, s.idp as sidp";
$sql = "SELECT s.nom, c.rowid as cid, c.enservice, p.label, p.rowid as pid, s.idp as sidp";
$sql .= " ,".$db->pdate("c.fin_validite")." as date_fin_validite, c.fin_validite-sysdate() as delairestant ";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product as p";
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_product = p.rowid AND c.enservice = 1";
@@ -70,10 +88,11 @@ if ( $db->query($sql) )
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Label"),"enservice.php", "p.label");
print_liste_field_titre($langs->trans("Company"),"enservice.php", "s.nom");
print_liste_field_titre($langs->trans("Ref"),"enservice.php", "c.rowid","","","",$sortfield);
print_liste_field_titre($langs->trans("Label"),"enservice.php", "p.label","","","",$sortfield);
print_liste_field_titre($langs->trans("Company"),"enservice.php", "s.nom","","","",$sortfield);
print "<td align=\"center\">".$langs->trans("Status")."</td>";
print_liste_field_titre("Date fin","enservice.php", "date_fin_validite","","",'align=\"center\"');
print_liste_field_titre("Date fin","enservice.php", "date_fin_validite","","",'align="center"',$sortfield);
print "</tr>\n";
$now=mktime();
@@ -83,30 +102,33 @@ if ( $db->query($sql) )
$obj = $db->fetch_object();
$var=!$var;
print "<tr $bc[$var]>";
print "<td><a href=\"fiche.php?id=$obj->cid\">$obj->label</a></td>\n";
print "<td><a href=\"fiche.php?id=$obj->cid\">";
print img_file();
print "</a>&nbsp;<a href=\"fiche.php?id=$obj->cid\">$obj->cid</a></td>\n";
print "<td><a href=\"../product/fiche.php?id=$obj->pid\">$obj->label</a></td>\n";
print "<td><a href=\"../comm/fiche.php?socid=$obj->sidp\">$obj->nom</a></td>\n";
// Affiche statut contrat
if ($obj->enservice == 1)
{
if (! $obj->date_fin_validite || $obj->date_fin_validite >= $now) {
$class = "normal";
$statut="En service";
$class = 'normal';
$statut= $langs->trans("ContractStatusRunning");
}
else {
$class = "error";
$statut="<b>En service, expir<EFBFBD></b>";
$class = 'error';
$statut= $langs->trans("ContractStatusRunning").', '.img_warning().' '.$langs->trans("ContractStatusExpired");
}
}
elseif($obj->enservice == 2)
{
$class = "normal";
$statut= "Clotur<EFBFBD>";
$statut= $langs->trans("Closed");
}
else
{
$class = "warning";
$statut= "A mettre en service";
$statut= $langs->trans("ContractStatusToRun");
}
print "<td align=\"center\" class=\"$class\">";
print "$statut";
@@ -124,7 +146,7 @@ if ( $db->query($sql) )
}
else
{
print $db->error() . "<br>" .$sql;
dolibarr_print_error($db);
}

2
htdocs/contrat/index.php
View File

@@ -24,7 +24,7 @@
/*!
\file htdocs/contrat/contrat.class.php
\ingroup contrat
\brief Fichier de la classe des contrats
\brief Page liste des contrats
\version $Revision$
*/