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).",
- tax_included=".db_escape($tax_included)."
+ 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);
}
."cust.name AS DebtorName, cust.address, "
."cust.curr_code, "
."cust.tax_id,
- trans.prep_amount>0 as prepaid";
+ 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,
- ".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
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)
//----------------------------------------------------------------------------------------
-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)