Purchase Order Delivery does not show the Supplier name in GL transactions report...

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index db34a5eeb8f20f206e87df7e1336979ec034cc57..5b54874a2ec2beaf513a945a96b1867787098c31 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -124,7 +124,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                        LEFT JOIN ".TB_PREF."voided v ON gl.type_no=v.id AND v.type=gl.type
 
                        LEFT JOIN ".TB_PREF."supp_trans st ON gl.type_no=st.trans_no AND st.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=st.supplier_id)
-                       LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE." AND gl.person_id=grn.supplier_id
+                       LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=gl.type_no AND gl.type=".ST_SUPPRECEIVE."
                        LEFT JOIN ".TB_PREF."debtor_trans dt ON gl.type_no=dt.trans_no AND dt.type=gl.type AND (gl.type!=".ST_JOURNAL." OR gl.person_id=dt.debtor_no)
 
                        LEFT JOIN ".TB_PREF."suppliers sup ON st.supplier_id=sup.supplier_id OR grn.supplier_id=sup.supplier_id

diff --git a/reporting/rep704.php b/reporting/rep704.php
index 65ea8d09d47a3ca5d7c5def61ae4e4df8a681e6b..443ac0715911222cd17c58d6a47c33fda0225a48 100644 (file)
--- a/reporting/rep704.php
+++ b/reporting/rep704.php
@@ -71,7 +71,7 @@ function print_GL_transactions()
        $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize(), 9, $orientation);
        $dec = user_price_dec();
 
-       $cols = array(0, 65, 105, 125, 175, 230, 290, 345, 405, 465, 525);
+       $cols = array(0, 65, 105, 125, 175, 230, 272, 345, 405, 465, 525);
        //------------0--1---2---3----4----5----6----7----8----9----10-------
        //-----------------------dim1-dim2-----------------------------------
        //-----------------------dim1----------------------------------------