X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=a1f6a61c5e6ac2af3694a4563bd7f25404c7f8b3;hb=dace790b5b71c554f8de87babda2585dfa2a074c;hp=477002a000c242e61bc778558f119d2be5d9291f;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 477002a0..a1f6a61c 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -12,13 +12,14 @@
 //----------------------------------------------------------------------------------------
 
 function add_cust_allocation($amount, $trans_type_from, $trans_no_from,
-	$trans_type_to, $trans_no_to)
+	$trans_type_to, $trans_no_to, $person_id, $date_)
 {
+	$date = date2sql($date_);
 	$sql = "INSERT INTO ".TB_PREF."cust_allocations (
 		amt, date_alloc,
-		trans_type_from, trans_no_from, trans_no_to, trans_type_to)
-		VALUES ($amount, Now(), ".db_escape($trans_type_from).", ".db_escape($trans_no_from).", ".db_escape($trans_no_to)
-		.", ".db_escape($trans_type_to).")";
+		trans_type_from, trans_no_from, trans_no_to, trans_type_to, person_id)
+		VALUES ($amount, '$date', ".db_escape($trans_type_from).", ".db_escape($trans_no_from).", ".db_escape($trans_no_to)
+		.", ".db_escape($trans_type_to).", ".db_escape($person_id).")";
 
 	db_query($sql, "A customer allocation could not be added to the database");
 }
@@ -32,54 +33,62 @@ function delete_cust_allocation($trans_id)
 	return db_query($sql, "The existing allocation $trans_id could not be deleted");
 }
 
+//----------------------------------------------------------------------------------------
+
+function get_cust_allocation($trans_id)
+{
+	$sql = "SELECT * FROM ".TB_PREF."cust_allocations WHERE id = ".db_escape($trans_id);
+	return db_fetch(db_query($sql), "Cannot retrieve customer allocation $trans_id");
+}
+
 //----------------------------------------------------------------------------------------
 //	Update debtor trans alloc field according to current status of cust_allocations
 //
-function update_debtor_trans_allocation($trans_type, $trans_no)
+function update_debtor_trans_allocation($trans_type, $trans_no, $person_id)
 {
-	$sql = "UPDATE `".TB_PREF."debtor_trans` trans,
-			(SELECT sum(amt) amt from ".TB_PREF."cust_allocations
-				WHERE (trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
-				OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no).")) allocated
+	$sql = 
+		"UPDATE `".TB_PREF.($trans_type==ST_SALESORDER ? 'sales_orders' : 'debtor_trans')."` trans,
+			(SELECT sum(amt) amt FROM ".TB_PREF."cust_allocations
+				WHERE person_id=".db_escape($person_id)." AND ((trans_type_to=".db_escape($trans_type)." AND trans_no_to=".db_escape($trans_no).")
+				OR (trans_type_from=".db_escape($trans_type)." AND trans_no_from=".db_escape($trans_no)."))) allocated
 		SET 
 			trans.alloc=IFNULL(allocated.amt,0)
-		WHERE trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no);
-
+		WHERE trans.debtor_no=".db_escape($person_id)." AND ".($trans_type==ST_SALESORDER ?
+			   "trans.trans_type=".db_escape($trans_type)." AND order_no=".db_escape($trans_no)
+			:  "trans.type=".db_escape($trans_type)." AND trans_no=".db_escape($trans_no));
 	db_query($sql, "The debtor transaction record could not be modified for the allocation against it");
 }
 
-function get_cust_allocation($trans_id)
-{
-	$sql = "SELECT * FROM ".TB_PREF."cust_allocations WHERE id = ".db_escape($trans_id);
-	return db_fetch(db_query($sql), "Cannot retrieve customer allocation $trans_id");
-}
-
 //-------------------------------------------------------------------------------------------------------------
-
+//
 function void_cust_allocations($type, $type_no, $date="")
 {
-	return clear_cust_alloctions($type, $type_no, $date);
+	return clear_cust_alloctions($type, $type_no, null, $date);
 }
 
 //-------------------------------------------------------------------------------------------------------------
