// date_ is display date (non-sql)
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, $trans_link=0, $ship_via="", $due_date=null,
+ $sales_type=0, $order_no=0, $trans_link=0, $ship_via=0, $due_date="",
$AllocAmt=0)
{
$rate = get_exchange_rate_from_home_currency($curr, $date_);
$SQLDate = date2sql($date_);
- $SQLDueDate = date2sql($due_date);
+ if ($due_date == "")
+ $SQLDueDate = "000-00-00";
+ else
+ $SQLDueDate = date2sql($due_date);
if ($trans_no==0) {
$trans_no = get_next_trans_no($trans_type);
order_, ov_amount, ov_discount,
ov_gst, ov_freight, ov_freight_tax,
rate, ship_via, alloc, trans_link
- ) VALUES ($trans_no, $trans_type,
+ ) VALUES ($trans_no, $trans_type,
".db_escape($debtor_no).", ".db_escape($BranchNo).",
'$SQLDate', '$SQLDueDate', ".db_escape($reference).",
- ".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
+ ".db_escape($sales_type).", $order_no, $Total, ".db_escape($discount).", $Tax,
".db_escape($Freight).",
- $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link);
+ $FreightTax, $rate, ".db_escape($ship_via).", $AllocAmt, ".db_escape($trans_link).")";
} 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).",
{
$sql = "SELECT ".TB_PREF."debtor_trans.*,
ov_amount+ov_gst+ov_freight+ov_freight_tax+ov_discount AS Total,
- ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email,
+ ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.address, ".TB_PREF."debtors_master.email AS email2,
".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.tax_id, ".TB_PREF."debtors_master.payment_terms ";
if ($trans_type == systypes::cust_payment()) {
exit;
}
- return db_fetch($result);
+ //return db_fetch($result);
+ $row = db_fetch($result);
+ $row['email'] = $row['email2'];
+ return $row;
}
//----------------------------------------------------------------------------------------