X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=f2896620d4b0e7f4abd5dff97ff61743c963c70c;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=5b7782aecafc5477fa9b71825eb26a7055ff37b3;hpb=963bc21ea092322d5750d4c0914b5e532e7d2467;p=fa-stable.git

diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc
index 5b7782ae..f2896620 100644
--- a/sales/includes/db/custalloc_db.inc
+++ b/sales/includes/db/custalloc_db.inc
@@ -34,23 +34,22 @@ function delete_cust_allocation($trans_id)
 
 //----------------------------------------------------------------------------------------
 
-function get_DebtorTrans_allocation_balance($trans_type, $trans_no)
+function get_cust_allocation($trans_id)
 {
-
-	$sql = "SELECT (ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc) AS BalToAllocate
-		FROM ".TB_PREF."debtor_trans WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
-	$result = db_query($sql,"calculate the allocation");
-	$myrow = db_fetch_row($result);
-
-	return $myrow[0];
+	$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 update_debtor_trans_allocation($trans_type, $trans_no, $alloc)
 {
-	$sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc
-		WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no);
+	if ($trans_type == ST_SALESORDER)
+		$sql = "UPDATE ".TB_PREF."sales_orders SET alloc = alloc + $alloc
+			WHERE trans_type=".db_escape($trans_type)." AND order_no = ".db_escape($trans_no);
+	else
+		$sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc
+			WHERE 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");
 }
 
@@ -65,36 +64,31 @@ function void_cust_allocations($type, $type_no, $date="")
 
 function clear_cust_alloctions($type, $type_no, $date="")
 {
-	// clear any allocations for this transaction
-	$sql = "SELECT * 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).")";
-	$result = db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
-
-	while ($row = db_fetch($result))
-	{
-		$sql = "UPDATE ".TB_PREF."debtor_trans SET alloc=alloc - " . $row['amt'] . "
-			WHERE (type= " . $row['trans_type_from'] . " AND trans_no=" . $row['trans_no_from'] . ")
-			OR (type=" . $row['trans_type_to'] . " AND trans_no=" . $row['trans_no_to'] . ")";
+	$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
+	 		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");
-		// 2008-09-20 Joe Hunt
-		if ($date != "")
-			exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
-				$row['amt'], PT_CUSTOMER, true);
-		//////////////////////
-	}
-
 
 	// 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).")";
 
 	db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no");
+// is this necessary?
+//	if ($date != "")
+//		exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date,
+//			$row['amt'], PT_CUSTOMER, true);
 }
-//----------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------
 
-function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_tables=null)
+function get_allocatable_from_cust_sql($customer_id=null, $settled)
 {
 	$sql = "SELECT
 		trans.type,
@@ -102,72 +96,150 @@ function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_
 		trans.reference,
 		trans.tran_date,
 		debtor.name AS DebtorName, 
-		debtor.curr_code, 
+		debtor.curr_code,
 		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
 		trans.alloc,
 		trans.due_date,
 		debtor.address,
-		trans.version ";
+		trans.version,
+		round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled
 
-	if ($extra_fields)
-		$sql .= ", $extra_fields ";
+	 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))";
 
-	$sql .= " FROM ".TB_PREF."debtor_trans as trans, "
-				.TB_PREF."debtors_master as debtor";
-	if ($extra_tables)
-		$sql .= ",$extra_tables ";
+	if (!$settled)
+		$sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)";
 
-	$sql .= " WHERE trans.debtor_no=debtor.debtor_no";
+	if ($customer_id != null)
+		$sql .= " AND trans.debtor_no = ".db_escape($customer_id);
 
-	if ($extra_conditions)
-		$sql .= " AND $extra_conditions ";
-	
 	return $sql;
 }
 
