diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 5444907fb3cad2485a988cb7bc4a0d4dfd862116..f12d5a1a77d6115d8deef6ce1dcb8ad982bfb3e9 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -127,6 +127,11 @@ if ($_GET["action"] == 'setmod') dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]); } +if ($_POST["action"] == 'sethidetreated') +{ + dolibarr_set_const($db, "COMMANDE_HIDE_TREATED",$_POST["hidetreated"]); +} + /* @@ -324,5 +329,32 @@ closedir($handle); print '</table>'; +//Autres Options +print "<br>"; +print_titre($langs->trans("OtherOptions")); + +print '<table class="noborder" width="100%">'; +print '<tr class="liste_titre">'; +print '<td>'.$langs->trans("Parameter").'</td>'; +print '<td align="center" width="60">'.$langs->trans("Value").'</td>'; +print '<td width="80"> </td>'; +print "</tr>\n"; +$var=true; + +// cacher les commandes 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("HideTreadedOrders"); +print '</td><td width="60" align="center">'; +print $html->selectyesno("hidetreated",$conf->global->COMMANDE_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>'; + llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index 6881c1a03b55ddca4d3cee1ed44e8a396a244299..a4f57bae89092261b2f5bc909a7fc326fabff726 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -92,6 +92,13 @@ 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'; @@ -395,6 +402,19 @@ 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 3cee83c00eea2cb2a1e1dbc33c62c20892fe4470..b552d85d1fe91bbc77fe5e1a53d5a53fb9a19888 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1729,6 +1729,11 @@ 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); diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 71b8f233c7f9e1422bfae9c3c1911489e4b72fde..3529c1ab54faa6f265c5c9469973bb9fce44e410 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -116,6 +116,11 @@ if (!empty($sref_client)) { $sql .= ' AND c.ref_client like \'%'.addslashes($sref_client).'%\''; } +// on ne liste pas les commandes classer factur�es, elles apparaissent tout de m�me avec la recherche +if ($conf->global->COMMANDE_HIDE_TREATED && (!$sref && !$sref_client && !$snom && !$sall && (!strlen($_POST['sf_ref']) > 0))) +{ + $sql .= ' AND c.facture = 0'; +} $sql .= ' ORDER BY '.$sortfield.' '.$sortorder; $sql .= $db->plimit($limit + 1,$offset);