X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=b63ff123c5fb5ddbe1e9cf2e21caddda97c6b250;hb=fbf51ab0febfd0885620abcab8738339d156ff45;hp=f9b77aa5c3885c84357965ff66e82c7c698c6101;hpb=502c2fc8bb683df7737e6700c984d7584405355a;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index f9b77aa5..b63ff123 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -9,38 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-//------------------------------------------------------------------------------
-//	Retreive parent document number(s) for given transaction
-//
-function get_parent_trans($trans_type, $trans_no) {
-
-	$sql = 'SELECT trans_link FROM
-			'.TB_PREF.'debtor_trans WHERE
-			(trans_no='.db_escape($trans_no).' AND type='.db_escape($trans_type).' AND trans_link!=0)';
-
-	$result = db_query($sql, 'Parent document numbers cannot be retrieved');
-
-	if (db_num_rows($result)) {
-		$link = db_fetch($result);
-		return array($link['trans_link']);
-	}
-	if ($trans_type!=ST_SALESINVOICE) return 0;	// this is credit note with no parent invoice
-	// invoice: find batch invoice parent trans.
-	$sql = 'SELECT trans_no FROM
-			'.TB_PREF.'debtor_trans WHERE
-			(trans_link='.db_escape($trans_no).' AND type='. get_parent_type($trans_type) .')';
-
-	$result = db_query($sql, 'Delivery links cannot be retrieved');
-
-	$delivery = array();
-	if(db_num_rows($result)>0) {
-		while($link = db_fetch($result)) {
-			$delivery[] = $link['trans_no'];
-		}
-	}
-	return count($delivery) ? $delivery : 0;
-}
-
 //----------------------------------------------------------------------------------------
 // Mark changes in debtor_trans_details
 //
@@ -70,7 +38,7 @@ function get_customer_trans_version($type, $trans_no) {
 			WHERE type='.db_escape($type).' AND (';
 
 	foreach ($trans_no as $key=>$trans)
-		$trans_no[$key] = 	'trans_no='.$trans_no[$key];
+		$trans_no[$key] = 	'trans_no='.db_escape($trans_no[$key]);
 
 	$sql .= implode(' OR ', $trans_no) . ')';
 
@@ -87,8 +55,8 @@ function get_customer_trans_version($type, $trans_no) {
 // date_ is display date (non-sql)
 function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	$date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0,
-	$sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
-	$AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0)
+	$sales_type=0, $order_no=0, $ship_via=0, $due_date="",
+	$AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null, $tax_included=0, $prep_amount=0)
 {
 	$new = $trans_no==0;
 	$curr = get_customer_currency($debtor_no);
@@ -104,8 +72,10 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	if ($trans_type == ST_BANKPAYMENT)
 		$Total = -$Total;
 
-	if ($new) {
-	$trans_no = get_next_trans_no($trans_type);
+    if ($new || !exists_customer_trans($trans_type, $trans_no))
+    {
+        if ($new)
+        $trans_no = get_next_trans_no($trans_type);
 
 	$sql = "INSERT INTO ".TB_PREF."debtor_trans (
 		trans_no, type,
@@ -114,15 +84,17 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 		reference, tpe,
 		order_, ov_amount, ov_discount,
 		ov_gst, ov_freight, ov_freight_tax,
-		rate, ship_via, alloc, trans_link,
-		dimension_id, dimension2_id
-		) VALUES ($trans_no, ".db_escape($trans_type).",
+		rate, ship_via, alloc,
+		dimension_id, dimension2_id, payment_terms, tax_included, prep_amount
+		) VALUES (".db_escape($trans_no).", ".db_escape($trans_type).",
 		".db_escape($debtor_no).", ".db_escape($BranchNo).",
 		'$SQLDate', '$SQLDueDate', ".db_escape($reference).",
 		".db_escape($sales_type).", ".db_escape($order_no).", $Total, ".db_escape($discount).", $Tax,
 		".db_escape($Freight).",
-		$FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).",
-		".db_escape($dimension_id).", ".db_escape($dimension2_id).")";
+		$FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt,
+		".db_escape($dimension_id).", ".db_escape($dimension2_id).", "
+		.db_escape($payment_terms, true).", "
+		.db_escape($tax_included).", ".db_escape($prep_amount).")";
 	} else {	// may be optional argument should stay unchanged ?
 	$sql = "UPDATE ".TB_PREF."debtor_trans SET
 		debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).",
@@ -130,9 +102,12 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 		reference=".db_escape($reference).", tpe=".db_escape($sales_type).", order_=".db_escape($order_no).",
 		ov_amount=$Total, ov_discount=".db_escape($discount).", ov_gst=$Tax,
 		ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
-		ship_via=".db_escape($ship_via).", alloc=$AllocAmt, trans_link=$trans_link,
-		dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id)."
-		WHERE trans_no=$trans_no AND type=".db_escape($trans_type);
+		ship_via=".db_escape($ship_via).", alloc=$AllocAmt,
+		dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
+		payment_terms=".db_escape($payment_terms, true).",
+		tax_included=".db_escape($tax_included).",
+		prep_amount =".db_escape($prep_amount)."
+		WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
 	}
 	db_query($sql, "The debtor transaction record could not be inserted");
 
