Fix: Solve filter problem in list of services

htdocs/contrat/services.php

@@ -21,7 +21,7 @@
 /**
  *	    \file       htdocs/contrat/services.php
  *      \ingroup    contrat
- *		\brief      Page liste des contrats en service
+ *		\brief      Page to list services in contracts
  *		\version    $Id$
  */
 
@@ -91,7 +91,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc
 if ($mode == "0") $sql.= " AND cd.statut = 0";
 if ($mode == "4") $sql.= " AND cd.statut = 4";
 if ($mode == "5") $sql.= " AND cd.statut = 5";
-if ($filter == "expired") $sql.= " AND date_fin_validite < ".$now;
+if ($filter == "expired") $sql.= " AND date_fin_validite < ".$db->idate($now);
 if ($search_nom)      $sql.= " AND s.nom like '%".addslashes($search_nom)."%'";
 if ($search_contract) $sql.= " AND c.rowid = '".addslashes($search_contract)."'";
 if ($search_service)  $sql.= " AND (p.ref like '%".addslashes($search_service)."%' OR p.description like '%".addslashes($search_service)."%')";
@@ -122,7 +122,12 @@ if ($resql)
 	if ($filter_date1 != '') $param.='&amp;op1day='.$_REQUEST['op1day'].'&amp;op1month='.$_REQUEST['op1month'].'&amp;op1year='.$_REQUEST['op1year'];
 	if ($filter_date2 != '') $param.='&amp;op2day='.$_REQUEST['op2day'].'&amp;op2month='.$_REQUEST['op2month'].'&amp;op2year='.$_REQUEST['op2year'];
 
-	print_barre_liste($langs->trans("ListOfServices"), $page, "services.php", $param, $sortfield, $sortorder,'',$num);
+	$title=$langs->trans("ListOfServices");
+	if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"
+	if ($mode == "4" && $filter != "expired") $title=$langs->trans("ListOfRunningServices");
+	if ($mode == "4" && $filter == "expired") $title=$langs->trans("ListOfExpiredServices");
+	if ($mode == "5") $title=$langs->trans("ListOfClosedServices");
+	print_barre_liste($title, $page, "services.php", $param, $sortfield, $sortorder,'',$num);
 
 	print '<table class="liste" width="100%">';
 
@@ -223,7 +228,7 @@ if ($resql)
 		else print '&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '</td>';
 		print '<td align="right" nowrap="nowrap">';
-		if ($obj->cstatut == 0)
+		if ($obj->cstatut == 0)	// If contract is draft, we say line is also draft
 		{
 			print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $obj->date_fin_validite < $now));
 		}

htdocs/langs/en_US/contracts.lang

@@ -47,6 +47,9 @@ DateServiceStart=Date for beginning of service
 DateServiceEnd=Date for end of service
 ShowContract=Show contract
 ListOfServices=List of services
+ListOfInactiveServices=List of not active services
+ListOfExpiredServices=List of expired active services
+ListOfClosedServices=List of closed services
 ListOfRunningContractsLines=List of running contract lines
 ListOfRunningServices=List of running services
 NotActivatedServices=Not activated services (among validated contracts)

htdocs/langs/fr_FR/contracts.lang

@@ -47,6 +47,9 @@ DateServiceStart=Date début du service
 DateServiceEnd=Date fin du service
 ShowContract=Afficher contrat
 ListOfServices=Liste des services
+ListOfInactiveServices=Liste des services inactifs
+ListOfExpiredServices=Liste des services actifs expirés
+ListOfClosedServices=Liste des services fermés
 ListOfRunningContractsLines=Liste des lignes de contrats en service
 ListOfRunningServices=Liste des services actifs
 NotActivatedServices=Services non activés (parmi les contrats validés)

htdocs/lib/databases/mssql.lib.php

@@ -20,19 +20,20 @@
  */
 
 /**
- \file       	htdocs/lib/databases/mssql.lib.php
- \brief			Fichier de la classe permettant de g�rer une base mssql
- \version		$Id$
+ *	\file       	htdocs/lib/databases/mssql.lib.php
+ *	\brief			Fichier de la classe permettant de g�rer une base mssql
+ *	\version		$Id$
  */
+
 // Pour compatibilite lors de l'upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
 if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php");
 
 
 /**
- \class      DoliDb
- \brief      Classe de gestion de la database de dolibarr
- \remarks	Works with PHP5 Only
+ *	\class      DoliDb
+ *	\brief      Classe de gestion de la database de dolibarr
+ *	\remarks	Works with PHP5 Only
  */
 class DoliDb
 {

htdocs/lib/databases/mysqli.lib.php

@@ -25,6 +25,7 @@
  *	\brief      Class file to manage Dolibarr database access for a Mysql database
  *	\version	$Id$
  */
+
 // For compatibility during upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
 if (! defined('ADODB_DATE_VERSION')) include_once(DOL_DOCUMENT_ROOT."/includes/adodbtime/adodb-time.inc.php");
@@ -806,7 +807,7 @@ class DoliDb
 		}
 		return $listtables;
 	}
-	
+
 	/**
 	 *	\brief     	Liste les informations des champs d'une table.
 	 *	\param	    table			Nom de la table
@@ -817,7 +818,7 @@ class DoliDb
 		$infotables=array();
 
 		$sql="SHOW FULL COLUMNS FROM ".$table.";";
-		
+
 		dol_syslog($sql,LOG_DEBUG);
 		$result = $this->query($sql);
 		while($row = $this->fetch_row($result))