X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=895a2703497e2cfebd036008c50efc046d96a275;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=8d1ad8bcba2d79aae5827baa231e750b244c2ba7;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 8d1ad8bc..895a2703 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");
@@ -37,40 +46,13 @@ function gl_inquiry_controls()
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(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";
-
- if ($account != null)
- $sql .= " account='$account' 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' ";
-
- $result = db_query($sql,"No general ledger accounts were returned");
-
- return db_fetch($result);
-}
-
-//----------------------------------------------------------------------------------------------------
-
function display_trial_balance()
{
global $table_style, $path_to_root;
@@ -105,14 +87,14 @@ function display_trial_balance()
while ($account = db_fetch($accounts))
{
- $prev = get_balance($account["account_code"], $begin, $_POST['TransFromDate'], false, false);
- $curr = get_balance($account["account_code"], $_POST['TransFromDate'], $_POST['TransToDate'], true, true);
- $tot = get_balance($account["account_code"], $begin, $_POST['TransToDate'], false, true);
+ $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;
alt_table_row_color($k);
- $url = "" . $account["account_code"] . "";
+ $url = "" . $account["account_code"] . "";
label_cell($url);
label_cell($account["account_name"]);