X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Finquiry%2Ftax_inquiry.php;h=db10eea01e50901aaa21b0bf1d1a378fcb8f7720;hb=e91772a2716825a6aeb358d1defba47d5f3892c1;hp=1de48969ed1db30d9504acd0e32e002e1819e66f;hpb=b8bb268d265a430ebe0516f89b8c997e0f94a2c7;p=fa-stable.git
diff --git a/gl/inquiry/tax_inquiry.php b/gl/inquiry/tax_inquiry.php
index 1de48969..db10eea0 100644
--- a/gl/inquiry/tax_inquiry.php
+++ b/gl/inquiry/tax_inquiry.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 8;
$path_to_root="../..";
include_once($path_to_root . "/includes/session.inc");
@@ -41,12 +50,6 @@ if (get_post('TransFromDate') == "" && get_post('TransToDate') == "")
//----------------------------------------------------------------------------------------------------
-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;
@@ -59,7 +62,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();
@@ -74,64 +77,50 @@ function show_results()
{
global $path_to_root, $table_style;
- $taxes = get_tax_types();
-
/*Now get the transactions */
div_start('trans_tbl');
start_table($table_style);
- $th = array(_("Type"), _("Description"), _("Amount"));
+ $th = array(_("Type"), _("Description"), _("Amount"), _("Outputs")."/"._("Inputs"));
table_header($th);
$k = 0;
$total = 0;
$bdate = date2sql($_POST['TransFromDate']);
$edate = date2sql($_POST['TransToDate']);
+
+ $taxes = get_tax_summary($_POST['TransFromDate'], $_POST['TransToDate']);
+
while ($tx = db_fetch($taxes))
{
- if ($tx['sales_gl_code'] == $tx['purchasing_gl_code'])
- {
- $sql = "SELECT SUM(IF(amount >= 0, amount, 0)) AS payable, SUM(IF(amount < 0, -amount, 0)) AS collectible
- FROM ".TB_PREF."gl_trans WHERE account = '".$tx['sales_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
- $result = db_query($sql, "Error retrieving tax inquiry");
- $row = db_fetch($result);
- $payable = -$row['payable'];
- $collectible.= -$row['collectible'];
- }
- else
- {
- $sql = "SELECT SUM(amount) AS collectible
- FROM ".TB_PREF."gl_trans WHERE account = '".$tx['sales_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
- $result = db_query($sql, "Error retrieving tax inquiry");
- $row = db_fetch($result);
- $collectible = -$row['collectible'];
- $sql = "SELECT SUM(amount) AS payable
- FROM ".TB_PREF."gl_trans WHERE account = '".$tx['purchasing_gl_code']."' AND tran_date >= '$bdate' AND tran_date <= '$edate'";
- $result = db_query($sql, "Error retrieving tax inquiry");
- $row = db_fetch($result);
- $payable = -$row['payable'];
- }
+
+ $payable = $tx['payable'];
+ $collectible = $tx['collectible'];
$net = $collectible + $payable;
$total += $net;
alt_table_row_color($k);
label_cell($tx['name'] . " " . $tx['rate'] . "%");
label_cell(_("Charged on sales") . " (" . _("Output Tax")."):");
- amount_cell($collectible);
+ 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($collectible);
+ amount_cell($tx['net_input']);
end_row();
alt_table_row_color($k);
- label_cell($tx['name'] . " " . $tx['rate'] . "%");
- label_cell(_("Net payable or collectible") . ":");
+ label_cell("".$tx['name'] . " " . $tx['rate'] . "%");
+ label_cell(""._("Net payable or collectible") . ":");
amount_cell($net, true);
+ label_cell("");
end_row();
}
alt_table_row_color($k);
label_cell("");
label_cell(""._("Total payable or refund") . ":");
amount_cell($total, true);
+ label_cell("");
end_row();
end_table(2);