X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep709.php;h=6f0139a1ff769f94b0bee02f5bbd34c5a3091515;hb=0ad69edb5561aac03a5af49286c37b3350307719;hp=d8aed7219994ed532c3c4d5b6fe8aa47fe4b4943;hpb=469c3082b3340ef31941cbe3fa0e6394f9d7c949;p=fa-stable.git

diff --git a/reporting/rep709.php b/reporting/rep709.php
index d8aed721..6f0139a1 100644
--- a/reporting/rep709.php
+++ b/reporting/rep709.php
@@ -20,10 +20,11 @@ print_tax_report();
 
 function getTax($tno, $tpe)
 {
-	$sql = "SELECT amount, included_in_price FROM ".TB_PREF."debtor_trans_tax_details
-		WHERE ".TB_PREF."debtor_trans_tax_details.debtor_trans_no=$tno
-			AND ".TB_PREF."debtor_trans_tax_details.debtor_trans_type=$tpe
-			AND ".TB_PREF."debtor_trans_tax_details.amount <> 0";
+	//	GROUP BY debtor_trans_type, debtor_trans_no";
+	$sql = "SELECT SUM(amount) AS Amount, MAX(included_in_price) AS Included FROM ".TB_PREF."debtor_trans_tax_details
+		WHERE debtor_trans_no=$tno
+			AND debtor_trans_type=$tpe
+			AND amount <> 0";
 
     $result = db_query($sql,"No transactions were returned");
     return db_fetch($result);
@@ -35,8 +36,6 @@ function getCustTransactions($from, $to)
 	$todate = date2sql($to);
 
 	$netamount = "IF(".TB_PREF."debtor_trans.type=11,-(ov_amount+ov_freight+ov_discount),ov_amount+ov_freight+ov_discount)*".TB_PREF."debtor_trans.rate";
-	//	IF(".TB_PREF."debtor_trans.type=11,-(ov_amount+ov_freight+ov_discount),ov_amount+ov_freight+ov_discount)*rate AS NetAmount,
-	//	IF(".TB_PREF."debtor_trans.type=11,-(ov_gst+ov_freight_tax),ov_gst+ov_freight_tax)*rate AS Tax
 
 	$sql = "SELECT ".TB_PREF."debtor_trans.reference,
 			".TB_PREF."debtor_trans.trans_no,
@@ -107,13 +106,15 @@ function getCustInvTax($taxtype, $from, $to)
 	$todate = date2sql($to);
 	$amount = "IF(".TB_PREF."debtor_trans_tax_details.debtor_trans_type=11,-amount,amount)*".TB_PREF."debtor_trans.rate";
 	$mamount = "IF(".TB_PREF."debtor_trans_tax_details.included_in_price=0, 0, $amount)";
-	$netamount = "IF(".TB_PREF."debtor_trans.type=11,-(ov_amount+ov_freight+ov_discount),ov_amount+ov_freight+ov_discount)*".TB_PREF."debtor_trans.rate-$mamount";
+	$netamount = "IF(".TB_PREF."debtor_trans.type=11,-quantity,quantity)*unit_price*".TB_PREF."debtor_trans.rate-$mamount";
 
 	$sql = "SELECT SUM($netamount),
 		SUM($amount)
-		FROM ".TB_PREF."debtor_trans_tax_details, ".TB_PREF."debtor_trans
+		FROM ".TB_PREF."debtor_trans_details, ".TB_PREF."debtor_trans_tax_details, ".TB_PREF."debtor_trans
 				WHERE ".TB_PREF."debtor_trans.type>=10
 					AND ".TB_PREF."debtor_trans.type<=11
+					AND ".TB_PREF."debtor_trans_details.debtor_trans_no=".TB_PREF."debtor_trans.trans_no
+					AND ".TB_PREF."debtor_trans_details.debtor_trans_type=".TB_PREF."debtor_trans.type
 					AND ".TB_PREF."debtor_trans.trans_no=".TB_PREF."debtor_trans_tax_details.debtor_trans_no
 					AND ".TB_PREF."debtor_trans.type=".TB_PREF."debtor_trans_tax_details.debtor_trans_type
 					AND ".TB_PREF."debtor_trans_tax_details.amount <> 0
@@ -129,12 +130,14 @@ function getSuppInvTax($taxtype, $from, $to)
 {
 	$fromdate = date2sql($from);
 	$todate = date2sql($to);
-	$sql = "SELECT SUM((ov_amount+ov_discount) * ".TB_PREF."supp_trans.rate), SUM(amount*".TB_PREF."supp_trans.rate)
-		FROM ".TB_PREF."supp_invoice_tax_items, ".TB_PREF."supp_trans
+	$sql = "SELECT SUM(unit_price * quantity * ".TB_PREF."supp_trans.rate), SUM(amount*".TB_PREF."supp_trans.rate)
+		FROM ".TB_PREF."supp_invoice_items, ".TB_PREF."supp_invoice_tax_items, ".TB_PREF."supp_trans
 				WHERE ".TB_PREF."supp_trans.type>=20
 					AND ".TB_PREF."supp_trans.type<=21
 					AND ".TB_PREF."supp_trans.trans_no=".TB_PREF."supp_invoice_tax_items.supp_trans_no
 					AND ".TB_PREF."supp_trans.type=".TB_PREF."supp_invoice_tax_items.supp_trans_type
+					AND ".TB_PREF."supp_invoice_items.supp_trans_no=".TB_PREF."supp_trans.trans_no
+					AND ".TB_PREF."supp_invoice_items.supp_trans_type=".TB_PREF."supp_trans.type
 					AND ".TB_PREF."supp_invoice_tax_items.tax_type_id=$taxtype
 					AND ".TB_PREF."supp_invoice_tax_items.amount <> 0
 					AND ".TB_PREF."supp_trans.tran_date >= '$fromdate'
@@ -208,12 +211,12 @@ function print_tax_report()
 			$tax_amt = 0;
 		else
 		{
-			$tx['amount'] *= $trans['rate'];
+			$tx['Amount'] *= $trans['rate'];
 			if ($trans['type'] == 11)
-				$tx['amount'] *= -1;
-			if ($tx['included_in_price'])
-				$trans['NetAmount'] -= $tx['amount'];
-			$tax_amt = $tx['amount'];
+				$tx['Amount'] *= -1;
+			if ($tx['Included'] > 0)
+				$trans['NetAmount'] -= $tx['Amount'];
+			$tax_amt = $tx['Amount'];
 		}
 		if (!$summaryOnly)
 		{
@@ -385,6 +388,61 @@ function print_tax_report()
 	}
 	$rep->Line($rep->row - 4);
 
+	$rep->row -= 16;
+	$rep->TextCol(0, 5, _("General Ledger"));
+	$rep->Line($rep->row - 6);
+
+	$rep->row -= 22;
+
+	$trow = $rep->row;
+
+	$idcounter = count($taxes);
+	$i = 0;
+	for ($j = 0; $j < $idcounter; $j++)
+	{
+		$tx = getTaxInfo($taxes[$j]);
+		$str = $tx['name'] . " " . number_format2($tx['rate'], $dec) . "%";
+		$rep->TextCol($i, $i + 1, $str);
+		$rep->NewLine();
+	}
+	$i++;
+	$rep->row = $trow;
+	for ($j = 0; $j < $idcounter; $j++)
+	{
+		$tx = getTaxInfo($taxes[$j]);
+		$acc = get_gl_account($tx['sales_gl_code']);
+		$rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
+		$rep->NewLine();
+	}
+	$i++;
+	$rep->row = $trow;
+	for ($j = 0; $j < $idcounter; $j++)
+	{
+		$tx = getTaxInfo($taxes[$j]);
+		$amount = get_gl_trans_from_to($from, $to, $tx['sales_gl_code']);
+		$rep->TextCol($i, $i + 1,number_format2(-$amount, $dec));
+		$rep->NewLine();
+	}
+	$i++;
+	$rep->row = $trow;
+	for ($j = 0; $j < $idcounter; $j++)
+	{
+		$tx = getTaxInfo($taxes[$j]);
+		$acc = get_gl_account($tx['purchasing_gl_code']);
+		$rep->TextCol($i, $i + 1, $acc['account_code']." ".$acc['account_name']);
+		$rep->NewLine();
+	}
+	$i++;
+	$rep->row = $trow;
+	for ($j = 0; $j < $idcounter; $j++)
+	{
+		$tx = getTaxInfo($taxes[$j]);
+		$amount = get_gl_trans_from_to($from, $to, $tx['purchasing_gl_code']);
+		$rep->TextCol($i, $i + 1,number_format2($amount, $dec));
+		$rep->NewLine();
+	}
+	$rep->Line($rep->row - 4);
+
 	$locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
 	if (file_exists($locale))
 	{