Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / sales / includes / db / cust_trans_db.inc

diff --git a/sales/includes/db/cust_trans_db.inc b/sales/includes/db/cust_trans_db.inc
index bcd41dba3d3b2e61a125c13bb38838e1f7c7a2bb..b91a279558873c141331c55c30c21a5222c9ae57 100644 (file)
--- a/sales/includes/db/cust_trans_db.inc
+++ b/sales/includes/db/cust_trans_db.inc
@@ -78,7 +78,7 @@ function get_customer_trans_version($type, $trans_no) {
 // 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)
 {
 
@@ -86,7 +86,10 @@ function write_customer_trans($trans_type, $trans_no, $debtor_no, $BranchNo,
        $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);
@@ -126,7 +129,7 @@ function get_customer_trans($trans_id, $trans_type)
 {
        $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()) {
@@ -192,7 +195,10 @@ function get_customer_trans($trans_id, $trans_type)
                exit;
        }
 
-       return db_fetch($result);
+       //return db_fetch($result);
+       $row = db_fetch($result);
+       $row['email'] = $row['email2'];
+       return $row;
 }
 
 //----------------------------------------------------------------------------------------