X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep710.php;h=9db53e60b46324e6c7d9fea9705f3063f2392a88;hb=a41fc3d75af89ab616e17ec42a116fcf201e5040;hp=9c1df5f16e6d39f8cdcec49fec743b7bea0a2bc9;hpb=b42adf7edd906956a0f9cf21c0ec2b66007b9585;p=fa-stable.git diff --git a/reporting/rep710.php b/reporting/rep710.php index 9c1df5f1..9db53e60 100644 --- a/reporting/rep710.php +++ b/reporting/rep710.php @@ -9,12 +9,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 15; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt // date_: 2005-05-19 -// Title: List of Journal Entries +// Title: Audit Trail // ---------------------------------------------------------------- $path_to_root=".."; @@ -30,44 +30,46 @@ print_audit_trail(); function getTransactions($from, $to, $type, $user) { - $fromdate = date2sql($from); - $todate = date2sql($to); - - $sql = "SELECT ".TB_PREF."audit_trail.*, ".TB_PREF."gl_trans.tran_date, - SUM(IF(".TB_PREF."gl_trans.amount > 0, ".TB_PREF."gl_trans.amount, 0)) AS amount, - ".TB_PREF."users.user_id, - UNIX_TIMESTAMP(".TB_PREF."audit_trail.stamp) as unix_stamp - FROM ".TB_PREF."audit_trail, ".TB_PREF."gl_trans, ".TB_PREF."users - WHERE ".TB_PREF."audit_trail.type = ".TB_PREF."gl_trans.type - AND ".TB_PREF."audit_trail.trans_no = ".TB_PREF."gl_trans.type_no - AND ".TB_PREF."audit_trail.user = ".TB_PREF."users.id "; + $fromdate = date2sql($from) . " 00:00:00"; + $todate = date2sql($to). " 23:59.59"; + + $sql = "SELECT a.*, + SUM(IF(ISNULL(g.amount), NULL, IF(g.amount > 0, g.amount, 0))) AS amount, + u.user_id, + 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 + AND g.type=a.type) + WHERE a.user = u.id "; if ($type != -1) - $sql .= "AND ".TB_PREF."gl_trans.type=$type "; + $sql .= "AND a.type=$type "; if ($user != -1) - $sql .= "AND ".TB_PREF."audit_trail.user='$user' "; - $sql .= "AND DATE(".TB_PREF."audit_trail.stamp) >= '$fromdate' - AND DATE(".TB_PREF."audit_trail.stamp) <= '$todate' - GROUP BY ".TB_PREF."gl_trans.type_no,".TB_PREF."audit_trail.gl_seq,".TB_PREF."audit_trail.stamp - ORDER BY ".TB_PREF."audit_trail.stamp,".TB_PREF."audit_trail.gl_seq"; + $sql .= "AND a.user='$user' "; + $sql .= "AND a.stamp >= '$fromdate' + AND a.stamp <= '$todate' + GROUP BY a.trans_no,a.gl_seq,a.stamp + ORDER BY a.stamp,a.gl_seq"; return db_query($sql,"No transactions were returned"); } //---------------------------------------------------------------------------------------------------- function print_audit_trail() { - global $path_to_root; + global $path_to_root, $systypes_array; $from = $_POST['PARAM_0']; $to = $_POST['PARAM_1']; $systype = $_POST['PARAM_2']; $user = $_POST['PARAM_3']; $comments = $_POST['PARAM_4']; - $destination = $_POST['PARAM_5']; + $orientation = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); $cols = array(0, 60, 120, 180, 240, 340, 400, 460, 520); @@ -78,41 +80,52 @@ function print_audit_trail() $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'left', 'right'); $usr = get_user($user); - $user_id = $usr['user_id']; + $user_id = isset($usr['user_id']) ? $usr['user_id'] : ""; $params = array( 0 => $comments, 1 => array('text' => _('Period'), 'from' => $from,'to' => $to), - 2 => array('text' => _('Type'), 'from' => ($systype != -1 ? systypes::name($systype) : _('All')), 'to' => ''), + 2 => array('text' => _('Type'), 'from' => ($systype != -1 ? $systypes_array[$systype] : _('All')), 'to' => ''), 3 => array('text' => _('User'), 'from' => ($user != -1 ? $user_id : _('All')), 'to' => '')); - $rep = new FrontReport(_('Audit Trail'), "AuditTrail", user_pagesize()); + $rep = new FrontReport(_('Audit Trail'), "AuditTrail", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); - $rep->Header(); + $rep->NewPage(); $trans = getTransactions($from, $to, $systype, $user); + $tot_amount = 0; 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 $rep->TextCol(1, 2, date("H:i:s", $myrow['unix_stamp'])); $rep->TextCol(2, 3, $myrow['user_id']); - $rep->TextCol(3, 4, sql2date($myrow['tran_date'])); - $rep->TextCol(4, 5, systypes::name($myrow['type'])); + $rep->TextCol(3, 4, sql2date($myrow['gl_date'])); + $rep->TextCol(4, 5, $systypes_array[$myrow['type']]); $rep->TextCol(5, 6, $myrow['trans_no']); if ($myrow['gl_seq'] == null) $action = _('Changed'); else $action = _('Closed'); $rep->TextCol(6, 7, $action); - $rep->AmountCol(7, 8, $myrow['amount'], $dec); + if ($myrow['amount'] != null) { + $rep->AmountCol(7, 8, $myrow['amount'], $dec); + if ($systype != -1) + $tot_amount += $myrow['amount']; + } $rep->NewLine(1, 2); } $rep->Line($rep->row + 4); + if ($systype != -1) { + $rep->NewLine(1, 2); + $rep->TextCol(6, 7, _('Total')); + $rep->AmountCol(7, 8, $tot_amount, $dec); + } $rep->End(); } -?> \ No newline at end of file