From 9af5b2f67f981d42209783b61fea1fcd2912a6c8 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 30 Mar 2007 09:53:18 +0000
Subject: [PATCH] =?UTF-8?q?Supp:=20option=20inutile=20car=20les=20listes?=
 =?UTF-8?q?=20sont=20d=E9j=E0=20s=E9par=E9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/propale.php | 20 --------------------
 htdocs/comm/propal.php   |  6 +-----
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 9a8c9563f16..0ede53fd722 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -92,13 +92,6 @@ if ($_POST["action"] == 'setclassifiedinvoiced')
     exit;
 }
 
-if ($_POST["action"] == 'sethidetreated')
-{
-    dolibarr_set_const($db, "PROPALE_HIDE_TREATED",$_POST["hidetreated"]);
-    Header("Location: propale.php");
-    exit;
-}
-
 if ($_GET["action"] == 'set')
 {
 	$type='propal';
@@ -405,19 +398,6 @@ if ($conf->commande->enabled)
 	print '</form>';
 }
 
-// cacher les propales classer facturées des listes
-$var=! $var;
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="action" value="sethidetreated">';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("HideTreadedPropal");
-print '</td><td align="left">';
-print $html->selectyesno("hidetreated",$conf->global->PROPALE_HIDE_TREATED,1);
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-print "</td></tr>\n";
-print '</form>';
-
 print '</table>';
 
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index e0351ca271a..184eb1e0956 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1803,11 +1803,7 @@ else
     {
       $sql .= " AND p.ref like '%".addslashes($_POST["sf_ref"]) . "%'";
     }
-  // on ne liste pas les propales classer ayant le statut signé, facturé, non signé
-  if ($conf->global->PROPALE_HIDE_TREATED && (!$sall && empty($_GET['search_ref']) && empty($_GET['search_societe']) && empty($_GET['search_montant_ht'])))
-  {
-	  $sql .= ' AND p.fk_statut < 2';
-  }
+
   $sql .= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
   $sql .= $db->plimit($limit + 1,$offset);
   $result=$db->query($sql);