X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=fab74ab6e6ec4f4ee94501a65d820755c10223dc;hb=2cb57633d2f3e27b0c2b2e7448564f467e21e1fd;hp=2e681f7f7e11e464b9fb286555fccabc68436b39;hpb=9b852b19c91b5af6400cf94a9ff65d37d1a730b4;p=fa-stable.git

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index 2e681f7f..fab74ab6 100644
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -24,7 +24,7 @@ function get_parent_trans($trans_type, $trans_no) {
 		$link = db_fetch($result);
 		return array($link['trans_link']);
 	}
-	if ($trans_type!=10) return 0;	// this is credit note with no parent invoice
+	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
@@ -102,7 +102,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
 	else
 		$SQLDueDate = date2sql($due_date);
 	
-	if ($trans_type == systypes::bank_payment())
+	if ($trans_type == ST_BANKPAYMENT)
 		$Total = -$Total;
 
 	if ($new) {
@@ -151,13 +151,13 @@ function get_customer_trans($trans_id, $trans_type)
 		".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 ";
 
-	if ($trans_type == systypes::cust_payment()) {
+	if ($trans_type == ST_CUSTPAYMENT) {
 		// 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 ";
 	}
 
-	if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+	if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
 		// it's an invoice so also get the shipper and salestype
 		$sql .= ", ".TB_PREF."shippers.shipper_name, "
 		.TB_PREF."sales_types.sales_type, "
@@ -171,12 +171,12 @@ function get_customer_trans($trans_id, $trans_type)
 
 	$sql .= " FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master ";
 
-	if ($trans_type == systypes::cust_payment()) {
+	if ($trans_type == ST_CUSTPAYMENT) {
 		// it's a payment so also get the bank account
 		$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
 	}
 
-	if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+	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 ";
 	}
@@ -185,13 +185,13 @@ function get_customer_trans($trans_id, $trans_type)
 		AND ".TB_PREF."debtor_trans.type=$trans_type
 		AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no";
 
-	if ($trans_type == systypes::cust_payment()) {
+	if ($trans_type == ST_CUSTPAYMENT) {
 		// it's a payment so also get the bank account
 		$sql .= " AND ".TB_PREF."bank_trans.trans_no =$trans_id
 			AND ".TB_PREF."bank_trans.type=$trans_type
 			AND ".TB_PREF."bank_accounts.id=".TB_PREF."bank_trans.bank_act ";
 	}
-	if ($trans_type == 10 OR $trans_type == 11 OR $trans_type == 13) {
+	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
@@ -276,14 +276,14 @@ function void_customer_trans($type, $type_no)
 function post_void_customer_trans($type, $type_no)
 {
 	switch ($type) {
-		case 10 :
-		case 11 :
+		case ST_SALESINVOICE :
+		case ST_CUSTCREDIT   :
 			void_sales_invoice($type, $type_no);
 			break;
-		case 13 :
+		case ST_CUSTDELIVERY :
 			void_sales_delivery($type, $type_no);
 			break;
-		case 12 :
+		case ST_CUSTPAYMENT :
 			void_customer_payment($type, $type_no);
 			break;
 	}