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

Ajout: ajout d'une option dans le module propal et commande qui permet de cacher les propales et commandes signs et/ou factures afin d'y voir plus clair dans les listes.

Browse Source
This commit is contained in:
Regis Houssin 2006-08-02 10:03:03 +00:00
parent b721f1b844
commit 3842c50b48
4 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/admin/commande.php
View File

@ -127,6 +127,11 @@ if ($_GET["action"] == 'setmod')
dolibarr_set_const($db, "COMMANDE_ADDON",$_GET["value"]); 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>'; 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">&nbsp;</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$'); llxFooter('$Date$ - $Revision$');
?> ?>

20
htdocs/admin/propale.php
View File

@ -92,6 +92,13 @@ 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';
@ -395,6 +402,19 @@ 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>';

5
htdocs/comm/propal.php
View File

@ -1729,6 +1729,11 @@ 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);

5
htdocs/commande/liste.php
View File

@ -116,6 +116,11 @@ if (!empty($sref_client))
{ {
$sql .= ' AND c.ref_client like \'%'.addslashes($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 .= ' ORDER BY '.$sortfield.' '.$sortorder;
$sql .= $db->plimit($limit + 1,$offset); $sql .= $db->plimit($limit + 1,$offset);