X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=0ca22c2e5bc592f2f45e8ffd4cb4f98bf95b359b;hb=4e6811018489ed5d9e4c029342c958e266d7b298;hp=c0a3e56ab1c15108466eb271e9c8250a5bf252eb;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index c0a3e56a..0ca22c2e 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -27,6 +27,9 @@ if ($use_date_picker)
page(_($help_context = "Trial Balance"), false, false, "", $js);
+$k = 0;
+$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
+
//----------------------------------------------------------------------------------------------------
// Ajax updates
//
@@ -43,7 +46,12 @@ function gl_inquiry_controls()
start_table(TABLESTYLE_NOBORDER);
- date_cells(_("From:"), 'TransFromDate', '', null, -30);
+ $date = today();
+ if (!isset($_POST['TransFromDate']))
+ $_POST['TransFromDate'] = begin_month($date);
+ if (!isset($_POST['TransToDate']))
+ $_POST['TransToDate'] = end_month($date);
+ date_cells(_("From:"), 'TransFromDate');
date_cells(_("To:"), 'TransToDate');
if ($dim >= 1)
dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
@@ -59,54 +67,45 @@ function gl_inquiry_controls()
//----------------------------------------------------------------------------------------------------
-function display_trial_balance()
+function display_trial_balance($type, $typename)
{
- global $path_to_root;
-
- if (isset($_POST['TransFromDate']))
- {
- $row = get_current_fiscalyear();
- if (date1_greater_date2($_POST['TransFromDate'], sql2date($row['end'])))
- {
- 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;
- if (!isset($_POST['Dimension2']))
- $_POST['Dimension2'] = 0;
- start_table(TABLESTYLE);
- $tableheader = "
-
-
-
-
-
-
-
-
-
-
-
-
-
";
-
- echo $tableheader;
+ global $path_to_root, $clear_trial_balance_opening;
+
+ global $k, $pdeb, $pcre, $cdeb, $ccre, $tdeb, $tcre, $pbal, $cbal, $tbal;
+ $printtitle = 0; //Flag for printing type name
$k = 0;
- $accounts = get_gl_accounts();
- $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
- $begin = begin_fiscalyear();
+ //$accounts = get_gl_accounts();
+ //Get Accounts directly under this group/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;
+ }
+
+ // 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 (@$clear_trial_balance_opening)
+ {
+ $open = get_balance($account["account_code"], $_POST['Dimension'], $_POST['Dimension2'], $begin, $begin, false, true);
+ $offset = min($open['debit'], $open['credit']);
+ } else
+ $offset = 0;
+
$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);
@@ -127,12 +126,12 @@ function display_trial_balance()
}
else
{
- amount_cell($prev['debit']);
- amount_cell($prev['credit']);
+ amount_cell($prev['debit']-$offset);
+ amount_cell($prev['credit']-$offset);
amount_cell($curr['debit']);
amount_cell($curr['credit']);
- amount_cell($tot['debit']);
- amount_cell($tot['credit']);
+ amount_cell($tot['debit']-$offset);
+ amount_cell($tot['credit']-$offset);
$pdeb += $prev['debit'];
$pcre += $prev['credit'];
$cdeb += $curr['debit'];
@@ -146,6 +145,76 @@ function display_trial_balance()
end_row();
}
+ //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)
+ {
+ start_row("class='inquirybg' style='font-weight:bold'");
+ label_cell(_("Group")." - ".$type ." - ".$typename, "colspan=8");
+ end_row();
+ $printtitle = 1;
+ }
+ display_trial_balance($accounttype["id"], $accounttype["name"].' ('.$typename.')');
+ }
+}
+
+//----------------------------------------------------------------------------------------------------
+
+gl_inquiry_controls();
+
+if (isset($_POST['TransFromDate']))
+{
+ $row = get_current_fiscalyear();
+ if (date1_greater_date2($_POST['TransFromDate'], sql2date($row['end'])))
+ {
+ 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;
+if (!isset($_POST['Dimension2']))
+ $_POST['Dimension2'] = 0;
+start_table(TABLESTYLE);
+$tableheader = "
+
+
+
+
+
+
+
+
+
+
+
+
+
";
+
+echo $tableheader;
+
+//display_trial_balance();
+
+$classresult = get_account_classes(false);
+while ($class = db_fetch($classresult))
+{
+ start_row("class='inquirybg' style='font-weight:bold'");
+ label_cell(_("Class")." - ".$class['cid'] ." - ".$class['class_name'], "colspan=8");
+ end_row();
+
+ //Get Account groups/types under this group/type with no parents
+ $typeresult = get_account_types(false, $class['cid'], -1);
+ while ($accounttype=db_fetch($typeresult))
+ {
+ display_trial_balance($accounttype["id"], $accounttype["name"]);
+ }
+}
+
//$prev = get_balance(null, $begin, $_POST['TransFromDate'], false, false);
//$curr = get_balance(null, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
//$tot = get_balance(null, $begin, $_POST['TransToDate'], false, true);
@@ -169,16 +238,9 @@ function display_trial_balance()
end_row();
end_table(1);
- if (($pbal = round2($pbal, user_price_dec())) != 0)
+ if (($pbal = round2($pbal, user_price_dec())) != 0 && $_POST['Dimension'] == 0 && $_POST['Dimension2'] == 0)
display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
div_end();
-}
-
-//----------------------------------------------------------------------------------------------------
-
-gl_inquiry_controls();
-
-display_trial_balance();
//----------------------------------------------------------------------------------------------------