Skip to content
Snippets Groups Projects
Commit 73562b7f authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Use correct status for select

parent 5ce44eff
Branches
Tags
No related merge requests found
...@@ -504,31 +504,8 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) ...@@ -504,31 +504,8 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
$sql.= ' WHERE c.entity = '.$conf->entity; $sql.= ' WHERE c.entity = '.$conf->entity;
$sql.= ' AND c.fk_soc = s.rowid'; $sql.= ' AND c.fk_soc = s.rowid';
/* // Show orders with status validated, shipping started and delivered (well any order we can bill)
if ($viewstatut <> '') $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
{
if ($viewstatut < 4 && $viewstatut > -2)
{
$sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee
if ($viewstatut == 3)
{
$sql.= ' AND c.facture = 0'; // need to create invoice
}
}
if ($viewstatut == 4)
{
$sql.= ' AND c.facture = 1'; // invoice created
}
if ($viewstatut == -2) // To process
{
//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
$sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
}
}
*/
// Which invoice to show
$sql.= " AND c.fk_statut in (1, 2) AND c.facture = 0";
if ($socid) $sql.= ' AND s.rowid = '.$socid; if ($socid) $sql.= ' AND s.rowid = '.$socid;
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
...@@ -564,7 +541,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) ...@@ -564,7 +541,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs))
{ {
$title = $langs->trans('ListOfOrders'); $title = $langs->trans('ListOfOrders');
} }
$title.=' - '.$langs->trans('StatusOrderToBillShort'); $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill');
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
print_fiche_titre($title); print_fiche_titre($title);
$i = 0; $i = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment