diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index c10812f0b18..6b492d7ca2c 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -245,7 +245,7 @@ $sql.= " AND s.entity = ".$conf->entity; $sql.= " AND c.statut > 0"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; -$sql.= " GROUP BY c.rowid, c.datec, c.statut, s.nom, s.rowid"; +$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid"; $sql.= " ORDER BY c.tms DESC"; $sql.= " LIMIT ".$max; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 799209dcc5d..e03ecb75403 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2009 Laurent Destailleur + * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -84,7 +84,8 @@ if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc. if ($search_nom) $sql.= " AND s.nom like '%".addslashes($search_nom)."%'"; if ($search_contract) $sql.= " AND c.rowid = '".addslashes($search_contract)."'"; if ($sall) $sql.= " AND (s.nom like '%".addslashes($sall)."%' OR cd.label like '%".addslashes($sall)."%' OR cd.description like '%".addslashes($sall)."%')"; -$sql.= " GROUP BY c.rowid, c.datec, c.statut, s.nom, s.rowid"; +$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut,"; +$sql.= " s.nom, s.rowid"; $sql.= " ORDER BY $sortfield $sortorder"; $sql.= $db->plimit($conf->liste_limit + 1 ,$offset);