X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep108.php;h=97c4413bc711cf308dc8ae5200cb1e2c86e2ebb6;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=156b5499455f322e1be81b4535144837931676d4;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/reporting/rep108.php b/reporting/rep108.php
index 156b5499..97c4413b 100644
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -32,12 +32,13 @@ print_statements();
 function getTransactions($debtorno, $date)
 {
     $sql = "SELECT ".TB_PREF."debtor_trans.*,
-				(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)
+				(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
+				".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
 				AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
 				((".TB_PREF."debtor_trans.type = ".ST_SALESINVOICE.")
 					AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue
     			FROM ".TB_PREF."debtor_trans
-    			WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = '$debtorno'
+    			WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
     				AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
     				ORDER BY ".TB_PREF."debtor_trans.tran_date";
 
@@ -54,9 +55,8 @@ function print_statements()
 
 	$customer = $_POST['PARAM_0'];
 	$currency = $_POST['PARAM_1'];
-	$bankaccount = $_POST['PARAM_2'];
-	$email = $_POST['PARAM_3'];
-	$comments = $_POST['PARAM_4'];
+	$email = $_POST['PARAM_2'];
+	$comments = $_POST['PARAM_3'];
 
 	$dec = user_price_dec();
 
@@ -66,10 +66,7 @@ function print_statements()
 
 	$aligns = array('left',	'left',	'left',	'left',	'right', 'right', 'right', 'right');
 
-	$params = array('comments' => $comments,
-					'bankaccount' => $bankaccount);
-
-	$baccount = get_bank_account($params['bankaccount']);
+	$params = array('comments' => $comments);
 
 	$cur = get_company_pref('curr_default');
 	$PastDueDays1 = get_company_pref('past_due_days');
@@ -85,7 +82,7 @@ function print_statements()
 
 	$sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, email, curr_code, curdate() AS tran_date, payment_terms FROM ".TB_PREF."debtors_master";
 	if ($customer != ALL_NUMERIC)
-		$sql .= " WHERE debtor_no = $customer";
+		$sql .= " WHERE debtor_no = ".db_escape($customer);
 	else
 		$sql .= " ORDER by name";
 	$result = db_query($sql, "The customers could not be retrieved");
@@ -97,6 +94,8 @@ function print_statements()
 		$myrow['order_'] = "";
 
 		$TransResult = getTransactions($myrow['debtor_no'], $date);
+		$baccount = get_default_bank_account($myrow['curr_code']);
+		$params['bankaccount'] = $baccount['id'];
 		if (db_num_rows($TransResult) == 0)
 			continue;
 		if ($email == 1)