X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep704.php;h=f62b2d192bc98d412ce4b2816dda1ba0df19a707;hb=40e5dda3847073d8f86c558eafbbc5372133bedd;hp=1703ed0a81762b1696ba698c12d3cee3dcd3407d;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git diff --git a/reporting/rep704.php b/reporting/rep704.php index 1703ed0a..f62b2d19 100644 --- a/reporting/rep704.php +++ b/reporting/rep704.php @@ -49,7 +49,7 @@ function print_GL_transactions() $orientation = $_POST['PARAM_7']; $destination = $_POST['PARAM_8']; } - else if ($dim == 1) + elseif ($dim == 1) { $dimension = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; @@ -71,23 +71,31 @@ function print_GL_transactions() $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize(), 9, $orientation); $dec = user_price_dec(); - //$cols = array(0, 80, 100, 150, 210, 280, 340, 400, 450, 510, 570); - $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----------------------------------- - //-----------------------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, 260, 260, 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) { @@ -99,7 +107,7 @@ function print_GL_transactions() 4 => array('text' => _('Dimension')." 2", 'from' => get_dimension_string($dimension2), 'to' => '')); } - else if ($dim == 1) + elseif ($dim == 1) { $params = array( 0 => $comments, 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to),