From: Janusz Dobrowolski Date: Mon, 17 Feb 2020 08:33:37 +0000 (+0100) Subject: GL Account Transactions Report: improved layout when dimension 2 is not used. X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=63ae1f3e711999bb87e02c4a7fdab7fda6c3f5d1 GL Account Transactions Report: improved layout when dimension 2 is not used. --- diff --git a/reporting/rep704.php b/reporting/rep704.php index 443ac071..23a52fca 100644 --- a/reporting/rep704.php +++ b/reporting/rep704.php @@ -71,22 +71,31 @@ 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, 272, 345, 405, 465, 525); - //------------0--1---2---3----4----5----6----7----8----9----10------- - //-----------------------dim1-dim2----------------------------------- - //-----------------------dim1---------------------------------------- - //------------------------------------------------------------------- - $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); - if ($dim == 2) + { + $cols = array(0, 65, 105, 125, 175, 230, 290, 345, 405, 465, 525); + //------------0--1---2----3----4----5----6----7----8----9----10------- + //------------------------dim1-dim2----------------------------------- $headers = array(_('Type'), _('Ref'), _('#'), _('Date'), _('Dimension')." 1", _('Dimension')." 2", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); + } elseif ($dim == 1) + { + $cols = array(0, 65, 105, 125, 175, 230, 230, 345, 405, 465, 525); + //------------0--1---2----3----4----5----6----7----8----9----10------- + //------------------------dim1---------------------------------------- $headers = array(_('Type'), _('Ref'), _('#'), _('Date'), _('Dimension'), "", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); + } else + { + $cols = array(0, 65, 105, 125, 175, 175, 175, 345, 405, 465, 525); + //------------0--1---2----3----4----5----6----7----8----9----10------- + //-------------------------------------------------------------------- $headers = array(_('Type'), _('Ref'), _('#'), _('Date'), "", "", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); + } + $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); if ($dim == 2) {