projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f96866
)
Dashboard Top 10 only show 1 record less than top. Fixed.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Mon, 14 Mar 2022 10:37:12 +0000
(11:37 +0100)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Mon, 14 Mar 2022 10:37:12 +0000
(11:37 +0100)
includes/dashboard.inc
patch
|
blob
|
history
diff --git
a/includes/dashboard.inc
b/includes/dashboard.inc
index 31e6518ba6b19b880f83f315a9a969a8c811195d..0a84a9569581795590e48fa6614daa8206c9f53f 100644
(file)
--- a/
includes/dashboard.inc
+++ b/
includes/dashboard.inc
@@
-446,25
+446,21
@@
function customer_top($today, $limit=10, $width='33', &$pg=null)
headers($th);
check_page_security('SA_SALESTRANSVIEW');
$k = 0; //row colour counter
headers($th);
check_page_security('SA_SALESTRANSVIEW');
$k = 0; //row colour counter
- $i = 1;
$names = $totals = array();
$sales = 0;
while ($myrow = db_fetch($result))
{
$sales += round($myrow['total']);
$names = $totals = array();
$sales = 0;
while ($myrow = db_fetch($result))
{
$sales += round($myrow['total']);
- if ($i++ < $limit)
+ alt_table_row_color($k);
+ $name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]);
+ label_cell($name);
+ amount_cell($myrow['total']);
+ if ($pg != null)
{
{
- alt_table_row_color($k);
- $name = $myrow["debtor_no"]." ".htmlspecialchars_decode($myrow["name"]);
- label_cell($name);
- amount_cell($myrow['total']);
- if ($pg != null)
- {
- $names[] = $name;
- $totals[] = round($myrow['total']);
- }
- end_row();
- }
+ $names[] = $name;
+ $totals[] = round($myrow['total']);
+ }
+ end_row();
}
if ($pg != null)
{
}
if ($pg != null)
{
@@
-492,25
+488,21
@@
function supplier_top($today, $limit=10, $width='33', &$pg=null)
headers($th);
check_page_security('SA_SUPPTRANSVIEW');
$k = 0; //row colour counter
headers($th);
check_page_security('SA_SUPPTRANSVIEW');
$k = 0; //row colour counter
- $i = 1;
$names = $totals = array();
$total = 0;
while ($myrow = db_fetch($result))
{
$total += $myrow['total'];
$names = $totals = array();
$total = 0;
while ($myrow = db_fetch($result))
{
$total += $myrow['total'];
- if ($i++ < $limit)
+ alt_table_row_color($k);
+ $name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]);
+ label_cell($name);
+ amount_cell($myrow['total']);
+ if ($pg != null)
{
{
- alt_table_row_color($k);
- $name = $myrow["supplier_id"]." ".htmlspecialchars_decode($myrow["supp_name"]);
- label_cell($name);
- amount_cell($myrow['total']);
- if ($pg != null)
- {
- $names[] = $name;
- $totals[] = round($myrow['total']);
- }
- end_row();
- }
+ $names[] = $name;
+ $totals[] = round($myrow['total']);
+ }
+ end_row();
}
if ($pg != null)
{
}
if ($pg != null)
{
@@
-568,7
+560,6
@@
function stock_top($today, $limit=10, $width='33', $type=0, &$pg=null)
headers($th);
check_page_security($sec);
$k = 0; //row colour counter
headers($th);
check_page_security($sec);
$k = 0; //row colour counter
- $i = 1;
$names = $totals = $costs = $results = array();
$sales = $cost = $res = 0;
while ($myrow = db_fetch($result))
$names = $totals = $costs = $results = array();
$sales = $cost = $res = 0;
while ($myrow = db_fetch($result))
@@
-579,30
+570,27
@@
function stock_top($today, $limit=10, $width='33', $type=0, &$pg=null)
$cost += $myrow['costs'];
$res += ($myrow['total'] - $myrow['costs']);
}
$cost += $myrow['costs'];
$res += ($myrow['total'] - $myrow['costs']);
}
- if ($i++ < $limit)
+ alt_table_row_color($k);
+ $name = $myrow["description"];
+ label_cell($name);
+ amount_cell($myrow['total']);
+ if ($type == 0)
{
{
- alt_table_row_color($k);
- $name = $myrow["description"];
- label_cell($name);
- amount_cell($myrow['total']);
+ amount_cell($myrow['costs']);
+ amount_cell($myrow['total'] - $myrow['costs']);
+ }
+ qty_cell($myrow['qty']);
+ if ($pg != NULL)
+ {
+ $names[] = $name;
+ $totals[] = round($myrow['total']);
if ($type == 0)
{
if ($type == 0)
{
-
amount_cell
($myrow['costs']);
-
amount_cell
($myrow['total'] - $myrow['costs']);
+
$costs[] = round
($myrow['costs']);
+
$results[] = round
($myrow['total'] - $myrow['costs']);
}
}
- qty_cell($myrow['qty']);
- if ($pg != NULL)
- {
- $names[] = $name;
- $totals[] = round($myrow['total']);
- if ($type == 0)
- {
- $costs[] = round($myrow['costs']);
- $results[] = round($myrow['total'] - $myrow['costs']);
- }
- }
- end_row();
- }
+ }
+ end_row();
}
if ($pg != null)
{
}
if ($pg != null)
{