X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep708.php;h=1da9ce2a39bc7dfd796398c388b0b5ce80df15fd;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=6f3086b534c49c517e724a229cbc06bae9b694ae;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/reporting/rep708.php b/reporting/rep708.php index 6f3086b5..1da9ce2a 100644 --- a/reporting/rep708.php +++ b/reporting/rep708.php @@ -9,7 +9,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 2; +$page_security = 'SA_GLANALYTIC'; // ---------------------------------------------------------------- // $ Revision: 2.0 $ // Creator: Joe Hunt @@ -19,49 +19,130 @@ $page_security = 2; $path_to_root=".."; include_once($path_to_root . "/includes/session.inc"); +include_once($path_to_root . "/admin/db/fiscalyears_db.inc"); +include_once($path_to_root . "/includes/ui.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"); -//---------------------------------------------------------------------------------------------------- - -print_trial_balance(); +$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0; //---------------------------------------------------------------------------------------------------- -function get_balance($account, $dimension, $dimension2, $from, $to, $from_incl=true, $to_incl=true) + +function display_type ($type, $typename, &$dec, &$rep, $from, $to, $zero, $balances, $dimension, $dimension2) { - $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) as debit, SUM(IF(amount < 0, -amount, 0)) as credit, SUM(amount) as balance - FROM ".TB_PREF."gl_trans,".TB_PREF."chart_master,".TB_PREF."chart_types, ".TB_PREF."chart_class - WHERE ".TB_PREF."gl_trans.account=".TB_PREF."chart_master.account_code AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id - AND ".TB_PREF."chart_types.class_id=".TB_PREF."chart_class.cid AND"; + global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal, $SysPrefs; + + $printtitle = 0; //Flag for printing type name + + //Get Accounts directly under this group/type + $accounts = get_gl_accounts(null, null, $type); + + $begin = get_fiscalyear_begin_for_date($from); + if (date1_greater_date2($begin, $from)) + $begin = $from; + $begin = add_days($begin, -1); + while ($account=db_fetch($accounts)) + { + //Print Type Title if it has atleast one non-zero account + if (!$printtitle) + { + $rep->row -= 4; + $rep->TextCol(0, 8, _("Group")." - ".$type ." - ".$typename); + $printtitle = 1; + $rep->row -= 4; + $rep->Line($rep->row); + $rep->NewLine(); + } - if ($account != null) - $sql .= " account='$account' AND"; - if ($dimension > 0) - $sql .= " dimension_id=$dimension AND"; - if ($dimension2 > 0) - $sql .= " dimension2_id=$dimension2 AND"; - $from_date = date2sql($from); - if ($from_incl) - $sql .= " tran_date >= '$from_date' AND"; - else - $sql .= " tran_date > IF(".TB_PREF."chart_class.balance_sheet=1, '0000-00-00', '$from_date') AND"; - $to_date = date2sql($to); - if ($to_incl) - $sql .= " tran_date <= '$to_date' "; - else - $sql .= " tran_date < '$to_date' "; + // FA doesn't really clear the closed year, therefore the brought forward balance includes all the transactions from the past, even though the balance is null. + // If we want to remove the balanced part for the past years, this option removes the common part from from the prev and tot figures. + if (@$SysPrefs->clear_trial_balance_opening) + { + $open = get_balance($account["account_code"], $dimension, $dimension2, $begin, $begin, false, true); + $offset = min($open['debit'], $open['credit']); + } else + $offset = 0; + + $prev = get_balance($account["account_code"], $dimension, $dimension2, $begin, $from, false, false); + $curr = get_balance($account["account_code"], $dimension, $dimension2, $from, $to, true, true); + $tot = get_balance($account["account_code"], $dimension, $dimension2, $begin, $to, false, true); + + if ($zero == 0 && !$prev['balance'] && !$curr['balance'] && !$tot['balance']) + continue; + $rep->TextCol(0, 1, $account['account_code']); + $rep->TextCol(1, 2, $account['account_name']); + if ($balances != 0) + { + if ($prev['balance'] >= 0.0) + $rep->AmountCol(2, 3, $prev['balance'], $dec); + else + $rep->AmountCol(3, 4, abs($prev['balance']), $dec); + if ($curr['balance'] >= 0.0) + $rep->AmountCol(4, 5, $curr['balance'], $dec); + else + $rep->AmountCol(5, 6, abs($curr['balance']), $dec); + if ($tot['balance'] >= 0.0) + $rep->AmountCol(6, 7, $tot['balance'], $dec); + else + $rep->AmountCol(7, 8, abs($tot['balance']), $dec); + } + else + { + $rep->AmountCol(2, 3, $prev['debit']-$offset, $dec); + $rep->AmountCol(3, 4, $prev['credit']-$offset, $dec); + $rep->AmountCol(4, 5, $curr['debit'], $dec); + $rep->AmountCol(5, 6, $curr['credit'], $dec); + $rep->AmountCol(6, 7, $tot['debit']-$offset, $dec); + $rep->AmountCol(7, 8, $tot['credit']-$offset, $dec); + $pdeb += $prev['debit']-$offset; + $pcre += $prev['credit']-$offset; + $cdeb += $curr['debit']; + $ccre += $curr['credit']; + $tdeb += $tot['debit']-$offset; + $tcre += $tot['credit']-$offset; + } - $result = db_query($sql,"No general ledger accounts were returned"); + $pbal += $prev['balance']; + $cbal += $curr['balance']; + $tbal += $tot['balance']; + $rep->NewLine(); - return db_fetch($result); + if ($rep->row < $rep->bottomMargin + $rep->lineHeight) + { + $rep->Line($rep->row - 2); + $rep->NewPage(); + } + } + + //Get Account groups/types under this group/type + $result = get_account_types(false, false, $type); + while ($accounttype=db_fetch($result)) + { + //Print Type Title if has sub types and not previously printed + if (!$printtitle) + { + $rep->row -= 4; + $rep->TextCol(0, 8, _("Group")." - ".$type ." - ".$typename); + $printtitle = 1; + $rep->row -= 4; + $rep->Line($rep->row); + $rep->NewLine(); + } + display_type($accounttype["id"], $accounttype["name"].' ('.$typename.')', $dec, $rep, $from, $to, $zero, $balances, $dimension, $dimension2); + } } //---------------------------------------------------------------------------------------------------- +print_trial_balance(); + +//---------------------------------------------------------------------------------------------------- + function print_trial_balance() { global $path_to_root; + global $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal; $dim = get_company_pref('use_dimension'); $dimension = $dimension2 = 0; @@ -75,26 +156,29 @@ function print_trial_balance() $dimension = $_POST['PARAM_4']; $dimension2 = $_POST['PARAM_5']; $comments = $_POST['PARAM_6']; - $destination = $_POST['PARAM_7']; + $orientation = $_POST['PARAM_7']; + $destination = $_POST['PARAM_8']; } else if ($dim == 1) { $dimension = $_POST['PARAM_4']; $comments = $_POST['PARAM_5']; - $destination = $_POST['PARAM_6']; + $orientation = $_POST['PARAM_6']; + $destination = $_POST['PARAM_7']; } else { $comments = $_POST['PARAM_4']; - $destination = $_POST['PARAM_5']; + $orientation = $_POST['PARAM_5']; + $destination = $_POST['PARAM_6']; } if ($destination) include_once($path_to_root . "/reporting/includes/excel_report.inc"); else include_once($path_to_root . "/reporting/includes/pdf_report.inc"); + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); - //$cols2 = array(0, 50, 230, 330, 430, 530); $cols2 = array(0, 50, 190, 310, 430, 530); //-------------0--1---2----3----4----5-- @@ -102,9 +186,8 @@ function print_trial_balance() $aligns2 = array('left', 'left', 'left', 'left', 'left'); - //$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-- + //------------0--1---2----3----4----5----6----7----8-- $headers = array(_('Account'), _('Account Name'), _('Debit'), _('Credit'), _('Debit'), _('Credit'), _('Debit'), _('Credit')); @@ -120,7 +203,7 @@ function print_trial_balance() 3 => 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), @@ -133,79 +216,38 @@ function print_trial_balance() 1 => array('text' => _('Period'),'from' => $from, 'to' => $to)); } - $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize()); + $rep = new FrontReport(_('Trial Balance'), "TrialBalance", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + { + recalculate_cols($cols); + recalculate_cols($cols2); + } $rep->Font(); $rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2); - $rep->Header(); - - $accounts = get_gl_accounts(); + $rep->NewPage(); - $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0; - $begin = begin_fiscalyear(); - if (date1_greater_date2($begin, $from)) - $begin = $from; - $begin = add_days($begin, -1); - while ($account=db_fetch($accounts)) + $classresult = get_account_classes(false); + while ($class = db_fetch($classresult)) { - $prev = get_balance($account["account_code"], $dimension, $dimension2, $begin, $from, false, false); - $curr = get_balance($account["account_code"], $dimension, $dimension2, $from, $to, true, true); - $tot = get_balance($account["account_code"], $dimension, $dimension2, $begin, $to, false, true); - - if ($zero == 0 && !$prev['balance'] && !$curr['balance'] && !$tot['balance']) - continue; - $rep->TextCol(0, 1, $account['account_code']); - $rep->TextCol(1, 2, $account['account_name']); - if ($balances != 0) - { - if ($prev['balance'] >= 0.0) - $rep->AmountCol(2, 3, $prev['balance'], $dec); - else - $rep->AmountCol(3, 4, abs($prev['balance']), $dec); - if ($curr['balance'] >= 0.0) - $rep->AmountCol(4, 5, $curr['balance'], $dec); - else - $rep->AmountCol(5, 6, abs($curr['balance']), $dec); - if ($tot['balance'] >= 0.0) - $rep->AmountCol(6, 7, $tot['balance'], $dec); - else - $rep->AmountCol(7, 8, abs($tot['balance']), $dec); - } - else - { - $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->Font('bold'); + $rep->TextCol(0, 1, $class['cid']); + $rep->TextCol(1, 4, $class['class_name']); + $rep->Font(); $rep->NewLine(); - if ($rep->row < $rep->bottomMargin + $rep->lineHeight) + //Get Account groups/types under this group/type with no parents + $typeresult = get_account_types(false, $class['cid'], -1); + while ($accounttype=db_fetch($typeresult)) { - $rep->Line($rep->row - 2); - $rep->Header(); + display_type($accounttype["id"], $accounttype["name"], $dec, $rep, $from, $to, $zero, $balances, $dimension, $dimension2); } + $rep->NewLine(); } $rep->Line($rep->row); $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); - if ($balances == 0) { $rep->TextCol(0, 2, _("Total")); @@ -232,10 +274,14 @@ function print_trial_balance() else $rep->AmountCol(7, 8, abs($tbal), $dec); $rep->NewLine(); - - $rep->Line($rep->row); - + + $rep->Line($rep->row + 10); + if (($pbal = round2($pbal, $dec)) != 0.0 && $dimension == 0 && $dimension2 == 0) + { + $rep->NewLine(2); + $rep->Font(); + $rep->TextCol(0, 8, _("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear.")); + } $rep->End(); } -?> \ No newline at end of file