X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustalloc_db.inc;h=f9fc78e7cc0a47e0d568dd5ff13a4a09eda8e0e9;hb=a52174853a7922acd6626ac61032ec7674bce9cd;hp=e9695bbcd3f9bbde574ca4078ca4ec5fe350f4c4;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git diff --git a/sales/includes/db/custalloc_db.inc b/sales/includes/db/custalloc_db.inc index e9695bbc..f9fc78e7 100644 --- a/sales/includes/db/custalloc_db.inc +++ b/sales/includes/db/custalloc_db.inc @@ -17,7 +17,8 @@ function add_cust_allocation($amount, $trans_type_from, $trans_no_from, $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(), $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).")"; db_query($sql, "A customer allocation could not be added to the database"); } @@ -27,29 +28,16 @@ function add_cust_allocation($amount, $trans_type_from, $trans_no_from, function delete_cust_allocation($trans_id) { - $sql = "DELETE FROM ".TB_PREF."cust_allocations WHERE id = " . $trans_id; + $sql = "DELETE FROM ".TB_PREF."cust_allocations WHERE id = ".db_escape($trans_id); return db_query($sql, "The existing allocation $trans_id could not be deleted"); } //---------------------------------------------------------------------------------------- -function get_DebtorTrans_allocation_balance($trans_type, $trans_no) -{ - - $sql = "SELECT (ov_amount+ov_gst+ov_freight+ov_freight_tax-ov_discount-alloc) AS BalToAllocate - FROM ".TB_PREF."debtor_trans WHERE trans_no=$trans_no AND type=$trans_type"; - $result = db_query($sql,"calculate the allocation"); - $myrow = db_fetch_row($result); - - return $myrow[0]; -} - -//---------------------------------------------------------------------------------------- - function update_debtor_trans_allocation($trans_type, $trans_no, $alloc) { $sql = "UPDATE ".TB_PREF."debtor_trans SET alloc = alloc + $alloc - WHERE type=$trans_type AND trans_no = $trans_no"; + 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"); } @@ -66,8 +54,8 @@ 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=$type AND trans_no_from=$type_no) - OR (trans_type_to=$type AND trans_no_to=$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).")"; $result = db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no"); while ($row = db_fetch($result)) @@ -79,15 +67,15 @@ function clear_cust_alloctions($type, $type_no, $date="") // 2008-09-20 Joe Hunt if ($date != "") exchange_variation($type, $type_no, $row['trans_type_to'], $row['trans_no_to'], $date, - $row['amt'], payment_person_types::customer(), true); + $row['amt'], PT_CUSTOMER, true); ////////////////////// } // remove any allocations for this transaction $sql = "DELETE FROM ".TB_PREF."cust_allocations - WHERE (trans_type_from=$type AND trans_no_from=$type_no) - OR (trans_type_to=$type AND trans_no_to=$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"); } @@ -120,7 +108,7 @@ function get_alloc_trans_sql($extra_fields=null, $extra_conditions=null, $extra_ if ($extra_conditions) $sql .= " AND $extra_conditions "; - + return $sql; } @@ -136,10 +124,10 @@ function get_allocatable_from_cust_sql($customer_id, $settled) } $cust_sql = ""; if ($customer_id != null) - $cust_sql = " AND trans.debtor_no = $customer_id"; + $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=12 OR type=11 OR type=2) AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql); + "(type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT." OR type=".ST_BANKDEPOSIT.") AND (trans.ov_amount > 0) " . $settled_sql . $cust_sql); return $sql; } @@ -154,21 +142,137 @@ function get_allocatable_to_cust_transactions($customer_id, $trans_no=null, $typ AND trans.type = alloc.trans_type_to AND alloc.trans_no_from=$trans_no AND alloc.trans_type_from=$type - AND trans.debtor_no=$customer_id", + AND trans.debtor_no=".db_escape($customer_id), "".TB_PREF."cust_allocations as alloc"); } 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 != " . systypes::cust_payment() . " - AND trans.type != " . systypes::bank_deposit() . " - AND trans.type != 11 - AND trans.type != 13 - AND trans.debtor_no=$customer_id"); + 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)); } return db_query($sql." ORDER BY trans_no", "Cannot retreive alloc to transactions"); } +function get_sql_for_customer_allocation_inquiry() +{ + $data_after = date2sql($_POST['TransAfterDate']); + $date_to = date2sql($_POST['TransToDate']); + + $sql = "SELECT + trans.type, + trans.trans_no, + trans.reference, + trans.order_, + trans.tran_date, + trans.due_date, + debtor.name, + debtor.curr_code, + (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 + FROM " + .TB_PREF."debtor_trans as trans, " + .TB_PREF."debtors_master as debtor + WHERE debtor.debtor_no = trans.debtor_no + AND (trans.ov_amount + trans.ov_gst + trans.ov_freight + + trans.ov_freight_tax + trans.ov_discount != 0) + 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 (isset($_POST['filterType']) && $_POST['filterType'] != ALL_TEXT) + { + if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') + { + $sql .= " AND trans.type = ".ST_SALESINVOICE." "; + } + elseif ($_POST['filterType'] == '3') + { + $sql .= " AND trans.type = " . ST_CUSTPAYMENT; + } + elseif ($_POST['filterType'] == '4') + { + $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; + } + + if ($_POST['filterType'] == '2') + { + $today = date2sql(Today()); + $sql .= " AND trans.due_date < '$today' + AND (round(abs(trans.ov_amount + " + ."trans.ov_gst + trans.ov_freight + " + ."trans.ov_freight_tax + trans.ov_discount) - trans.alloc,6) > 0) "; + } + } + else + { + $sql .= " AND trans.type <> ".ST_CUSTDELIVERY." "; + } + + + if (!check_value('showSettled')) + { + $sql .= " AND (round(abs(trans.ov_amount + trans.ov_gst + " + ."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 + 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'], $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