Show more relevant info in CounterPart Field, Journal Inquiry.

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index feb17f09baa3838bfe80a3ebc01b395ea894cce4..061b915562cb60c3857d2004de4c42d4db141a79 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -606,8 +606,8 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
                gl.tran_date,
                gl.type as trans_type,
                gl.type_no as trans_no,
-               IFNULL(MAX(supp.supp_name), MAX(cust.name)) as name,
-               IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference,
+               IFNULL(MAX(gl.person_id), IFNULL(bt.person_id, dt.debtor_no)) as person_id,
+               IF(ISNULL(st.supp_reference), '', st.supp_reference) AS supp_reference,
                refs.reference,"
                .($dimension ? " -SUM(IF(dim.dimension in(gl.dimension_id,gl.dimension2_id), gl.amount, 0)) as amount,":" SUM(IF(gl.amount>0, gl.amount,0)) as amount,")
                ."com.memo_,
@@ -616,8 +616,9 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
        if ($contractor_id > 0) {
                $sql.= ", st.supplier_id, dt.debtor_no ";
        }
-
-       $sql.= " FROM ".TB_PREF."gl_trans as gl
+    $sql.=", IFNULL(MAX(gl.person_type_id), IFNULL(bt.person_type_id, ".PT_CUSTOMER.")) as person_type_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
@@ -626,11 +627,11 @@ function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $al
                        (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."debtor_trans dt ON dt.type=gl.type AND gl.type_no=dt.trans_no
-                LEFT JOIN ".TB_PREF."debtors_master cust ON gl.person_type_id=2 AND gl.person_id=cust.debtor_no
-                LEFT JOIN ".TB_PREF."supp_trans st ON st.type=gl.type AND gl.type_no=st.trans_no
-                LEFT JOIN ".TB_PREF."suppliers supp ON gl.person_type_id=3 AND gl.person_id=supp.supplier_id"
-                .($dimension ? 
+         LEFT JOIN ".TB_PREF."bank_trans bt ON bt.type=gl.type AND bt.trans_no=gl.type_no AND bt.amount!=0
+                 AND (bt.person_id != '' AND !ISNULL(bt.person_id))
+                LEFT JOIN ".TB_PREF."debtor_trans dt ON dt.type=gl.type AND gl.type_no=dt.trans_no
+         LEFT JOIN ".TB_PREF."supp_trans st ON st.type=gl.type AND gl.type_no=st.trans_no "
+                .($dimension ? 
                 " LEFT JOIN (SELECT type, type_no, MAX(IFNULL(dimension_id, dimension2_id)) dimension FROM ".TB_PREF."gl_trans GROUP BY type, type_no) dim 
                                ON gl.type=dim.type AND gl.type_no=dim.type_no" : '')
                ." WHERE gl.tran_date >= '" . date2sql($from) . "'

diff --git a/gl/inquiry/journal_inquiry.php b/gl/inquiry/journal_inquiry.php
index f008b94b8cfc70881e6ed9bec61fa717859b150c..b525374b76345dac05d3f74794b3fbc57c2f3865 100644 (file)
--- a/gl/inquiry/journal_inquiry.php
+++ b/gl/inquiry/journal_inquiry.php
@@ -71,6 +71,11 @@ function systype_name($dummy, $type)
        return $systypes_array[$type];
 }
 
+function person_link($row) 
+{
+    return payment_person_name($row["person_type_id"],$row["person_id"]);
+}
+
 function view_link($row) 
 {
        return get_trans_view_str($row["trans_type"], $row["trans_no"]);
@@ -108,7 +113,7 @@ $cols = array(
        _("Date") =>array('name'=>'tran_date','type'=>'date','ord'=>'desc'),
        _("Type") => array('fun'=>'systype_name'), 
        _("Trans #") => array('fun'=>'view_link'), 
-       _("Counterparty") => array('ord' => ''),
+       _("Counterparty") => array('fun' => 'person_link'),
        _("Supplier's Reference") => 'skip',
        _("Reference"), 
        _("Amount") => array('type'=>'amount'),