X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=477002a000c242e61bc778558f119d2be5d9291f;hb=91bede4226ba8b45151f0501ac88eb946ed5f2a1;hp=f9fc78e7cc0a47e0d568dd5ff13a4a09eda8e0e9;hpb=bb991dc5b071e966b39954bb53d3b0efe8420938;p=fa-stable.git diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc index f9fc78e7..477002a0 100644 --- a/sales/includes/db/custalloc_db.inc +++ b/sales/includes/db/custalloc_db.inc @@ -33,14 +33,27 @@ function delete_cust_allocation($trans_id) } //---------------------------------------------------------------------------------------- - -function update_debtor_trans_allocation($trans_type, $trans_no, $alloc) +// Update debtor trans alloc field according to current status of cust_allocations +// +function update_debtor_trans_allocation($trans_type, $trans_no) { - $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc - WHERE type=".db_escape($trans_type)." AND trans_no = ".db_escape($trans_no); + $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 + SET + trans.alloc=IFNULL(allocated.amt,0) + WHERE 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="") @@ -52,36 +65,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, @@ -89,79 +97,157 @@ 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 "; - - if ($extra_fields) - $sql .= ", $extra_fields "; + 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))"; - $sql .= " FROM ".TB_PREF."debtor_trans as trans, " - .TB_PREF."debtors_master as debtor"; - if ($extra_tables) - $sql .= ",$extra_tables "; - - $sql .= " WHERE trans.debtor_no=debtor.debtor_no"; + if (!$settled) + $sql .= " AND (round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc),6) > 0)"; - if ($extra_conditions) - $sql .= " AND $extra_conditions "; + if ($customer_id != null) + $sql .= " AND trans.debtor_no = ".db_escape($customer_id); 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"); } -function get_sql_for_customer_allocation_inquiry() +function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterType, $settled) { - $data_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); + $data_after = date2sql($from); + $date_to = date2sql($to); $sql = "SELECT trans.type, @@ -172,6 +258,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, @@ -186,25 +273,25 @@ function get_sql_for_customer_allocation_inquiry() AND trans.tran_date >= '$data_after' AND trans.tran_date <= '$date_to'"; - if ($_POST['customer_id'] != ALL_TEXT) - $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']); + if ($customer != ALL_TEXT) + $sql .= " AND trans.debtor_no = ".db_escape($customer); - if (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) + if (isset($filterType) && $filterType != ALL_TEXT) { - if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') + if ($filterType == '1' || $filterType == '2') { $sql .= " AND trans.type = ".ST_SALESINVOICE." "; } - elseif ($_POST['filterType'] == '3') + elseif ($filterType == '3') { $sql .= " AND trans.type = " . ST_CUSTPAYMENT; } - elseif ($_POST['filterType'] == '4') + elseif ($filterType == '4') { $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; } - if ($_POST['filterType'] == '2') + if ($filterType == '2') { $today = date2sql(Today()); $sql .= " AND trans.due_date < '$today' @@ -219,12 +306,13 @@ function get_sql_for_customer_allocation_inquiry() } - if (!check_value('showSettled')) + if (!$settled) { - $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; } @@ -244,30 +332,28 @@ function credit_sales_invoice_allocate($invoice_no, $credit_no, $amount, $date) 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'], $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); + while(($free < $amount) && ($alloc = db_fetch($result))) { + $unalloc = min($alloc['amt'], $amount-$free); 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); + update_debtor_trans_allocation($alloc['trans_type_to'], $alloc['trans_no_to']); + update_debtor_trans_allocation($alloc['trans_type_from'], $alloc['trans_no_from']); $free += $unalloc; } } - if ($free < $amount) { + if (floatcmp($free, $amount)<0) { // 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); + 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); exchange_variation(ST_CUSTCREDIT, $credit_no, ST_SALESINVOICE, $invoice_no, $date,