X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_details_db.inc;h=ffef4e5159da71ed8b2f6f7f854e68effeb84b7c;hb=fc449c48a8d4ba23bfb18318dff08746340a440c;hp=903c8a9238cf2d51e2e50884b2a3227be6e8cd7b;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_details_db.inc b/sales/includes/db/cust_trans_details_db.inc
index 903c8a92..ffef4e51 100644
--- a/sales/includes/db/cust_trans_details_db.inc
+++ b/sales/includes/db/cust_trans_details_db.inc
@@ -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>.
 ***********************************************************************/
 //----------------------------------------------------------------------------------------
 
@@ -16,22 +16,24 @@ function get_customer_trans_details($debtor_trans_type, $debtor_trans_no)
 if (!is_array($debtor_trans_no))
 	$debtor_trans_no = array( 0=>$debtor_trans_no );
 
-	$sql = "SELECT ".TB_PREF."debtor_trans_details.*,
-		".TB_PREF."debtor_trans_details.unit_price+".TB_PREF."debtor_trans_details.unit_tax AS FullUnitPrice,
-		".TB_PREF."debtor_trans_details.description As StockDescription,
-		".TB_PREF."stock_master.units
-		FROM ".TB_PREF."debtor_trans_details,".TB_PREF."stock_master
+	$sql = "SELECT line.*,
+		line.unit_price+line.unit_tax AS FullUnitPrice,
+		line.description As StockDescription,
+		item.units, item.mb_flag
+		FROM "
+			.TB_PREF."debtor_trans_details line,"
+			.TB_PREF."stock_master item
 		WHERE (";
 
 	$tr=array();
 	foreach ($debtor_trans_no as $trans_no)
-		$tr[] = 'debtor_trans_no='.$trans_no;
+		$tr[] = 'debtor_trans_no='.db_escape($trans_no);
 
 	$sql .= implode(' OR ', $tr);
 
 
-	$sql.=	") AND debtor_trans_type=$debtor_trans_type
-		AND ".TB_PREF."stock_master.stock_id=".TB_PREF."debtor_trans_details.stock_id
+	$sql.=	") AND debtor_trans_type=".db_escape($debtor_trans_type)."
+		AND item.stock_id=line.stock_id
 		ORDER BY id";
 	return db_query($sql, "The debtor transaction detail could not be queried");
 }
@@ -41,9 +43,9 @@ if (!is_array($debtor_trans_no))
 function void_customer_trans_details($type, $type_no)
 {
 	$sql = "UPDATE ".TB_PREF."debtor_trans_details SET quantity=0, unit_price=0,
-		unit_tax=0, discount_percent=0, standard_cost=0
-		WHERE debtor_trans_no=$type_no
-		AND debtor_trans_type=$type";
+		unit_tax=0, discount_percent=0, standard_cost=0, src_id=0
+		WHERE debtor_trans_no=".db_escape($type_no)."
+		AND debtor_trans_type=".db_escape($type);
 
 	db_query($sql, "The debtor transaction details could not be voided");
 
@@ -52,44 +54,8 @@ function void_customer_trans_details($type, $type_no)
 }
 //----------------------------------------------------------------------------------------
 
-function add_customer_trans_tax_detail_item($debtor_trans_type, $debtor_trans_no,
-	$tax_type_id, $rate, $included_in_price, $amount)
-{
-	$sql = "INSERT INTO ".TB_PREF."debtor_trans_tax_details (debtor_trans_no, debtor_trans_type, tax_type_id, rate, included_in_price, amount)
-		VALUES ($debtor_trans_no, $debtor_trans_type, $tax_type_id, $rate, $included_in_price, $amount)";
-
-	db_query($sql, "The debtor transaction tax detail could not be added");
-}
-
-//----------------------------------------------------------------------------------------
-
-function get_customer_trans_tax_details($debtor_trans_type, $debtor_trans_no)
-{
-	$sql = "SELECT ".TB_PREF."debtor_trans_tax_details.*, ".TB_PREF."tax_types.name AS tax_type_name
-		FROM ".TB_PREF."debtor_trans_tax_details,".TB_PREF."tax_types
-		WHERE debtor_trans_no=$debtor_trans_no
-		AND debtor_trans_type=$debtor_trans_type
-		AND amount != 0
-		AND ".TB_PREF."tax_types.id = ".TB_PREF."debtor_trans_tax_details.tax_type_id";
-
-	return db_query($sql, "The debtor transaction tax details could not be queried");
-}
-
-//----------------------------------------------------------------------------------------
-
-function void_customer_trans_tax_details($type, $type_no)
-{
-	$sql = "UPDATE ".TB_PREF."debtor_trans_tax_details SET amount=0
-		WHERE debtor_trans_no=$type_no
-		AND debtor_trans_type=$type";
-
-	db_query($sql, "The debtor transaction tax details could not be voided");
-}
-
-//----------------------------------------------------------------------------------------
-
 function write_customer_trans_detail_item($debtor_trans_type, $debtor_trans_no, $stock_id, $description,
-	$quantity, $unit_price, $unit_tax, $discount_percent, $std_cost, $line_id=0)
+	$quantity, $unit_price, $unit_tax, $discount_percent, $std_cost, $src_id, $line_id=0)
 {
 	if ($line_id!=0)
 		$sql = "UPDATE ".TB_PREF."debtor_trans_details SET
@@ -99,17 +65,18 @@ function write_customer_trans_detail_item($debtor_trans_type, $debtor_trans_no,
 			unit_price=$unit_price,
 			unit_tax=$unit_tax,
 			discount_percent=$discount_percent,
-			standard_cost=$std_cost WHERE
-			id=$line_id";
+			standard_cost=$std_cost,
+			src_id=".db_escape($src_id)." WHERE
+			id=".db_escape($line_id);
 	else
 			$sql = "INSERT INTO ".TB_PREF."debtor_trans_details (debtor_trans_no,
 				debtor_trans_type, stock_id, description, quantity, unit_price,
-				unit_tax, discount_percent, standard_cost)
-			VALUES ($debtor_trans_no, $debtor_trans_type, ".db_escape($stock_id).
+				unit_tax, discount_percent, standard_cost, src_id)
+			VALUES (".db_escape($debtor_trans_no).", ".db_escape($debtor_trans_type).", ".db_escape($stock_id).
 			", ".db_escape($description).",
-				$quantity, $unit_price, $unit_tax, $discount_percent, $std_cost)";
+				$quantity, $unit_price, $unit_tax, 
+				$discount_percent, $std_cost,".db_escape($src_id).")";
 
 	db_query($sql, "The debtor transaction detail could not be written");
 }
 
-?>
\ No newline at end of file