Merged changes from main branch up to 2.1.3.

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

diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index 269edda90bf9480bed3fb422c15c591ddc8e38d2..39d90bb13f79c36a89d7638db4eff998f7e20358 100644 (file)
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 8;
 $path_to_root="../..";
@@ -43,19 +43,14 @@ if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
        $row = get_company_prefs();
        $edate = add_months($date, -$row['tax_last']);
        $edate = end_month($edate);
-       $bdate = add_months($edate, -$row['tax_prd'] + 1);
-       $_POST["TransFromDate"] = begin_month($bdate);
+       $bdate = begin_month($edate);
+       $bdate = add_months($bdate, -$row['tax_prd'] + 1);
+       $_POST["TransFromDate"] = $bdate;
        $_POST["TransToDate"] = $edate;
 }      
 
 //----------------------------------------------------------------------------------------------------
 
-function get_tax_types()
-{
-       $sql = "SELECT * FROM ".TB_PREF."tax_types ORDER BY id";
-    return db_query($sql,"No transactions were returned");
-}
-
 function tax_inquiry_controls()
 {
        global $table_style2;
@@ -68,7 +63,7 @@ function tax_inquiry_controls()
 
        date_cells(_("from:"), 'TransFromDate', '', null, -30);
        date_cells(_("to:"), 'TransToDate');
-       submit_cells('Show',_("Show"),'','', true);
+       submit_cells('Show',_("Show"),'','', 'default');
 
     end_row();
 
@@ -106,25 +101,27 @@ function show_results()
                alt_table_row_color($k);
                label_cell($tx['name'] . " " . $tx['rate'] . "%");
                label_cell(_("Charged on sales") . " (" . _("Output Tax")."):");
-               amount_cell($collectible);
-               amount_cell($tx['net_input']);
+               amount_cell($payable);
+               amount_cell($tx['net_output']);
                end_row();
                alt_table_row_color($k);
                label_cell($tx['name'] . " " . $tx['rate'] . "%");
                label_cell(_("Paid on purchases") . " (" . _("Input Tax")."):");
-               amount_cell($payable);
-               amount_cell($tx['net_output']);
+               amount_cell($collectible);
+               amount_cell($tx['net_input']);
                end_row();
                alt_table_row_color($k);
                label_cell("<b>".$tx['name'] . " " . $tx['rate'] . "%</b>");
                label_cell("<b>"._("Net payable or collectible") . ":</b>");
                amount_cell($net, true);
+               label_cell("");
                end_row();
        }       
        alt_table_row_color($k);
        label_cell("");
        label_cell("<b>"._("Total payable or refund") . ":</b>");
        amount_cell($total, true);
+       label_cell("");
        end_row();
 
        end_table(2);