X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep704.php;h=b584c97c529e1056070defe62127f08143f85577;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=1c6b091f639ff832dc941408accae9fd0805e026;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/reporting/rep704.php b/reporting/rep704.php index 1c6b091f..b584c97c 100644 --- a/reporting/rep704.php +++ b/reporting/rep704.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 2; // ---------------------------------------------------------------- // $ Revision: 2.0 $ @@ -7,16 +16,15 @@ $page_security = 2; // date_: 2005-05-19 // Title: GL Accounts Transactions // ---------------------------------------------------------------- -$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_GL_transactions(); //---------------------------------------------------------------------------------------------------- @@ -25,9 +33,6 @@ function print_GL_transactions() { global $path_to_root; - include_once($path_to_root . "reporting/includes/pdf_report.inc"); - - $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions.pdf", user_pagesize()); $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -40,16 +45,25 @@ function print_GL_transactions() $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"); + + $rep = new FrontReport(_('GL Account Transactions'), "GLAccountTransactions", user_pagesize()); $dec = user_price_dec(); $cols = array(0, 70, 90, 140, 210, 280, 340, 400, 450, 510, 570); @@ -60,12 +74,12 @@ function print_GL_transactions() $aligns = array('left', 'left', 'left', 'left', 'left', 'left', 'right', 'right', 'right'); if ($dim == 2) - $headers = array(_('Type'), _('#'), _('Date'), _('Dimension')." 1", _('Dimension')." 2", + $headers = array(_('Type'), _('#'), _('Date'), _('Dimension')." 1", _('Dimension')." 2", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); - else if ($dim == 1) + elseif ($dim == 1) $headers = array(_('Type'), _('#'), _('Date'), _('Dimension'), "", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); - else + else $headers = array(_('Type'), _('#'), _('Date'), "", "", _('Person/Item'), _('Debit'), _('Credit'), _('Balance')); @@ -93,37 +107,41 @@ function print_GL_transactions() 1 => array('text' => _('Period'), 'from' => $from, 'to' => $to), 2 => array('text' => _('Accounts'),'from' => $fromacc,'to' => $toacc)); } - + $rep->Font(); $rep->Info($params, $cols, $headers, $aligns); $rep->Header(); $accounts = get_gl_accounts($fromacc, $toacc); - while ($account=db_fetch($accounts)) + while ($account=db_fetch($accounts)) { - $begin = begin_fiscalyear(); if (is_account_balancesheet($account["account_code"])) $begin = ""; - elseif ($from < $begin) - $begin = $from; + else + { + $begin = begin_fiscalyear(); + if (date1_greater_date2($begin, $from)) + $begin = $from; + $begin = add_days($begin, -1); + } $prev_balance = get_gl_balance_from_to($begin, $from, $account["account_code"], $dimension, $dimension2); $trans = get_gl_transactions($from, $to, -1, $account['account_code'], $dimension, $dimension2); $rows = db_num_rows($trans); if ($prev_balance == 0.0 && $rows == 0) continue; - $rep->Font('bold'); + $rep->Font('bold'); $rep->TextCol(0, 3, $account['account_code'] . " " . $account['account_name']); $rep->TextCol(3, 5, _('Opening Balance')); if ($prev_balance > 0.0) - $rep->TextCol(6, 7, number_format2(abs($prev_balance), $dec)); + $rep->AmountCol(6, 7, abs($prev_balance), $dec); else - $rep->TextCol(7, 8, number_format2(abs($prev_balance), $dec)); - $rep->Font(); + $rep->AmountCol(7, 8, abs($prev_balance), $dec); + $rep->Font(); $total = $prev_balance; $rep->NewLine(2); - if ($rows > 0) + if ($rows > 0) { while ($myrow=db_fetch($trans)) { @@ -131,19 +149,19 @@ function print_GL_transactions() $rep->TextCol(0, 1, systypes::name($myrow["type"])); $rep->TextCol(1, 2, $myrow['type_no']); - $rep->TextCol(2, 3, sql2date($myrow["tran_date"])); + $rep->DateCol(2, 3, $myrow["tran_date"], true); if ($dim >= 1) $rep->TextCol(3, 4, get_dimension_string($myrow['dimension_id'])); if ($dim > 1) $rep->TextCol(4, 5, get_dimension_string($myrow['dimension2_id'])); $rep->TextCol(5, 6, payment_person_types::person_name($myrow["person_type_id"],$myrow["person_id"], false)); if ($myrow['amount'] > 0.0) - $rep->TextCol(6, 7, number_format2(abs($myrow['amount']), $dec)); - else - $rep->TextCol(7, 8, number_format2(abs($myrow['amount']), $dec)); + $rep->AmountCol(6, 7, abs($myrow['amount']), $dec); + else + $rep->AmountCol(7, 8, abs($myrow['amount']), $dec); $rep->TextCol(8, 9, number_format2($total, $dec)); $rep->NewLine(); - if ($rep->row < $rep->bottomMargin + $rep->lineHeight) + if ($rep->row < $rep->bottomMargin + $rep->lineHeight) { $rep->Line($rep->row - 2); $rep->Header(); @@ -151,13 +169,13 @@ function print_GL_transactions() } $rep->NewLine(); } - $rep->Font('bold'); + $rep->Font('bold'); $rep->TextCol(3, 5, _("Ending Balance")); if ($total > 0.0) - $rep->TextCol(6, 7, number_format2(abs($total), $dec)); + $rep->AmountCol(6, 7, abs($total), $dec); else - $rep->TextCol(7, 8, number_format2(abs($total), $dec)); - $rep->Font(); + $rep->AmountCol(7, 8, abs($total), $dec); + $rep->Font(); $rep->Line($rep->row - $rep->lineHeight + 4); $rep->NewLine(2, 1); }