@@ -140,20 +115,27 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 
 	return $trans_no;
 }
-
 //----------------------------------------------------------------------------------------
 
 function get_customer_trans($trans_id, $trans_type)
 {
-	$sql = "SELECT ".TB_PREF."debtor_trans.*,
-		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
-		".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email AS email2,
-		".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.tax_id, ".TB_PREF."debtors_master.payment_terms ";
+	global $go_debug;
 
-	if ($trans_type == ST_CUSTPAYMENT) {
+	$sql = "SELECT trans.*,"
+		."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,"
+		."cust.name AS DebtorName, cust.address, "
+		."cust.curr_code, "
+		."cust.tax_id,
+		trans.prep_amount>0 as prepaid,"
+		."com.memo_";
+
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
-		$sql .= ", ".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
-			".TB_PREF."bank_accounts.account_type AS BankTransType ";
+		// Chaitanya : Added bank_act to support Customer Payment Edit
+		$sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
+			".TB_PREF."bank_accounts.account_type AS BankTransType,
+			".TB_PREF."bank_accounts.bank_curr_code,
+			".TB_PREF."bank_trans.amount as bank_amount";
 	}
 
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
@@ -161,60 +143,65 @@ function get_customer_trans($trans_id, $trans_type)
 		$sql .= ", ".TB_PREF."shippers.shipper_name, "
 		.TB_PREF."sales_types.sales_type, "
 		.TB_PREF."sales_types.tax_included, "
-		.TB_PREF."cust_branch.*, "
-		.TB_PREF."debtors_master.discount, "
+		."branch.*, "
+		."cust.discount, "
 		.TB_PREF."tax_groups.name AS tax_group_name, "
 		.TB_PREF."tax_groups.id AS tax_group_id ";
 	}
 
+	$sql .= " FROM ".TB_PREF."debtor_trans trans
+					LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+					LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, 
+					".TB_PREF."debtors_master cust";
 
-	$sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
-
-	if ($trans_type == ST_CUSTPAYMENT) {
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
 		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
 	}
 
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
 		// it's an invoice so also get the shipper, salestypes
-		$sql .= ", ".TB_PREF."shippers, ".TB_PREF."sales_types, ".TB_PREF."cust_branch, ".TB_PREF."tax_groups ";
+		$sql .= ", ".TB_PREF."sales_types, "
+		.TB_PREF."cust_branch branch, "
+		.TB_PREF."tax_groups ";
 	}
 
-	$sql .= " WHERE ".TB_PREF."debtor_trans.trans_no=".db_escape($trans_id)."
-		AND ".TB_PREF."debtor_trans.type=".db_escape($trans_type)."
-		AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
+	$sql .= " WHERE trans.trans_no=".db_escape($trans_id)."
+		AND trans.type=".db_escape($trans_type)."
+		AND trans.debtor_no=cust.debtor_no";
 
-	if ($trans_type == ST_CUSTPAYMENT) {
+	if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
 		// it's a payment so also get the bank account
-		$sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_id
+		$sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
 			AND ".TB_PREF."bank_trans.type=$trans_type
+			AND ".TB_PREF."bank_trans.amount != 0
 			AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
 	}
 	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
 		// it's an invoice so also get the shipper
-		$sql .= " AND ".TB_PREF."shippers.shipper_id=".TB_PREF."debtor_trans.ship_via
-			AND ".TB_PREF."sales_types.id = ".TB_PREF."debtor_trans.tpe
-			AND ".TB_PREF."cust_branch.branch_code = ".TB_PREF."debtor_trans.branch_code
-			AND ".TB_PREF."cust_branch.tax_group_id = ".TB_PREF."tax_groups.id ";
+		$sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
+			AND branch.branch_code = trans.branch_code
+			AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
 	}
 
 	$result = db_query($sql, "Cannot retreive a debtor transaction");
 
 	if (db_num_rows($result) == 0) {
 		// can't return nothing
+		if($go_debug)
+			display_backtrace();
 		display_db_error("no debtor trans found for given params", $sql, true);
 		exit;
 	}
-
 	if (db_num_rows($result) > 1) {
 		// can't return multiple
+		if($go_debug)
+			display_backtrace();
 		display_db_error("duplicate debtor transactions found for given params", $sql, true);
 		exit;
 	}
 
