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

Fix: Correct counting

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-01 20:07:48 +00:00
parent 39fbb33498
commit 46abd502e6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/societe/index.php
View File

@ -88,11 +88,12 @@ if ($result)
{ {
while ($objp = $db->fetch_object($result)) while ($objp = $db->fetch_object($result))
{ {
if ($objp->client == 1 || $objp->client == 3) $third['customer']++; $found=0;
if ($objp->client == 2 || $objp->client == 3) $third['prospect']++; if ($objp->client == 1 || $objp->client == 3) { $found=1; $third['customer']++; }
if ($objp->fournisseur) $third['supplier']++; if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && ($objp->client == 2 || $objp->client == 3)) { $found=1; $third['prospect']++; }
if ($conf->fournisseur->enabled && $objp->fournisseur) { $found=1; $third['supplier']++; }
$total++; if ($found) $total++;
} }
} }
else dol_print_error($db); else dol_print_error($db);
@ -103,22 +104,22 @@ if ($conf->societe->enabled)
{ {
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
{ {
$statProducts = "<tr $bc[0]>"; $statstring = "<tr $bc[0]>";
$statProducts.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/prospects.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>'; $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/prospects.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
$statProducts.= "</tr>"; $statstring.= "</tr>";
} }
$statProducts.= "<tr $bc[1]>"; $statstring.= "<tr $bc[1]>";
$statProducts.= '<td><a href="'.DOL_URL_ROOT.'/comm/clients.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>'; $statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/clients.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
$statProducts.= "</tr>"; $statstring.= "</tr>";
} }
if ($conf->fournisseur->enabled) if ($conf->fournisseur->enabled)
{ {
$statServices = "<tr $bc[0]>"; $statstring2 = "<tr $bc[0]>";
$statServices.= '<td><a href="'.DOL_URL_ROOT.'/fourn/liste.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>'; $statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/liste.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
$statServices.= "</tr>"; $statstring2.= "</tr>";
} }
print $statProducts; print $statstring;
print $statServices; print $statstring2;
print '<tr class="liste_total"><td>'.$langs->trans("UniqueThirdParties").'</td><td align="right">'; print '<tr class="liste_total"><td>'.$langs->trans("UniqueThirdParties").'</td><td align="right">';
print $total; print $total;
print '</td></tr>'; print '</td></tr>';