projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple of additional smaller fixes.
[fa-stable.git]
/
reporting
/
rep710.php
diff --git
a/reporting/rep710.php
b/reporting/rep710.php
index 131b4b4e8a162fcc6a090230111d1a243400de08..06485b2c2b20b828c103703bf93ab236763cad15 100644
(file)
--- a/
reporting/rep710.php
+++ b/
reporting/rep710.php
@@
-36,7
+36,6
@@
function getTransactions($from, $to, $type, $user)
$sql = "SELECT a.*,
SUM(IF(ISNULL(g.amount), NULL, IF(g.amount > 0, g.amount, 0))) AS amount,
u.user_id,
$sql = "SELECT a.*,
SUM(IF(ISNULL(g.amount), NULL, IF(g.amount > 0, g.amount, 0))) AS amount,
u.user_id,
- DATE(a.stamp) as stamp,
UNIX_TIMESTAMP(a.stamp) as unix_stamp
FROM ".TB_PREF."audit_trail AS a JOIN ".TB_PREF."users AS u
LEFT JOIN ".TB_PREF."gl_trans AS g ON (g.type_no=a.trans_no
UNIX_TIMESTAMP(a.stamp) as unix_stamp
FROM ".TB_PREF."audit_trail AS a JOIN ".TB_PREF."users AS u
LEFT JOIN ".TB_PREF."gl_trans AS g ON (g.type_no=a.trans_no
@@
-89,13
+88,13
@@
function print_audit_trail()
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
$rep->Font();
$rep->Info($params, $cols, $headers, $aligns);
- $rep->
Header
();
+ $rep->
NewPage
();
$trans = getTransactions($from, $to, $systype, $user);
while ($myrow=db_fetch($trans))
{
$trans = getTransactions($from, $to, $systype, $user);
while ($myrow=db_fetch($trans))
{
- $rep->TextCol(0, 1, sql2date(
$myrow['stamp']
));
+ $rep->TextCol(0, 1, sql2date(
date("Y-m-d", $myrow['unix_stamp'])
));
if (user_date_format() == 0)
$rep->TextCol(1, 2, date("h:i:s a", $myrow['unix_stamp']));
else
if (user_date_format() == 0)
$rep->TextCol(1, 2, date("h:i:s a", $myrow['unix_stamp']));
else