diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 5c4f5a216ee..e27db8c7906 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -49,7 +49,7 @@ if ($sortorder == "") $sortorder="DESC"; } -$sql = "SELECT s.nom, c.rowid as cid, c.enservice, p.label, p.rowid, s.idp as sidp"; +$sql = "SELECT c.rowid as cid, c.enservice, c.fin_validite, p.label, p.rowid as pid, s.nom, s.idp as sidp"; $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"; if ($socid > 0) @@ -69,11 +69,19 @@ if ( $db->query($sql) ) print ''; - print ''; + print ''; + print ''; + print ''; print "\n"; $var=True; @@ -82,7 +90,8 @@ if ( $db->query($sql) ) $obj = $db->fetch_object( $i); $var=!$var; print ""; - print "\n"; + print "\n"; + print "\n"; print "\n"; print '"; } + $time=strtotime($obj->fin_validite); + print "\n"; print "\n"; $i++; }
'; + print '
'; + print_liste_field_titre("Numéro",$PHP_SELF, "c.rowid"); + print ""; print_liste_field_titre("Libellé",$PHP_SELF, "p.label"); print ""; print_liste_field_titre("Société",$PHP_SELF, "s.nom"); - print 'Etat'; + print_liste_field_titre("Etat",$PHP_SELF, "c.enservice"); + print ''; + print_liste_field_titre("Fin",$PHP_SELF, "c.fin_validite"); + print '
cid\">$obj->labelcid\">$obj->cidpid\">$obj->labelsidp\">$obj->nom'; if ($obj->enservice == 1) @@ -97,6 +106,8 @@ if ( $db->query($sql) ) { print "A mettre en service".dolibarr_print_date($time)."