-
-function clear_cust_alloctions($type, $type_no, $date="")
+//
+function clear_cust_alloctions($type, $type_no, $person_id=null, $date="")
 {
 	$sql = "UPDATE  ".TB_PREF."cust_allocations ca
-				LEFT JOIN ".TB_PREF."debtor_trans paym ON ca.trans_type_from=paym.type AND ca.trans_no_from=paym.trans_no
-				LEFT JOIN ".TB_PREF."debtor_trans dt ON ca.trans_type_to=dt.type AND ca.trans_no_to=dt.trans_no
-				LEFT JOIN ".TB_PREF."sales_orders so ON ca.trans_type_to=so.trans_type AND ca.trans_no_to=so.order_no
+				LEFT JOIN ".TB_PREF."debtor_trans paym ON ca.trans_type_from=paym.type AND ca.trans_no_from=paym.trans_no AND ca.person_id=paym.debtor_no
+				LEFT JOIN ".TB_PREF."debtor_trans dt ON ca.trans_type_to=dt.type AND ca.trans_no_to=dt.trans_no AND ca.person_id=dt.debtor_no
+				LEFT JOIN ".TB_PREF."sales_orders so ON ca.trans_type_to=so.trans_type AND ca.trans_no_to=so.order_no AND ca.person_id=so.debtor_no
 	 		SET paym.alloc=paym.alloc - ca.amt,
 	 			dt.alloc=dt.alloc -  ca.amt,
 	 			so.alloc=so.alloc -  ca.amt
-			WHERE  (ca.trans_type_from=".db_escape($type)." AND ca.trans_no_from=".db_escape($type_no).")
-				OR (ca.trans_type_to=".db_escape($type)." AND ca.trans_no_to=".db_escape($type_no).")";
-		db_query($sql, "could not clear allocation");
+			WHERE  ((ca.trans_type_from=".db_escape($type)." AND ca.trans_no_from=".db_escape($type_no).")
+				OR (ca.trans_type_to=".db_escape($type)." AND ca.trans_no_to=".db_escape($type_no)."))";
+	if ($person_id)
+		$sql .= " AND ca.person_id=".db_escape($person_id);
+	db_query($sql, "could not clear allocation");
 
 	// remove any allocations for this transaction
 	$sql = "DELETE FROM ".TB_PREF."cust_allocations
-			WHERE  (trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
-				OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no).")";
+			WHERE  ((trans_type_from=".db_escape($type)." AND trans_no_from=".db_escape($type_no).")
+				OR (trans_type_to=".db_escape($type)." AND trans_no_to=".db_escape($type_no)."))";
+	if ($person_id)
+		$sql .= " AND person_id=".db_escape($person_id);
 
 	db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
 // is this necessary?
@@ -105,15 +114,17 @@ function get_allocatable_from_cust_sql($customer_id=null, $settled)
 		trans.version,
 		round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled,
 		trans.debtor_no
+
 	 FROM "
 	 	.TB_PREF."debtor_trans as trans, "
 		.TB_PREF."debtors_master as debtor"
 	." WHERE trans.debtor_no=debtor.debtor_no
-		AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))"
-		." OR (type=".ST_CUSTCREDIT." AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0))";
+		AND (((type=".ST_CUSTPAYMENT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0))
+		 OR (type=".ST_CUSTCREDIT. " AND (ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)>0)
+		 OR (type=".ST_JOURNAL. " AND (trans.ov_amount < 0)))";
 
 	if (!$settled)
-		$sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)";
+		$sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) > 0)";
 
 	if ($customer_id != null)
 		$sql .= " AND trans.debtor_no = ".db_escape($customer_id);
@@ -135,10 +146,13 @@ function get_allocatable_sales_orders($customer_id = null, $trans_no=null, $type
 		sorder.delivery_date as due_date,
 		debtor.address,
 		sorder.version,
-		amt
+		amt,
+		sorder.debtor_no,
+		sorder.branch_code
 		FROM ".TB_PREF."sales_orders as sorder
 			LEFT JOIN ".TB_PREF."debtors_master as debtor ON sorder.debtor_no = debtor.debtor_no
-			LEFT JOIN ".TB_PREF."cust_allocations as alloc ON sorder.order_no = alloc.trans_no_to AND sorder.trans_type = alloc.trans_type_to
+			LEFT JOIN ".TB_PREF."cust_allocations as alloc 
+				ON sorder.order_no = alloc.trans_no_to AND sorder.trans_type = alloc.trans_type_to AND alloc.person_id=sorder.debtor_no
 			LEFT JOIN (SELECT order_, sum(prep_amount) amount FROM ".TB_PREF."debtor_trans dt
 			WHERE prep_amount>0 AND dt.type=".ST_SALESINVOICE." GROUP BY order_) as invoiced ON sorder.order_no = invoiced.order_
 		WHERE sorder.trans_type=".ST_SALESORDER;
@@ -170,14 +184,17 @@ function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=nul
 		trans.tran_date,
 		debtor.name AS DebtorName, 
 		debtor.curr_code,
-		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+		IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount) AS Total,
 		trans.alloc,
 		trans.due_date,
 		debtor.address,
 		trans.version,
-		amt
+		amt,
+		trans.debtor_no,
+		trans.branch_code
 	 FROM ".TB_PREF."debtor_trans as trans
-			LEFT JOIN ".TB_PREF."cust_allocations as alloc ON trans.trans_no = alloc.trans_no_to AND trans.type = alloc.trans_type_to,"
+			LEFT JOIN ".TB_PREF."cust_allocations as alloc
+				ON trans.trans_no = alloc.trans_no_to AND trans.type = alloc.trans_type_to AND alloc.person_id=trans.debtor_no,"
 	 		.TB_PREF."debtors_master as debtor
 	 WHERE
 	 	 trans.debtor_no=debtor.debtor_no";