-	//return db_fetch($result);
 	$row = db_fetch($result);
-	$row['email'] = $row['email2'];
 	return $row;
 }
 
@@ -247,13 +234,6 @@ function get_customer_trans_order($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
-function get_related_documents($type, $trans_no)
-{
-	$sql = "SELECT * FROM ".TB_PREF."debtor_trans WHERE type=$type AND order_=".db_escape($trans_no);
-	return db_query($sql,"The related documents could not be retreived");
-}
-//----------------------------------------------------------------------------------------
-
 function get_customer_details_from_trans($type, $type_no)
 {
 	$sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.curr_code, ".TB_PREF."cust_branch.br_name
@@ -272,13 +252,22 @@ function void_customer_trans($type, $type_no)
 {
 	// clear all values and mark as void
 	$sql = "UPDATE ".TB_PREF."debtor_trans SET ov_amount=0, ov_discount=0, ov_gst=0, ov_freight=0,
-		ov_freight_tax=0, alloc=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+		ov_freight_tax=0, alloc=0, prep_amount=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
 
 	db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
 }
 
 //----------------------------------------------------------------------------------------
 
+function clear_customer_trans($type, $type_no)
+{
+	// Delete
+	$sql = "DELETE FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+
+	db_query($sql, "could not clear debtor transactions for type=$type and trans_no=$type_no");
+}
+//----------------------------------------------------------------------------------------
+
 function post_void_customer_trans($type, $type_no)
 {
 	switch ($type) {
@@ -297,15 +286,6 @@ function post_void_customer_trans($type, $type_no)
 
 //----------------------------------------------------------------------------------------
 
-function get_customer_trans_link($type, $type_no)
-{
-	$row = db_query("SELECT trans_link from ".TB_PREF."debtor_trans
-		WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no),
-		"could not get transaction link for type=$type and trans_no=$type_no");
-	return $row[0];
-}
-//----------------------------------------------------------------------------------------
-
 function get_sql_for_customer_inquiry()
 {
     $date_after = date2sql($_POST['TransAfterDate']);
@@ -332,9 +312,12 @@ function get_sql_for_customer_inquiry()
 //			(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount))) , ";
 		$sql .= "trans.alloc AS Allocated,
 		((trans.type = ".ST_SALESINVOICE.")
-			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue ,
+		Sum(line.quantity-line.qty_done) AS Outstanding
 		FROM "
-			.TB_PREF."debtor_trans as trans, "
+			.TB_PREF."debtor_trans as trans
+			LEFT JOIN ".TB_PREF."debtor_trans_details as line
+				ON trans.trans_no=line.debtor_trans_no AND trans.type=line.debtor_trans_type,"
 			.TB_PREF."debtors_master as debtor, "
 			.TB_PREF."cust_branch as branch
 		WHERE debtor.debtor_no = trans.debtor_no
@@ -349,7 +332,7 @@ function get_sql_for_customer_inquiry()
    	{
    		if ($_POST['filterType'] == '1')
    		{
-   			$sql .= " AND (trans.type = ".ST_SALESINVOICE." OR trans.type = ".ST_BANKPAYMENT.") ";
+   			$sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
    		}
    		elseif ($_POST['filterType'] == '2')
    		{
@@ -358,7 +341,7 @@ function get_sql_for_customer_inquiry()
    		elseif ($_POST['filterType'] == '3')
    		{
 			$sql .= " AND (trans.type = " . ST_CUSTPAYMENT 
-					." OR trans.type = ".ST_BANKDEPOSIT.") ";
+					." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") ";
    		}
    		elseif ($_POST['filterType'] == '4')
    		{
@@ -377,10 +360,12 @@ function get_sql_for_customer_inquiry()
 				trans.ov_freight + trans.ov_discount - trans.alloc > 0) ";
     	}
    	}
+	$sql .= " GROUP BY trans.trans_no, trans.type";
+
    	return $sql;
 }
 
-function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item)
+function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null, $customer_id=ALL_TEXT)
 {
 	$sql = "SELECT trans.trans_no,
 			debtor.name,
@@ -393,7 +378,7 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i
 			trans.due_date,
 			(ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue,
 			debtor.curr_code,
-			Sum(line.quantity-line.qty_done) AS Outstanding,
+			Sum(line.quantity-line.qty_done) AND sorder.prep_amount=0 AS Outstanding,
 			Sum(line.qty_done) AS Done
 		FROM "
 		 .TB_PREF."sales_orders as sorder, "
@@ -434,6 +419,9 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i
 
 		if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
 			$sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." ";
+		
+		if ($customer_id != ALL_TEXT)
+			$sql .= " AND trans.debtor_no = ".db_escape($customer_id);		
 
 		$sql .= " GROUP BY trans.trans_no ";