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

Fix: http://matelli.fr/showcases/patchs-dolibarr/fix-number-of-processing-orders.html

Browse Source
This commit is contained in:
Laurent Destailleur 2008-10-01 19:27:32 +00:00
parent 30659d34be
commit be5826057e
1 changed files with 157 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

313
htdocs/commande/index.php
View File

@ -18,11 +18,11 @@
*/ */
/** /**
\file htdocs/commande/index.php \file htdocs/commande/index.php
\ingroup commande \ingroup commande
\brief Page acceuil espace commandes \brief Page acceuil espace commandes
\version $Id$ \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
@ -35,10 +35,10 @@ $langs->load("orders");
// Sécurité accés client // Sécurité accés client
$socid=''; $socid='';
if ($_GET["socid"]) { $socid=$_GET["socid"]; } if ($_GET["socid"]) { $socid=$_GET["socid"]; }
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$socid = $user->societe_id; $socid = $user->societe_id;
} }
@ -81,27 +81,27 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
$langs->load("orders"); $langs->load("orders");
$num = $db->num_rows(); $num = $db->num_rows();
if ($num) if ($num)
{ {
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("DraftOrders").'</td></tr>'; print '<td colspan="2">'.$langs->trans("DraftOrders").'</td></tr>';
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object(); $obj = $db->fetch_object();
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>"; print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).'</a></td></tr>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).'</a></td></tr>';
$i++; $i++;
} }
print "</table><br>"; print "</table><br>";
} }
} }
/* /*
@ -118,48 +118,48 @@ $sql .= " ORDER BY c.rowid DESC";
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>'; print '<td colspan="2">'.$langs->trans("OrdersToProcess").'</td></tr>';
$num = $db->num_rows(); $num = $db->num_rows();
if ($num) if ($num)
{ {
$i = 0; $i = 0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object(); $obj = $db->fetch_object();
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td nowrap="nowrap">'; print '<td nowrap="nowrap">';
$commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1);
print '</td>';
print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
print '&nbsp;';
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
$filename=sanitize_string($obj->ref);
$filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
print '</td></tr></table>';
print '</td>'; $commandestatic->id=$obj->rowid;
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).'</a></td></tr>'; $commandestatic->ref=$obj->ref;
$i++;
}
}
print "</table><br>"; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1);
print '</td>';
print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
print '&nbsp;';
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
$filename=sanitize_string($obj->ref);
$filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
print '</td></tr></table>';
print '</td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dolibarr_trunc($obj->nom,24).'</a></td></tr>';
$i++;
}
}
print "</table><br>";
} }
@ -180,50 +180,51 @@ $sql .= " ORDER BY c.rowid DESC";
if ( $db->query($sql) ) if ( $db->query($sql) )
{ {
print '<table class="noborder" width="100%">'; $num = $db->num_rows();
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("OnProcessOrders").' ('.$num.')</td></tr>'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("OnProcessOrders").' ('.$num.')</td></tr>';
$num = $db->num_rows(); if ($num)
if ($num) {
{ $i = 0;
$i = 0; $var = True;
$var = True; while ($i < $num)
while ($i < $num) {
{ $var=!$var;
$var=!$var; $obj = $db->fetch_object();
$obj = $db->fetch_object(); print "<tr $bc[$var]>";
print "<tr $bc[$var]>"; print '<td width="20%" nowrap="nowrap">';
print '<td width="20%" nowrap="nowrap">';
$commandestatic->id=$obj->rowid;
$commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref;
$commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">'; print $commandestatic->getNomUrl(1);
print $commandestatic->getNomUrl(1); print '</td>';
print '</td>';
print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; print '&nbsp;';
print '&nbsp;'; print '</td>';
print '</td>';
print '<td width="16" align="right" class="nobordernopadding">';
print '<td width="16" align="right" class="nobordernopadding">'; $filename=sanitize_string($obj->ref);
$filename=sanitize_string($obj->ref); $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref);
$filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); print '</td></tr></table>';
print '</td></tr></table>';
print '</td>';
print '</td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>'; print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>'; print '</tr>';
print '</tr>'; $i++;
$i++; }
} }
} print "</table><br>";
print "</table><br>";
} }
/* /*
@ -245,52 +246,52 @@ $sql.= $db->plimit($max, 0);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="4">'.$langs->trans("LastClosedOrders",$max).'</td></tr>'; print '<td colspan="4">'.$langs->trans("LastClosedOrders",$max).'</td></tr>';
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
if ($num) if ($num)
{ {
$i = 0; $i = 0;
$var = True; $var = True;
while ($i < $num) while ($i < $num)
{ {
$var=!$var; $var=!$var;
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td width="20%" nowrap="nowrap">'; print '<td width="20%" nowrap="nowrap">';
$commandestatic->id=$obj->rowid; $commandestatic->id=$obj->rowid;
$commandestatic->ref=$obj->ref; $commandestatic->ref=$obj->ref;
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">'; print '<td width="90" class="nobordernopadding" nowrap="nowrap">';
print $commandestatic->getNomUrl(1); print $commandestatic->getNomUrl(1);
print '</td>'; print '</td>';
print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; print '<td width="16" class="nobordernopadding" nowrap="nowrap">';
print '&nbsp;'; print '&nbsp;';
print '</td>'; print '</td>';
print '<td width="16" align="right" class="nobordernopadding">'; print '<td width="16" align="right" class="nobordernopadding">';
$filename=sanitize_string($obj->ref); $filename=sanitize_string($obj->ref);
$filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref); $filedir=$conf->commande->dir_output . '/' . sanitize_string($obj->ref);
$urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid; $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
$formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1); $formfile->show_documents('commande',$filename,$filedir,$urlsource,'','','','','',1);
print '</td></tr></table>'; print '</td></tr></table>';
print '</td>'; print '</td>';
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>'; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
print '<td>'.dolibarr_print_date($obj->datec).'</td>'; print '<td>'.dolibarr_print_date($obj->datec).'</td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>'; print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
print '</tr>'; print '</tr>';
$i++; $i++;
} }
} }
print "</table><br>"; print "</table><br>";
} }