From 6e222c1dfec6ffe1d91833e4f9f1fd6820cf9c64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 11 Jun 2011 02:59:26 +0000
Subject: [PATCH] New: Add status
---
htdocs/expedition/index.php | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 9033a9a5c65..7b2e688f114 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -170,7 +170,7 @@ print '</td><td valign="top" width="70%">';
/*
* Commandes en traitement
*/
-$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -191,7 +191,7 @@ if ( $resql )
$i = 0;
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
- print '<td colspan="2">'.$langs->trans("OrdersInProcess").'</td></tr>';
+ print '<td colspan="3">'.$langs->trans("OrdersInProcess").'</td></tr>';
$var = True;
while ($i < $num)
{
@@ -206,12 +206,19 @@ if ( $resql )
$companystatic->nom=$obj->nom;
$companystatic->id=$obj->socid;
print $companystatic->getNomUrl(1,'customer');
- print '</td></tr>';
+ print '</td>';
+ print '<td align="right">';
+ $orderstatic->statut=$obj->status;
+ $orderstatic->facturee=$obj->billed;
+ print $orderstatic->getLibStatut(3);
+ print '</td>';
+ print '</tr>';
$i++;
}
print "</table><br>";
}
}
+else dol_print_error($db);
/*
@@ -271,6 +278,7 @@ if ($resql)
}
$db->free($resql);
}
+else dol_print_error($db);
print '</td></tr></table>';
--
GitLab