X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep708.php;h=6f3086b534c49c517e724a229cbc06bae9b694ae;hb=442abe96c0cf185541d2e3710a6f037ea7cab041;hp=2c8ebb32084c0c9fd81a5f754eb1a72d425446d2;hpb=9fc1f546b1ce0e6a674f595ee6dae616d94a5873;p=fa-stable.git diff --git a/reporting/rep708.php b/reporting/rep708.php index 2c8ebb32..6f3086b5 100644 --- a/reporting/rep708.php +++ b/reporting/rep708.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -7,16 +16,15 @@ $page_security = 2; // date_: 2005-05-19 // Title: Trial Balance // ---------------------------------------------------------------- -$path_to_root="../"; +$path_to_root=".."; -include_once($path_to_root . "includes/session.inc"); -include_once($path_to_root . "includes/date_functions.inc"); -include_once($path_to_root . "includes/data_checks.inc"); -include_once($path_to_root . "gl/includes/gl_db.inc"); +include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/includes/date_functions.inc"); +include_once($path_to_root . "/includes/data_checks.inc"); +include_once($path_to_root . "/gl/includes/gl_db.inc"); //---------------------------------------------------------------------------------------------------- -// trial_inquiry_controls(); print_trial_balance(); //---------------------------------------------------------------------------------------------------- @@ -55,7 +63,6 @@ function print_trial_balance() { global $path_to_root; - include_once($path_to_root . "reporting/includes/pdf_report.inc"); $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -68,26 +75,35 @@ function print_trial_balance() $dimension = $_POST['PARAM_4']; $dimension2 = $_POST['PARAM_5']; $comments = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; } else if ($dim == 1) { $dimension = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; } else { $comments = $_POST['PARAM_4']; + $destination = $_POST['PARAM_5']; } + if ($destination) + include_once($path_to_root . "/reporting/includes/excel_report.inc"); + else + include_once($path_to_root . "/reporting/includes/pdf_report.inc"); $dec = user_price_dec(); - $cols2 = array(0, 50, 230, 330, 430, 530); + //$cols2 = array(0, 50, 230, 330, 430, 530); + $cols2 = array(0, 50, 190, 310, 430, 530); //-------------0--1---2----3----4----5-- $headers2 = array('', '', _('Brought Forward'), _('This Period'), _('Balance')); $aligns2 = array('left', 'left', 'left', 'left', 'left'); - $cols = array(0, 50, 200, 250, 300, 350, 400, 450, 500, 550); + //$cols = array(0, 50, 200, 250, 300, 350, 400, 450, 500, 550); + $cols = array(0, 50, 150, 210, 270, 330, 390, 450, 510, 570); //------------0--1---2----3----4----5----6----7----8----9-- $headers = array(_('Account'), _('Account Name'), _('Debit'), _('Credit'), _('Debit'), @@ -117,7 +133,7 @@ function print_trial_balance() 1 => array('text' => _('Period'),'from' => $from, 'to' => $to)); } - $rep = new FrontReport(_('Trial Balance'), "TrialBalance.pdf", user_pagesize()); + $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize()); $rep->Font(); $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2); @@ -125,6 +141,7 @@ function print_trial_balance() $accounts = get_gl_accounts(); + $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0; $begin = begin_fiscalyear(); if (date1_greater_date2($begin, $from)) $begin = $from; @@ -142,27 +159,37 @@ function print_trial_balance() if ($balances != 0) { if ($prev['balance'] >= 0.0) - $rep->TextCol(2, 3, number_format2($prev['balance'], $dec)); + $rep->AmountCol(2, 3, $prev['balance'], $dec); else - $rep->TextCol(3, 4, number_format2(abs($prev['balance']), $dec)); + $rep->AmountCol(3, 4, abs($prev['balance']), $dec); if ($curr['balance'] >= 0.0) - $rep->TextCol(4, 5, number_format2($curr['balance'], $dec)); + $rep->AmountCol(4, 5, $curr['balance'], $dec); else - $rep->TextCol(5, 6, number_format2(abs($curr['balance']), $dec)); + $rep->AmountCol(5, 6, abs($curr['balance']), $dec); if ($tot['balance'] >= 0.0) - $rep->TextCol(6, 7, number_format2($tot['balance'], $dec)); + $rep->AmountCol(6, 7, $tot['balance'], $dec); else - $rep->TextCol(7, 8, number_format2(abs($tot['balance']), $dec)); + $rep->AmountCol(7, 8, abs($tot['balance']), $dec); } else { - $rep->TextCol(2, 3, number_format2($prev['debit'], $dec)); - $rep->TextCol(3, 4, number_format2($prev['credit'], $dec)); - $rep->TextCol(4, 5, number_format2($curr['debit'], $dec)); - $rep->TextCol(5, 6, number_format2($curr['credit'], $dec)); - $rep->TextCol(6, 7, number_format2($tot['debit'], $dec)); - $rep->TextCol(7, 8, number_format2($tot['credit'], $dec)); + $rep->AmountCol(2, 3, $prev['debit'], $dec); + $rep->AmountCol(3, 4, $prev['credit'], $dec); + $rep->AmountCol(4, 5, $curr['debit'], $dec); + $rep->AmountCol(5, 6, $curr['credit'], $dec); + $rep->AmountCol(6, 7, $tot['debit'], $dec); + $rep->AmountCol(7, 8, $tot['credit'], $dec); + $pdeb += $prev['debit']; + $pcre += $prev['credit']; + $cdeb += $curr['debit']; + $ccre += $curr['credit']; + $tdeb += $tot['debit']; + $tcre += $tot['credit']; + } + $pbal += $prev['balance']; + $cbal += $curr['balance']; + $tbal += $tot['balance']; $rep->NewLine(); if ($rep->row < $rep->bottomMargin + $rep->lineHeight) @@ -175,37 +202,38 @@ function print_trial_balance() $rep->NewLine(); $rep->Font('bold'); - $prev = get_balance(null, $dimension, $dimension2, $begin, $from, false, false); - $curr = get_balance(null, $dimension, $dimension2, $from, $to, true, true); - $tot = get_balance(null, $dimension, $dimension2, $begin, $to, false, true); + //$prev = get_balance(null, $dimension, $dimension2, $begin, $from, false, false); + //$curr = get_balance(null, $dimension, $dimension2, $from, $to, true, true); + //$tot = get_balance(null, $dimension, $dimension2, $begin, $to, false, true); if ($balances == 0) { $rep->TextCol(0, 2, _("Total")); - $rep->TextCol(2, 3, number_format2($prev['debit'], $dec)); - $rep->TextCol(3, 4, number_format2($prev['credit'], $dec)); - $rep->TextCol(4, 5, number_format2($curr['debit'], $dec)); - $rep->TextCol(5, 6, number_format2($curr['credit'], $dec)); - $rep->TextCol(6, 7, number_format2($tot['debit'], $dec)); - $rep->TextCol(7, 8, number_format2($tot['credit'], $dec)); + $rep->AmountCol(2, 3, $pdeb, $dec); + $rep->AmountCol(3, 4, $pcre, $dec); + $rep->AmountCol(4, 5, $cdeb, $dec); + $rep->AmountCol(5, 6, $ccre, $dec); + $rep->AmountCol(6, 7, $tdeb, $dec); + $rep->AmountCol(7, 8, $tcre, $dec); $rep->NewLine(); } $rep->TextCol(0, 2, _("Ending Balance")); - if ($prev['balance'] >= 0.0) - $rep->TextCol(2, 3, number_format2($prev['balance'], $dec)); + if ($pbal >= 0.0) + $rep->AmountCol(2, 3, $pbal, $dec); else - $rep->TextCol(3, 4, number_format2(abs($prev['balance']), $dec)); - if ($curr['balance'] >= 0.0) - $rep->TextCol(4, 5, number_format2($curr['balance'], $dec)); + $rep->AmountCol(3, 4, abs($pbal), $dec); + if ($cbal >= 0.0) + $rep->AmountCol(4, 5, $cbal, $dec); else - $rep->TextCol(5, 6, number_format2(abs($curr['balance']), $dec)); - if ($tot['balance'] >= 0.0) - $rep->TextCol(6, 7, number_format2($tot['balance'], $dec)); + $rep->AmountCol(5, 6, abs($cbal), $dec); + if ($tbal >= 0.0) + $rep->AmountCol(6, 7, $tbal, $dec); else - $rep->TextCol(7, 8, number_format2(abs($tot['balance']), $dec)); + $rep->AmountCol(7, 8, abs($tbal), $dec); + $rep->NewLine(); - $rep->Line($rep->row - 6); + $rep->Line($rep->row); $rep->End(); }