diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 339d58906ba..7f9bad75b0d 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -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"] . "%'"; diff --git a/htdocs/compta/commande/liste.php b/htdocs/compta/commande/liste.php index b4376821442..201c0c3b136 100644 --- a/htdocs/compta/commande/liste.php +++ b/htdocs/compta/commande/liste.php @@ -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"] . "%'"; diff --git a/htdocs/compta/commande/pre.inc.php b/htdocs/compta/commande/pre.inc.php index b906d49ef0f..2cc3a2f0935 100644 --- a/htdocs/compta/commande/pre.inc.php +++ b/htdocs/compta/commande/pre.inc.php @@ -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 diff --git a/htdocs/compta/pre.inc.php b/htdocs/compta/pre.inc.php index 31c0e6c121d..512d587cae1 100644 --- a/htdocs/compta/pre.inc.php +++ b/htdocs/compta/pre.inc.php @@ -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