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)."
+ payment_terms=".db_escape($payment_terms, true)."
WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
}
db_query($sql, "The debtor transaction record could not be inserted");
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, "
+ ."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,
- ".TB_PREF."bank_accounts.account_type AS BankTransType ";
+ ".TB_PREF."bank_accounts.account_type AS BankTransType,
+ ".TB_PREF."bank_accounts.bank_curr_code,
+ ".TB_PREF."bank_trans.amount as bank_amount";
}
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
.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";
}
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
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;
}
//----------------------------------------------------------------------------------------
-function get_customer_trans_from_ref($type, $ref)
-{
- $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)."
- AND reference=".db_escape($ref);
-
- $result = db_query($sql, "Cannot retreive a debtor transaction");
-
- $row = db_fetch_row($result);
- return $row[0];
-}
-
-//----------------------------------------------------------------------------------------
-
// retreives the related sales order for a given trans
function get_customer_trans_order($type, $type_no)
return $sql;
}
-function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null)
+function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null, $customer_id=ALL_TEXT)
{
$sql = "SELECT trans.trans_no,
debtor.name,
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 ";