X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcust_trans_db.inc;h=fd52d9ce1e1b7d508f17fe32ba4f34f618015279;hb=1b9351ae81a67726e757eba55895a4f059c7f128;hp=79aa50ab3555eb47ed2d19ec7001912074b02196;hpb=1734935f14ed161f322431481ed483dd2274f464;p=fa-stable.git diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc index 79aa50ab..fd52d9ce 100644 --- a/sales/includes/db/cust_trans_db.inc +++ b/sales/includes/db/cust_trans_db.inc @@ -43,7 +43,7 @@ function get_customer_trans_version($type, $trans_no) { $sql .= implode(' OR ', $trans_no) . ')'; $res = db_query($sql, 'document version retreival'); - + $vers = array(); while($mysql=db_fetch($res)) { $vers[$mysql['trans_no']] = $mysql['version']; @@ -56,7 +56,7 @@ function get_customer_trans_version($type, $trans_no) { function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo, $date_, $reference, $Total, $discount=0, $Tax=0, $Freight=0, $FreightTax=0, $sales_type=0, $order_no=0, $ship_via=0, $due_date="", - $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null) + $AllocAmt=0, $rate=0, $dimension_id=0, $dimension2_id=0, $payment_terms=null, $tax_included=0, $prep_amount=0) { $new = $trans_no==0; $curr = get_customer_currency($debtor_no); @@ -85,7 +85,7 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo, order_, ov_amount, ov_discount, ov_gst, ov_freight, ov_freight_tax, rate, ship_via, alloc, - dimension_id, dimension2_id, payment_terms + dimension_id, dimension2_id, payment_terms, tax_included, prep_amount ) VALUES (".db_escape($trans_no).", ".db_escape($trans_type).", ".db_escape($debtor_no).", ".db_escape($BranchNo).", '$SQLDate', '$SQLDueDate', ".db_escape($reference).", @@ -93,7 +93,8 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo, ".db_escape($Freight).", $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($dimension_id).", ".db_escape($dimension2_id).", " - .db_escape($payment_terms, true).")"; + .db_escape($payment_terms, true).", " + .db_escape($tax_included).", ".db_escape($prep_amount).")"; } else { // may be optional argument should stay unchanged ? $sql = "UPDATE ".TB_PREF."debtor_trans SET debtor_no=".db_escape($debtor_no)." , branch_code=".db_escape($BranchNo).", @@ -103,7 +104,9 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo, ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate, ship_via=".db_escape($ship_via).", alloc=$AllocAmt, dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).", - payment_terms=".db_escape($payment_terms, true)." + payment_terms=".db_escape($payment_terms, true).", + tax_included=".db_escape($tax_included).", + prep_amount =".db_escape($prep_amount)." WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type); } db_query($sql, "The debtor transaction record could not be inserted"); @@ -116,14 +119,17 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo, function get_customer_trans($trans_id, $trans_type) { + global $go_debug; + $sql = "SELECT trans.*," ."ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total," ."cust.name AS DebtorName, cust.address, " ."cust.curr_code, " - ."cust.tax_id, " + ."cust.tax_id, + trans.prep_amount>0 as prepaid," ."com.memo_"; - if ($trans_type == ST_CUSTPAYMENT) { + if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) { // it's a payment so also get the bank account // Chaitanya : Added bank_act to support Customer Payment Edit $sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name, @@ -143,11 +149,12 @@ function get_customer_trans($trans_id, $trans_type) .TB_PREF."tax_groups.id AS tax_group_id "; } - $sql .= " FROM ".TB_PREF."debtor_trans trans LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id + $sql .= " FROM ".TB_PREF."debtor_trans trans + LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via, ".TB_PREF."debtors_master cust"; - if ($trans_type == ST_CUSTPAYMENT) { + if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) { // it's a payment so also get the bank account $sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts"; } @@ -163,7 +170,7 @@ function get_customer_trans($trans_id, $trans_type) AND trans.type=".db_escape($trans_type)." AND trans.debtor_no=cust.debtor_no"; - if ($trans_type == ST_CUSTPAYMENT) { + if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) { // it's a payment so also get the bank account $sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)." AND ".TB_PREF."bank_trans.type=$trans_type @@ -181,12 +188,15 @@ function get_customer_trans($trans_id, $trans_type) if (db_num_rows($result) == 0) { // can't return nothing + if($go_debug) + display_backtrace(); display_db_error("no debtor trans found for given params", $sql, true); exit; } - if (db_num_rows($result) > 1) { // can't return multiple + if($go_debug) + display_backtrace(); display_db_error("duplicate debtor transactions found for given params", $sql, true); exit; } @@ -242,7 +252,7 @@ function void_customer_trans($type, $type_no) { // clear all values and mark as void $sql = "UPDATE ".TB_PREF."debtor_trans SET ov_amount=0, ov_discount=0, ov_gst=0, ov_freight=0, - ov_freight_tax=0, alloc=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); + ov_freight_tax=0, alloc=0, prep_amount=0, version=version+1 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); db_query($sql, "could not void debtor transactions for type=$type and trans_no=$type_no"); } @@ -275,11 +285,10 @@ function post_void_customer_trans($type, $type_no) } //---------------------------------------------------------------------------------------- - -function get_sql_for_customer_inquiry() +function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT) { - $date_after = date2sql($_POST['TransAfterDate']); - $date_to = date2sql($_POST['TransToDate']); + $date_after = date2sql($from); + $date_to = date2sql($to); $sql = "SELECT trans.type, @@ -293,7 +302,7 @@ function get_sql_for_customer_inquiry() debtor.curr_code, (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, "; - if ($_POST['filterType'] != ALL_TEXT) + if ($filter != ALL_TEXT) $sql .= "@bal := @bal+(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), "; // else @@ -315,34 +324,34 @@ function get_sql_for_customer_inquiry() AND trans.tran_date <= '$date_to' AND trans.branch_code = branch.branch_code"; - if ($_POST['customer_id'] != ALL_TEXT) - $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']); + if ($cust_id != ALL_TEXT) + $sql .= " AND trans.debtor_no = ".db_escape($cust_id); - if ($_POST['filterType'] != ALL_TEXT) + if ($filter != ALL_TEXT) { - if ($_POST['filterType'] == '1') + if ($filter == '1') { $sql .= " AND (trans.type = ".ST_SALESINVOICE.") "; } - elseif ($_POST['filterType'] == '2') + elseif ($filter == '2') { $sql .= " AND (trans.type = ".ST_SALESINVOICE.") "; } - elseif ($_POST['filterType'] == '3') + elseif ($filter == '3') { $sql .= " AND (trans.type = " . ST_CUSTPAYMENT ." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") "; } - elseif ($_POST['filterType'] == '4') + elseif ($filter == '4') { $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; } - elseif ($_POST['filterType'] == '5') + elseif ($filter == '5') { $sql .= " AND trans.type = ".ST_CUSTDELIVERY." "; } - if ($_POST['filterType'] == '2') + if ($filter == '2') { $today = date2sql(Today()); $sql .= " AND trans.due_date < '$today' @@ -355,7 +364,7 @@ function get_sql_for_customer_inquiry() return $sql; } -function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null) +function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item, $location, $delivery, $outstanding=false) { $sql = "SELECT trans.trans_no, debtor.name, @@ -368,7 +377,7 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i trans.due_date, (ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue, debtor.curr_code, - Sum(line.quantity-line.qty_done) AS Outstanding, + Sum(line.quantity-line.qty_done) AND sorder.prep_amount=0 AS Outstanding, Sum(line.qty_done) AS Done FROM " .TB_PREF."sales_orders as sorder, " @@ -385,30 +394,29 @@ function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_i AND trans.branch_code = branch.branch_code AND trans.debtor_no = branch.debtor_no "; - if ($_POST['OutstandingOnly'] == true) { + if ($outstanding == true) { $sql .= " AND line.qty_done < line.quantity "; } //figure out the sql required from the inputs available - if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "") + if ($delivery) { - $delivery = "%".$_POST['DeliveryNumber']; - $sql .= " AND trans.trans_no LIKE ".db_escape($delivery); + $sql .= " AND trans.trans_no LIKE %".db_escape($delivery); $sql .= " GROUP BY trans.trans_no"; } else { - $sql .= " AND trans.tran_date >= '".date2sql($_POST['DeliveryAfterDate'])."'"; - $sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'"; + $sql .= " AND trans.tran_date >= '".date2sql($from)."'"; + $sql .= " AND trans.tran_date <= '".date2sql($to)."'"; - if ($selected_customer != -1) - $sql .= " AND trans.debtor_no=".db_escape($selected_customer)." "; + if ($stock_item) + $sql .= " AND line.stock_id=".db_escape($stock_item)." "; - if (isset($selected_stock_item)) - $sql .= " AND line.stock_id=".db_escape($selected_stock_item)." "; + if ($location != ALL_TEXT) + $sql .= " AND sorder.from_stk_loc = ".db_escape($location)." "; - if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT) - $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." "; + if ($customer_id != ALL_TEXT) + $sql .= " AND trans.debtor_no = ".db_escape($customer_id); $sql .= " GROUP BY trans.trans_no ";