X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=gl%2Finquiry%2Fgl_trial_balance.php;h=c0a3e56ab1c15108466eb271e9c8250a5bf252eb;hb=61ba1cc9406056fdb2c22bd253521fae45e660c0;hp=969cfcca0dd6c8030c6877e3afe950de87456d16;hpb=5015db8f3d5ab97f6efd569c42192e248ab7baf4;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 969cfcca..c0a3e56a 100644
--- a/gl/inquiry/gl_trial_balance.php
+++ b/gl/inquiry/gl_trial_balance.php
@@ -1,12 +1,22 @@
.
+***********************************************************************/
+$page_security = 'SA_GLANALYTIC';
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
-include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/ui.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/gl/includes/gl_db.inc");
@@ -15,7 +25,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
@@ -28,58 +38,47 @@ if (get_post('Show'))
function gl_inquiry_controls()
{
+ $dim = get_company_pref('use_dimension');
start_form();
- start_table("class='tablestyle_noborder'");
+ start_table(TABLESTYLE_NOBORDER);
date_cells(_("From:"), 'TransFromDate', '', null, -30);
date_cells(_("To:"), 'TransToDate');
+ if ($dim >= 1)
+ dimensions_list_cells(_("Dimension")." 1:", 'Dimension', null, true, " ", false, 1);
+ if ($dim > 1)
+ dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
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;
+ 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');
- start_table($table_style);
+ if (!isset($_POST['Dimension']))
+ $_POST['Dimension'] = 0;
+ if (!isset($_POST['Dimension2']))
+ $_POST['Dimension2'] = 0;
+ start_table(TABLESTYLE);
$tableheader = "
@@ -99,47 +98,79 @@ function display_trial_balance()
$k = 0;
- $totprev = $totcurr = 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"], $_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);
+ if (check_value("NoZero") && !$prev['balance'] && !$curr['balance'] && !$tot['balance'])
continue;
- $totprev += $prev_balance;
- $totcurr += $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'");
- 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);
+
+ //$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($pbal);
+ display_debit_or_credit_cells($cbal);
+ display_debit_or_credit_cells($tbal);
end_row();
end_table(1);
+ if (($pbal = round2($pbal, user_price_dec())) != 0)
+ display_warning(_("The Opening Balance is not in balance, probably due to a non closed Previous Fiscalyear."));
div_end();
}