X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=484ba459f5364dd90155332cee6c0a360641a9d1;hb=0489317205141deaecefe3a7243d11a3e38a51d0;hp=53738843364d6462b6227b6ba5018933363bff8e;hpb=c2d46f57e3b3becc9dceaa02a43cf85fd8c8789a;p=fa-stable.git diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php index 53738843..484ba459 100644 --- a/gl/inquiry/gl_trial_balance.php +++ b/gl/inquiry/gl_trial_balance.php @@ -46,7 +46,7 @@ function gl_inquiry_controls() start_table(TABLESTYLE_NOBORDER); - date_cells(_("From:"), 'TransFromDate', '', null, -30); + date_cells(_("From:"), 'TransFromDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days()); date_cells(_("To:"), 'TransToDate'); if ($dim >= 1) dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1); @@ -65,33 +65,31 @@ function gl_inquiry_controls() function display_trial_balance($type, $typename) { global $path_to_root; - + global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal; $printtitle = 0; //Flag for printing type name $k = 0; - //$accounts = get_gl_accounts(); //Get Accounts directly under this group/type - $accounts = get_gl_accounts(null, null, $type); - + $accounts = get_gl_accounts(null, null, $type); + $begin = get_fiscalyear_begin_for_date($_POST['TransFromDate']); - //$begin = begin_fiscalyear(); if (date1_greater_date2($begin, $_POST['TransFromDate'])) $begin = $_POST['TransFromDate']; $begin = add_days($begin, -1); - + while ($account = db_fetch($accounts)) { //Print Type Title if it has atleast one non-zero account if (!$printtitle) - { + { start_row("class='inquirybg' style='font-weight:bold'"); label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8"); - end_row(); - $printtitle = 1; - } - + end_row(); + $printtitle = 1; + } + $prev = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransFromDate'], false, false); $curr = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $_POST['TransFromDate'], $_POST['TransToDate'], true, true); $tot = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $_POST['TransToDate'], false, true); @@ -108,7 +106,7 @@ function display_trial_balance($type, $typename) display_debit_or_credit_cells($prev['balance']); display_debit_or_credit_cells($curr['balance']); display_debit_or_credit_cells($tot['balance']); - + } else { @@ -140,8 +138,9 @@ function display_trial_balance($type, $typename) { start_row("class='inquirybg' style='font-weight:bold'"); label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8"); - end_row(); - $printtitle = 1; + end_row(); + $printtitle = 1; + } display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')'); } @@ -159,8 +158,8 @@ if (isset($_POST['TransFromDate'])) display_error(_("The from date cannot be bigger than the fiscal year end.")); set_focus('TransFromDate'); return; - } -} + } +} div_start('balance_tbl'); if (!isset($_POST['Dimension'])) $_POST['Dimension'] = 0;