projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5b56b67
)
Rerun of Sales Orders Status with zero decimals in amounts.
author
Joe Hunt
<joe.hunt.consulting@gmail.com>
Mon, 29 Jan 2018 19:55:33 +0000
(20:55 +0100)
committer
Joe Hunt
<joe.hunt.consulting@gmail.com>
Mon, 29 Jan 2018 19:55:33 +0000
(20:55 +0100)
reporting/rep105.php
patch
|
blob
|
history
diff --git
a/reporting/rep105.php
b/reporting/rep105.php
index daa0a40428261789330c4eedc171587a4ca33ca4..584791ac52b6877602e51c694a9a239d50fc7358 100644
(file)
--- a/
reporting/rep105.php
+++ b/
reporting/rep105.php
@@
-135,7
+135,6
@@
function print_order_status_list()
$grand_total = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
$grand_total = 0;
$result = GetSalesOrders($from, $to, $category, $location, $backorder);
-
while ($myrow=db_fetch($result))
{
$rep->NewLine(0, 2, false, $orderno);
while ($myrow=db_fetch($result))
{
$rep->NewLine(0, 2, false, $orderno);
@@
-154,7
+153,7
@@
function print_order_status_list()
$rep->DateCol(5, 6, $myrow['delivery_date'], true);
$rep->TextCol(6, 7, $myrow['from_stk_loc']);
$rep->NewLine(1);
$rep->DateCol(5, 6, $myrow['delivery_date'], true);
$rep->TextCol(6, 7, $myrow['from_stk_loc']);
$rep->NewLine(1);
- $rep->
TextCol(6, 7, number_format2($myrow['total'], $dec)
);
+ $rep->
AmountCol(6, 7, $myrow['total']
);
$rep->NewLine(1);
$grand_total += $myrow['total'];
$orderno = $myrow['order_no'];
$rep->NewLine(1);
$grand_total += $myrow['total'];
$orderno = $myrow['order_no'];
@@
-175,8
+174,8
@@
function print_order_status_list()
}
$rep->Line($rep->row);
$rep->NewLine();
}
$rep->Line($rep->row);
$rep->NewLine();
- $rep->TextCol(1, 6, _("Total"));
- $rep->
TextCol(6, 7, number_format2($grand_total, $dec)
);
+ $rep->TextCol(1, 6, _("
Grand
Total"));
+ $rep->
AmountCol(6, 7, $grand_total
);
$rep->Line($rep->row - 5);
$rep->End();
}
$rep->Line($rep->row - 5);
$rep->End();
}