mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Correction bug #13938
This commit is contained in:
parent
531b54420b
commit
a7d56bbd42
|
|
@ -21,10 +21,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
/** \file htdocs/commande/liste.php
|
||||
\ingroup commande
|
||||
\brief Page liste des commandes
|
||||
\version $Revision$
|
||||
/** \file htdocs/commande/liste.php
|
||||
\ingroup commande
|
||||
\brief Page liste des commandes
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -80,6 +80,11 @@ if (isset($_GET["status"]))
|
|||
$sql .= " AND fk_statut = ".$_GET["status"];
|
||||
}
|
||||
|
||||
if (isset($_GET["afacturer"]))
|
||||
{
|
||||
$sql .= " AND c.facture = 0";
|
||||
}
|
||||
|
||||
if (strlen($_POST["sf_ref"]) > 0)
|
||||
{
|
||||
$sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";
|
||||
|
|
|
|||
|
|
@ -75,6 +75,11 @@ if (isset($_GET["status"]))
|
|||
$sql .= " AND fk_statut = ".$_GET["status"];
|
||||
}
|
||||
|
||||
if (isset($_GET["afacturer"]))
|
||||
{
|
||||
$sql .= " AND p.fk_statut >=1 AND c.facture = 0";
|
||||
}
|
||||
|
||||
if (strlen($_POST["sf_ref"]) > 0)
|
||||
{
|
||||
$sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ function llxHeader($head = "", $title="", $help_url='')
|
|||
if ($conf->commande->enabled && $conf->facture->enabled)
|
||||
{
|
||||
$langs->load("orders");
|
||||
$menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"));
|
||||
$menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&afacturer=1", $langs->trans("MenuOrdersToBill"));
|
||||
}
|
||||
|
||||
// Les dépenses
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ function llxHeader($head = "", $title="", $help_url='')
|
|||
if ($conf->commande->enabled && $conf->facture->enabled)
|
||||
{
|
||||
$langs->load("orders");
|
||||
$menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&status=3", $langs->trans("MenuOrdersToBill"));
|
||||
$menu->add(DOL_URL_ROOT."/compta/commande/liste.php?leftmenu=orders&afacturer=1", $langs->trans("MenuOrdersToBill"));
|
||||
}
|
||||
|
||||
// Les dépenses
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user