+function get_allocatable_sales_orders($customer_id = null, $trans_no=null, $type=null)
+{
+	$sql = "SELECT
+		sorder.trans_type as type,
+		sorder.order_no as trans_no,
+		sorder.reference,
+		sorder.ord_date,
+		debtor.name AS DebtorName, 
+		debtor.curr_code,
+		total-IFNULL(invoiced.amount,0) as Total,
+		sorder.alloc,
+		sorder.delivery_date as due_date,
+		debtor.address,
+		sorder.version,
+		amt
+		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 (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;
+
+	if ($trans_no != null and $type != null)
+	{
+		$sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+				  AND alloc.trans_type_from=".db_escape($type);
+	}
+	else
+	{
+		$sql .= " AND round(sorder.prep_amount)>0 and Total>0"; // only sales orders with prepayment level set and no yet fully invoiced
+	}
+	if ($customer_id)
+		$sql .= " AND sorder.debtor_no=".db_escape($customer_id);
 
+	$sql .= " GROUP BY sorder.order_no";
+
+	return $sql;
+}
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_from_cust_sql($customer_id, $settled)
+function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=null, $type=null)
 {
-	$settled_sql = "";
-	if (!$settled)
+	$sql = "SELECT
+		trans.type,
+		trans.trans_no,
+		trans.reference,
+		trans.tran_date,
+		debtor.name AS DebtorName, 
+		debtor.curr_code,
+		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+		trans.alloc,
+		trans.due_date,
+		debtor.address,
+		trans.version,
+		amt
+	 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,"
+	 		.TB_PREF."debtors_master as debtor
+	 WHERE
+	 	 trans.debtor_no=debtor.debtor_no";
+	if ($customer_id)
+		$sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
+	if ($trans_no != null and $type != null)
 	{
-		$settled_sql = " AND (round(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc,6) > 0)";
+		$sql .= " AND alloc.trans_no_from=".db_escape($trans_no)."
+				  AND alloc.trans_type_from=".db_escape($type);
 	}
-	$cust_sql = "";
-	if ($customer_id != null)
-		$cust_sql = " AND trans.debtor_no = ".db_escape($customer_id);
-
-	$sql = get_alloc_trans_sql("round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) <= 0 AS settled",
-		"(type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql);
+	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 .= " GROUP BY type, trans_no";
+	}
+	$orders = get_allocatable_sales_orders($customer_id, $trans_no, $type);
+	$sql = "($sql ORDER BY trans_no) \nUNION \n($orders)";
 
-	return $sql;
+	return db_query($sql, "Cannot retreive alloc to transactions");
 }
 
 //-------------------------------------------------------------------------------------------------------------
 
-function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $type=null)
+function get_allocatable_from_cust_transactions($customer_id, $trans_no=null, $type=null)
 {
+
+	$sql = "SELECT
+		trans.type,
+		trans.trans_no,
+		trans.reference,
+		trans.tran_date,
+		debtor.name AS DebtorName, 
+		debtor.curr_code,
+		ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
+		trans.alloc,
+		trans.due_date,
+		debtor.address,
+		trans.version,
+		amt
+	 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";
+
 	if ($trans_no != null and $type != null)
 	{
-		$sql = get_alloc_trans_sql("amt", "trans.trans_no = alloc.trans_no_to
-			AND trans.type = alloc.trans_type_to
-			AND alloc.trans_no_from=$trans_no
-			AND alloc.trans_type_from=$type
-			AND trans.debtor_no=".db_escape($customer_id),
-			"".TB_PREF."cust_allocations as alloc");
+		$sql .=	" AND alloc.trans_no_to=".db_escape($trans_no)."
+		  		  AND alloc.trans_type_to=".db_escape($type);
 	}
 	else
 	{
-		$sql = get_alloc_trans_sql(null, "round(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc,6) > 0
-			AND trans.type <> " . ST_CUSTPAYMENT . "
-			AND trans.type <> " . ST_BANKDEPOSIT . "
-			AND trans.type <> " . ST_CUSTCREDIT . "
-			AND trans.type <> " . ST_CUSTDELIVERY . "
-			AND trans.debtor_no=".db_escape($customer_id));
+		$sql .= " AND round(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 .= " GROUP BY type, trans_no";
 	}
 
+	if($customer_id)
+		$sql .= " AND trans.debtor_no=".db_escape($customer_id);
+
 	return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions");
 }
 
@@ -185,6 +257,7 @@ function get_sql_for_customer_allocation_inquiry()
 		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,
@@ -234,10 +307,58 @@ function get_sql_for_customer_allocation_inquiry()
 
    	if (!check_value('showSettled'))
    	{
-   		$sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + "
+   		$sql .= " AND (round(IF(trans.prep_amount,trans.prep_amount, abs(trans.ov_amount + trans.ov_gst + "
 		."trans.ov_freight + trans.ov_freight_tax + "
-		."trans.ov_discount) - trans.alloc,6) != 0) ";
+		."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
+		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).")
+			AND trans_type_from <> ".ST_CUSTCREDIT;
+		$result = db_query($sql, "can't retrieve invoice allocations");
+
+		while(($free < $amount) && ($alloc = db_fetch($result))) {
+			$unalloc = min($alloc['amt'], $amount-$free);
+			update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to'], 
+				-$unalloc);
+			update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from'], 
+				-$unalloc);
+
+			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);
+
+			$free += $unalloc;
+		}
+	}
+	if ($free < $amount) {
+		// this should never happen unless sparse credit notices were allocated to 
+		// the invoice, or summarized freight costs on credit notes is more than those on invoice.
+		display_error(_("Unsuspected overallocation happened due to sparse credit notes exists for this invoice.
+ Check all credit notes allocated to this invoice for summarized freight charges."));
+		return false;
+	}
+	update_debtor_trans_allocation(ST_SALESINVOICE, $invoice_no, $amount);
+	update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $amount);
+	add_cust_allocation($amount, ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no);
+
+	exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date,
+		$amount, PT_CUSTOMER);
+	return true;
+}
+
 ?>
\ No newline at end of file