Merge remote-tracking branch 'origin/3.5' into 3.6

Dolibarr · Feb 18, 2015 · e7d95f5 · e7d95f5
2 parents ceb3920 + 9f8bee3
commit e7d95f5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
@@ -141,7 +141,9 @@
 $limit = $conf->liste_limit;
 
 
-$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,';
+if (! $sall) $sql = 'SELECT';
+else $sql = 'SELECT DISTINCT';
+$sql.= ' s.rowid, s.nom, s.town, s.client, s.code_client,';
 $sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= ' u.login';