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

Correction bug #13938

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2005-08-01 12:47:45 +00:00
parent 531b54420b
commit a7d56bbd42
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/commande/liste.php
View File

@ -21,10 +21,10 @@
* *
*/ */
/** \file htdocs/commande/liste.php /** \file htdocs/commande/liste.php
\ingroup commande \ingroup commande
\brief Page liste des commandes \brief Page liste des commandes
\version $Revision$ \version $Revision$
*/ */
@ -80,6 +80,11 @@ if (isset($_GET["status"]))
$sql .= " AND fk_statut = ".$_GET["status"]; $sql .= " AND fk_statut = ".$_GET["status"];
} }
if (isset($_GET["afacturer"]))
{
$sql .= " AND c.facture = 0";
}
if (strlen($_POST["sf_ref"]) > 0) if (strlen($_POST["sf_ref"]) > 0)
{ {
$sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'"; $sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";

5
htdocs/compta/commande/liste.php
View File

@ -75,6 +75,11 @@ if (isset($_GET["status"]))
$sql .= " AND fk_statut = ".$_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) if (strlen($_POST["sf_ref"]) > 0)
{ {
$sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'"; $sql .= " AND c.ref like '%".$_POST["sf_ref"] . "%'";

2
htdocs/compta/commande/pre.inc.php
View File

@ -87,7 +87,7 @@ function llxHeader($head = "", $title="", $help_url='')
if ($conf->commande->enabled && $conf->facture->enabled) if ($conf->commande->enabled && $conf->facture->enabled)
{ {
$langs->load("orders"); $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 // Les dépenses

2
htdocs/compta/pre.inc.php
View File

@ -81,7 +81,7 @@ function llxHeader($head = "", $title="", $help_url='')
if ($conf->commande->enabled && $conf->facture->enabled) if ($conf->commande->enabled && $conf->facture->enabled)
{ {
$langs->load("orders"); $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 // Les dépenses