X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=50ff2e3dead16a02e12f2ab774ec2a92db3bf707;hb=e1ad4f3f77cb20f692185b0b5e493820c5fb7f77;hp=bb52ae9ad5b2d631c6a1beb678d8a4efaf62f88a;hpb=66e722695a2743eec756b5f26a306bda3bc975ee;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index bb52ae9a..50ff2e3d 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -1,6 +1,15 @@
.
+***********************************************************************/
+$page_security = 'SA_GLANALYTIC';
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@ -15,7 +24,7 @@ $js = "";
if ($use_date_picker)
$js = get_js_date_picker();
-page(_("Trial Balance"), false, false, "", $js);
+page(_($help_context = "Trial Balance"), false, false, "", $js);
//----------------------------------------------------------------------------------------------------
// Ajax updates
@@ -35,45 +44,15 @@ function gl_inquiry_controls()
date_cells(_("From:"), 'TransFromDate', '', null, -30);
date_cells(_("To:"), 'TransToDate');
check_cells(_("No zero values"), 'NoZero', null);
+ check_cells(_("Only balances"), 'Balance', null);
- submit_cells('Show',_("Show"),'','', true);
+ submit_cells('Show',_("Show"),'','', 'default');
end_table();
end_form();
}
//----------------------------------------------------------------------------------------------------
-function get_balance($account, $from, $to, $from_incl=true, $to_incl=true) {
-
- $sql = "SELECT SUM(amount) As TransactionSum FROM ".TB_PREF."gl_trans
- WHERE account='$account'";
-
- if ($from)
- {
- $from_date = date2sql($from);
- if ($from_incl)
- $sql .= " AND tran_date >= '$from_date'";
- else
- $sql .= " AND tran_date > '$from_date'";
- }
-
- if ($to)
- {
- $to_date = date2sql($to);
- if ($to_incl)
- $sql .= " AND tran_date <= '$to_date' ";
- else
- $sql .= " AND tran_date < '$to_date' ";
- }
-
- $result = db_query($sql,"No general ledger accounts were returned");
-
- $row = db_fetch_row($result);
- return $row[0];
-}
-
-//----------------------------------------------------------------------------------------------------
-
function display_trial_balance()
{
global $table_style, $path_to_root;
@@ -99,61 +78,74 @@ function display_trial_balance()
$k = 0;
- $totprevd = $totprevc = $totcurrd = $totcurrc = 0.0;
$accounts = get_gl_accounts();
-
+ $pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
+ $begin = begin_fiscalyear();
+ if (date1_greater_date2($begin, $_POST['TransFromDate']))
+ $begin = $_POST['TransFromDate'];
+ $begin = add_days($begin, -1);
+
while ($account = db_fetch($accounts))
{
- if (is_account_balancesheet($account["account_code"]))
- $begin = null;
- else
- {
- $begin = begin_fiscalyear();
- if (date1_greater_date2($begin, $_POST['TransFromDate']))
- $begin = $_POST['TransFromDate'];
- $begin = add_days($begin, -1);
- }
- $prev_balance = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
-
- $curr_balance = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate']);
- if (check_value("NoZero") && !$prev_balance && !$curr_balance)
+ $prev = get_balance($account["account_code"], 0, 0, $begin, $_POST['TransFromDate'], false, false);
+ $curr = get_balance($account["account_code"], 0, 0, $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
+ $tot = get_balance($account["account_code"], 0, 0, $begin, $_POST['TransToDate'], false, true);
+ if (check_value("NoZero") && !$prev['balance'] && !$curr['balance'] && !$tot['balance'])
continue;
- if ($prev_balance >= 0.0)
- $totprevd += $prev_balance;
- else
- $totprevc += $prev_balance;
- if ($curr_balance >= 0.0)
- $totcurrd += $curr_balance;
- else
- $totcurrc += $curr_balance;
alt_table_row_color($k);
- $url = "" . $account["account_code"] . "";
+ $url = "" . $account["account_code"] . "";
label_cell($url);
label_cell($account["account_name"]);
-
- display_debit_or_credit_cells($prev_balance);
- display_debit_or_credit_cells($curr_balance);
- display_debit_or_credit_cells($prev_balance + $curr_balance);
+ if (check_value('Balance'))
+ {
+ display_debit_or_credit_cells($prev['balance']);
+ display_debit_or_credit_cells($curr['balance']);
+ display_debit_or_credit_cells($tot['balance']);
+
+ }
+ else
+ {
+ amount_cell($prev['debit']);
+ amount_cell($prev['credit']);
+ amount_cell($curr['debit']);
+ amount_cell($curr['credit']);
+ amount_cell($tot['debit']);
+ amount_cell($tot['credit']);
+ $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'];
end_row();
}
- start_row("class='inquirybg' style='font-weight:bold'");
- label_cell(_("Total") ." - ".$_POST['TransToDate'], "colspan=2");
- amount_cell($totprevd);
- amount_cell(abs($totprevc));
- amount_cell($totcurrd);
- amount_cell(abs($totcurrc));
- amount_cell($totprevd + $totcurrd);
- amount_cell(abs($totprevc + $totcurrc));
- end_row();
- $totprev = $totprevd + $totprevc;
- $totcurr = $totcurrd + $totcurrc;
+
+ //$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);
+ if (!check_value('Balance'))
+ {
+ start_row("class='inquirybg' style='font-weight:bold'");
+ label_cell(_("Total") ." - ".$_POST['TransToDate'], "colspan=2");
+ amount_cell($pdeb);
+ amount_cell($pcre);
+ amount_cell($cdeb);
+ amount_cell($ccre);
+ amount_cell($tdeb);
+ amount_cell($tcre);
+ end_row();
+ }
start_row("class='inquirybg' style='font-weight:bold'");
label_cell(_("Ending Balance") ." - ".$_POST['TransToDate'], "colspan=2");
- display_debit_or_credit_cells($totprev);
- display_debit_or_credit_cells($totcurr);
- display_debit_or_credit_cells($totprev + $totcurr);
+ display_debit_or_credit_cells($pbal);
+ display_debit_or_credit_cells($cbal);
+ display_debit_or_credit_cells($tbal);
end_row();
end_table(1);