lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supp: option inutile car les listes sont dj spares

Browse Source
This commit is contained in:
Regis Houssin 2007-03-30 09:53:18 +00:00
parent 72c19623a8
commit 9af5b2f67f
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/propale.php
View File

@ -92,13 +92,6 @@ if ($_POST["action"] == 'setclassifiedinvoiced')
exit; exit;
} }
if ($_POST["action"] == 'sethidetreated')
{
dolibarr_set_const($db, "PROPALE_HIDE_TREATED",$_POST["hidetreated"]);
Header("Location: propale.php");
exit;
}
if ($_GET["action"] == 'set') if ($_GET["action"] == 'set')
{ {
$type='propal'; $type='propal';
@ -405,19 +398,6 @@ if ($conf->commande->enabled)
print '</form>'; 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>'; print '</table>';

6
htdocs/comm/propal.php
View File

@ -1803,11 +1803,7 @@ else
{ {
$sql .= " AND p.ref like '%".addslashes($_POST["sf_ref"]) . "%'"; $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 .= ' ORDER BY '.$sortfield.' '.$sortorder.', p.ref DESC';
$sql .= $db->plimit($limit + 1,$offset); $sql .= $db->plimit($limit + 1,$offset);
$result=$db->query($sql); $result=$db->query($sql);