X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=c0a3e56ab1c15108466eb271e9c8250a5bf252eb;hb=61ba1cc9406056fdb2c22bd253521fae45e660c0;hp=b3dee997d722db482fe18f4b376840f60d91a780;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php index b3dee997..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 = "