@@ -191,10 +208,23 @@ function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=nul
 	}
 	else
 	{
-		$sql .= " AND round(IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)-alloc,6) > 0
-			AND trans.type NOT IN (".implode(',',array(ST_CUSTPAYMENT,ST_BANKDEPOSIT,ST_CUSTCREDIT,ST_CUSTDELIVERY)).")";
+		$sql .= "
+				 AND (
+					trans.type='".ST_SALESINVOICE."'
+					AND round(IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)-alloc,6) > 0
+					OR
+					trans.type='". ST_CUSTCREDIT."'
+					AND round(-IF(prep_amount, prep_amount, ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount)-alloc,6) > 0
+					OR
+				  	trans.type = '". ST_JOURNAL."'
+					AND ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount>0
+					OR
+				  	trans.type = '". ST_BANKPAYMENT."'
+					AND ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount>0
+				)";
 		$sql .= " GROUP BY type, trans_no";
 	}
+
 	$orders = get_allocatable_sales_orders($customer_id, $trans_no, $type);
 	$sql = "($sql ORDER BY trans_no) \nUNION \n($orders)";
 
@@ -218,13 +248,15 @@ function get_allocatable_from_cust_transactions($customer_id, $trans_no=null, $t
 		trans.due_date,
 		debtor.address,
 		trans.version,
-		amt
+		amt,
+		trans.debtor_no
 	 FROM  ".TB_PREF."debtor_trans as trans,"
 			.TB_PREF."debtors_master as debtor,"
 			.TB_PREF."cust_allocations as alloc
 	 WHERE trans.debtor_no=debtor.debtor_no
 			AND trans.trans_no = alloc.trans_no_from
-			AND trans.type = alloc.trans_type_from";
+			AND trans.type = alloc.trans_type_from
+			AND trans.debtor_no = alloc.person_id";
 
 	if ($trans_no != null and $type != null)
 	{
@@ -258,12 +290,12 @@ function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterT
 		trans.due_date,
 		debtor.name,
 		debtor.curr_code,
-		debtor.debtor_no,
     	(trans.ov_amount + trans.ov_gst + trans.ov_freight 
 			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount,
 		trans.alloc AS Allocated,
 		((trans.type = ".ST_SALESINVOICE.")
-			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue,
+		trans.debtor_no
     	FROM "
 			.TB_PREF."debtor_trans as trans, "
 			.TB_PREF."debtors_master as debtor
@@ -312,23 +344,22 @@ function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterT
 		."trans.ov_freight + trans.ov_freight_tax + "
 		."trans.ov_discount)) - trans.alloc,6) != 0) ";
    	}
-
    	return $sql;
 }
 
 function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
 {
 
-	$sql = "SELECT ov_freight+ov_gst+ov_amount+ov_freight_tax as total, alloc FROM ".TB_PREF."debtor_trans
+	$sql = "SELECT ov_freight+ov_gst+ov_amount+ov_freight_tax as total, alloc, debtor_no FROM ".TB_PREF."debtor_trans
 		WHERE (`type`=".ST_SALESINVOICE." AND trans_no=".db_escape($invoice_no).")";
 	$result = db_query($sql, "can't retrieve invoice totals");
 	$invoice = db_fetch($result);
 	$free = $invoice['total'] - $invoice['alloc'];
-	
+
 	if ($free < $amount) {
 	 // if there is not enough unallocated amount - remove some payment allocations
 		$sql = "SELECT * FROM ".TB_PREF."cust_allocations
-			WHERE (trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no).")
+			WHERE (trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no)." AND person_id=".db_escape($invoice['debtor_no']).")
 			AND trans_type_from <> ".ST_CUSTCREDIT;
 		$result = db_query($sql, "can't retrieve invoice allocations");
 
@@ -338,10 +369,10 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
 			delete_cust_allocation($alloc['id']);
 			if ($unalloc < $alloc['amt'])
 				add_cust_allocation($alloc['amt']-$unalloc, $alloc['trans_type_from'],
-					$alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no);
+					$alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no, $invoice['debtor_no'], $date);
 
-			update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to']);
-			update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from']);
+			update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to'], $invoice['debtor_no']);
+			update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from'], $invoice['debtor_no']);
 			$free += $unalloc;
 		}
 	}
@@ -352,13 +383,11 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date)
  Check all credit notes allocated to this invoice for summarized freight charges."));
 		return false;
 	}
-	update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no);
-	update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no);
-	add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no);
+	add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $invoice['debtor_no'], $date);
+	update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $invoice['debtor_no']);
+	update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $invoice['debtor_no']);
 
 	exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date,
 		$amount, PT_CUSTOMER);
 	return true;
 }
-
-?>
\ No newline at end of file