New files from unstable branch

[fa-stable.git] / gl / inquiry / journal_inquiry.php

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index 3ceb3241e36902e2cec9d49986f0f3b440055147..dccef78f5c568c503730cb8c06bedfc5504eb6cc 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -39,7 +39,7 @@ if (!isset($_POST['filterType']))
 
 start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 
 ref_cells(_("Reference:"), 'Ref', '',null, _('Enter reference fragment or leave empty'));
@@ -80,9 +80,9 @@ function gl_link($row)
 }
 
 $editors = array(
-       0 => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
-//     1=> Bank Payment,
-//     2=> Bank Deposit,
+       ST_JOURNAL => "/gl/gl_journal.php?ModifyGL=Yes&trans_no=%d&trans_type=%d",
+       ST_BANKPAYMENT => "/gl/gl_bank.php?ModifyPayment=Yes&trans_no=%d&trans_type=%d",
+       ST_BANKDEPOSIT => "/gl/gl_bank.php?ModifyDeposit=Yes&trans_no=%d&trans_type=%d",
 //     4=> Funds Transfer,
    ST_SALESINVOICE => "/sales/customer_invoice.php?ModifyInvoice=%d",
 //   11=>
@@ -112,81 +112,9 @@ function edit_link($row)
                        sprintf($editors[$row["type"]], $row["type_no"], $row["type"]),
                        ICON_EDIT) : '';
 }
-/*
-// Tom Hallman 11 Nov 2009
-// IF(gl.type = 1... statement is for deposits/payments that may not actually result
-// in a deposit, such as when a fix is made.  Without that statement (and the
-// joining of the bank_trans table), the fix deposit/payment amount would show up 
-// incorrectly as only the positive side of the fix.    
-$sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
-       gl.tran_date,
-       gl.type,
-       gl.type_no,
-       refs.reference,
-       IF(gl.type = 1 OR gl.type = 2,
-         bank_trans.amount,
-         SUM(IF(gl.amount>0, gl.amount,0))) as amount,
-       com.memo_,
-       IF(ISNULL(u.user_id),'',u.user_id) as user_id
-       FROM ".TB_PREF."gl_trans as gl
-        LEFT JOIN ".TB_PREF."audit_trail as a ON 
-               (gl.type=a.type AND gl.type_no=a.trans_no)
-        LEFT JOIN ".TB_PREF."comments as com ON 
-               (gl.type=com.type AND gl.type_no=com.id)
-        LEFT JOIN ".TB_PREF."refs as refs ON 
-               (gl.type=refs.type AND gl.type_no=refs.id)
-        LEFT JOIN ".TB_PREF."users as u ON 
-               a.user=u.id
-        LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON 
-               (gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)            
-       WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-       AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
-       AND gl.amount!=0";
-if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-       $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-}      
-if (get_post('filterType') != -1) {
-       $sql .= " AND gl.type=".get_post('filterType');
-}      
-if (!check_value('AlsoClosed')) {
-       $sql .= " AND gl_seq=0";
-}
-$sql .= " GROUP BY gl.type, gl.type_no";
-*/
-
-$sql = "SELECT IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
-       gl.tran_date,
-       gl.type,
-       gl.type_no,
-       refs.reference,
-       SUM(IF(gl.amount>0, gl.amount,0)) as amount,
-       com.memo_,
-       IF(ISNULL(u.user_id),'',u.user_id) as user_id
-       FROM ".TB_PREF."gl_trans as gl
-        LEFT JOIN ".TB_PREF."audit_trail as a ON
-               (gl.type=a.type AND gl.type_no=a.trans_no)
-        LEFT JOIN ".TB_PREF."comments as com ON
-               (gl.type=com.type AND gl.type_no=com.id)
-        LEFT JOIN ".TB_PREF."refs as refs ON
-               (gl.type=refs.type AND gl.type_no=refs.id)
-        LEFT JOIN ".TB_PREF."users as u ON
-               a.user=u.id
-       WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-       AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
-       AND gl.amount!=0";
-if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-       $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-}
-if (isset($_POST['Memo']) && $_POST['Memo'] != "") {
-       $sql .= " AND com.memo_ LIKE '%". $_POST['Memo'] . "%'";
-}
-if (get_post('filterType') != -1) {
-       $sql .= " AND gl.type=".get_post('filterType');
-}
-if (!check_value('AlsoClosed')) {
-       $sql .= " AND gl_seq=0";
-}
-$sql .= " GROUP BY gl.type, gl.type_no";
+
+$sql = get_sql_for_journal_inquiry(get_post('filterType', -1), get_post('FromDate'),
+       get_post('ToDate'), get_post('Ref'), get_post('Memo'), check_value('AlsoClosed'));
 
 $cols = array(
        _("#") => array('fun'=>'journal_pos', 'align'=>'center'),