diff --git a/htdocs/contrat/enservice.php b/htdocs/contrat/enservice.php index 471167fee0d..3191950433b 100644 --- a/htdocs/contrat/enservice.php +++ b/htdocs/contrat/enservice.php @@ -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é accé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 ''; print ''; - 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 ""; - 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 "\n"; $now=mktime(); @@ -83,30 +102,33 @@ if ( $db->query($sql) ) $obj = $db->fetch_object(); $var=!$var; print ""; - print "\n"; + print "\n"; + print "\n"; print "\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="En service, expiré"; + $class = 'error'; + $statut= $langs->trans("ContractStatusRunning").', '.img_warning().' '.$langs->trans("ContractStatusExpired"); } } elseif($obj->enservice == 2) { $class = "normal"; - $statut= "Cloturé"; + $statut= $langs->trans("Closed"); } else { $class = "warning"; - $statut= "A mettre en service"; + $statut= $langs->trans("ContractStatusToRun"); } print "
".$langs->trans("Status")."
cid\">$obj->labelcid\">"; + print img_file(); + print " cid\">$obj->cidpid\">$obj->labelsidp\">$obj->nom"; print "$statut"; @@ -124,7 +146,7 @@ if ( $db->query($sql) ) } else { - print $db->error() . "
" .$sql; + dolibarr_print_error($db); } diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index f10c527a472..3f0bc0499ca 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -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$ */