X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Finquiry%2Fgl_trial_balance.php;h=e4228cb2beb4180e8688c10dcbf7ca708c046654;hb=4ad1d8bbc150b061272c93eec2bc81ebbeb93c91;hp=8d1ad8bcba2d79aae5827baa231e750b244c2ba7;hpb=ee99111dd71368df55d64a7b18b313f7f30d96cf;p=fa-stable.git
diff --git a/gl/inquiry/gl_trial_balance.php b/gl/inquiry/gl_trial_balance.php
index 8d1ad8bc..e4228cb2 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,10 @@ $js = "";
if ($use_date_picker)
$js = get_js_date_picker();
-page(_("Trial Balance"), false, false, "", $js);
+page(_($help_context = "Trial Balance"), false, false, "", $js);
+
+$k = 0;
+$pdeb = $pcre = $cdeb = $ccre = $tdeb = $tcre = $pbal = $cbal = $tbal = 0;
//----------------------------------------------------------------------------------------------------
// Ajax updates
@@ -28,76 +41,40 @@ 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(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()
+function display_trial_balance($type, $typename)
{
- global $table_style, $path_to_root;
-
- div_start('balance_tbl');
- start_table($table_style);
- $tableheader = "
-
-
-
-
-
-
-
-
-
-
-
-
-
";
-
- echo $tableheader;
+ global $path_to_root;
+
+ 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;
+ //$accounts = get_gl_accounts();
+ //Get Accounts directly under this group/type
+ $accounts = get_gl_accounts(null, null, $type);
+
$begin = begin_fiscalyear();
if (date1_greater_date2($begin, $_POST['TransFromDate']))
$begin = $_POST['TransFromDate'];
@@ -105,14 +82,23 @@ 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);
+ //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;
+ }
+
+ $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;
alt_table_row_color($k);
- $url = "" . $account["account_code"] . "";
+ $url = "" . $account["account_code"] . "";
label_cell($url);
label_cell($account["account_name"]);
@@ -144,6 +130,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);
@@ -167,14 +223,9 @@ function display_trial_balance()
end_row();
end_table(1);
+ 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();
//----------------------------------------------------------------------------------------------------