Direct posting to GL accountswith more than one related tax type forbidden.

[fa-stable.git] / gl / inquiry / gl_account_inquiry.php

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index db669563290e841677f734d97941f0bbcd721811..22b31a7807f89bfa50926211b7271f9d595495e0 100644 (file)
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
@@ -11,15 +20,22 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 include_once($path_to_root . "/gl/includes/gl_db.inc");
 
-$js = get_js_set_focus('account');
+$js = '';
+set_focus('account');
 if ($use_popup_windows)
        $js .= get_js_open_window(800, 500);
 if ($use_date_picker)
        $js .= get_js_date_picker();
 
-page(_("General Ledger Account Inquiry"), false, false, "setFocus()", $js);
+page(_("General Ledger Account Inquiry"), false, false, '', $js);
 
 //----------------------------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('Show')) 
+{
+       $Ajax->activate('trans_tbl');
+}
 
 if (isset($_GET["account"]))
        $_POST["account"] = $_GET["account"];
@@ -47,9 +63,9 @@ function gl_inquiry_controls()
 
     gl_all_accounts_list_cells(_("Account:"), 'account', null);
 
-       date_cells(_("from:"), 'TransFromDate', null, -30);
+       date_cells(_("from:"), 'TransFromDate', '', null, -30);
        date_cells(_("to:"), 'TransToDate');
-    submit_cells('Show',_("Show"));
+       submit_cells('Show',_("Show"),'','', true);
 
     end_row();
 
@@ -81,12 +97,8 @@ function show_results()
        $result = get_gl_transactions($_POST['TransFromDate'], $_POST['TransToDate'], -1,
        $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
 
-       if (db_num_rows($result) == 0)
-       {
-               display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
-               return;
-       }
        $colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
+       div_start('trans_tbl');
        //echo "\nDimension =". $_POST['Dimension'];
        display_heading($_POST["account"]. "&nbsp;&nbsp;&nbsp;".$act_name);
 
@@ -101,14 +113,14 @@ function show_results()
                $th = array(_("Type"), _("#"), _("Date"),
                        _("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
        table_header($th);
-       if (is_account_balancesheet($account["account_code"]))
+       if (is_account_balancesheet($_POST["account"]))
                $begin = "";
        else
        {
-               if ($from < $begin)
-                       $begin = add_days($_POST['TransFromDate'], -1);
-               else
-                       $begin = add_days(begin_fiscalyear(), -1);
+               $begin = begin_fiscalyear();
+               if (date1_greater_date2($begin, $_POST['TransFromDate']))
+                       $begin = $_POST['TransFromDate'];
+               $begin = add_days($begin, -1);
        }
 
     $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']);
@@ -117,6 +129,7 @@ function show_results()
        label_cell("<b>"._("Opening Balance")." - ".$_POST['TransFromDate']."</b>", "colspan=$colspan");
        display_debit_or_credit_cells($bfw);
        label_cell("");
+       label_cell("");
        end_row();
        //$running_total =0;
        $running_total = $bfw;
@@ -158,9 +171,13 @@ function show_results()
        label_cell("<b>" . _("Ending Balance") ." - ".$_POST['TransToDate']. "</b>", "colspan=$colspan");
        display_debit_or_credit_cells($running_total);
        label_cell("");
+       label_cell("");
        end_row();
 
        end_table(2);
+       if (db_num_rows($result) == 0)
+               display_note(_("No general ledger transactions have been created for this account on the selected dates."), 0, 1);
+       div_end();
 }
 
 //----------------------------------------------------------------------------------------------------