X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=a1f6a61c5e6ac2af3694a4563bd7f25404c7f8b3;hb=f01cb25258d7b619f820d8f78e9bccf4501fc58e;hp=1e58c2b149bff69f570729b483b6b9e5d7a848a0;hpb=8d564a2cbca92c71738d933813ac4985e15488e4;p=fa-stable.git diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc index 1e58c2b1..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,67 +33,72 @@ 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 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="") { - // 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'] . ")"; - 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); - // 2014-01-16 Joe Hunt. Fix for voiding allocated currency sales_invoices. - elseif ($type == ST_SALESINVOICE && $row['trans_type_to'] == $type && $row['trans_no_to'] == $type_no) - exchange_variation($row['trans_type_from'], $row['trans_no_from'], $row['trans_type_to'], $row['trans_no_to'], - sql2date($row['date_alloc']), $row['amt'], PT_CUSTOMER, true); - ////////////////////// - } - + $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 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)."))"; + 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? +// 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, @@ -100,99 +106,173 @@ 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.debtor_no "; - - if ($extra_fields) - $sql .= ", $extra_fields "; + round(abs(ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount-alloc),6) <= 0 AS settled, + trans.debtor_no - $sql .= " FROM ".TB_PREF."debtor_trans as trans, " - .TB_PREF."debtors_master as debtor"; - if ($extra_tables) - $sql .= ",$extra_tables "; + 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) + OR (type=".ST_JOURNAL. " AND (trans.ov_amount < 0)))"; - $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_from_cust_sql($customer_id, $settled) +function get_allocatable_sales_orders($customer_id = null, $trans_no=null, $type=null) { - $settled_sql = ""; - if (!$settled) + $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, + 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 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; + + 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); + 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 = 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); + $sql .= " GROUP BY sorder.order_no"; return $sql; } - //------------------------------------------------------------------------------------------------------------- -function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $type=null) +function get_allocatable_to_cust_transactions($customer_id = null, $trans_no=null, $type=null) { + $sql = "SELECT + trans.type, + trans.trans_no, + trans.reference, + trans.tran_date, + debtor.name AS DebtorName, + debtor.curr_code, + 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, + 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 AND alloc.person_id=trans.debtor_no," + .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) { - $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=".db_escape($trans_no)." - AND alloc.trans_type_from=".db_escape($type)." - AND trans.debtor_no=".db_escape($customer_id), - "".TB_PREF."cust_allocations as alloc"); + $sql .= " AND alloc.trans_no_from=".db_escape($trans_no)." + AND alloc.trans_type_from=".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 ( + 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"; } - return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions"); + $orders = get_allocatable_sales_orders($customer_id, $trans_no, $type); + $sql = "($sql ORDER BY trans_no) \nUNION \n($orders)"; + + return db_query($sql, "Cannot retreive alloc to transactions"); } //------------------------------------------------------------------------------------------------------------- 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, + 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.debtor_no = alloc.person_id"; + if ($trans_no != null and $type != null) { - $sql = get_alloc_trans_sql("amt", "trans.trans_no = alloc.trans_no_from - AND trans.type = alloc.trans_type_from - AND alloc.trans_no_to=".db_escape($trans_no)." - AND alloc.trans_type_to=".db_escape($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"); } @@ -260,42 +340,39 @@ function get_sql_for_customer_allocation_inquiry($from, $to, $customer, $filterT 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; } 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"); 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); + $alloc['trans_no_from'], ST_SALESINVOICE, $invoice_no, $invoice['debtor_no'], $date); + 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; } } @@ -306,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, $amount); - update_debtor_trans_allocation(ST_CUSTCREDIT, $credit_no, $amount); - 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