X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fdb%2Fcustomers_db.inc;h=f9b111a0b70445160b0ec3612f357576d664bfec;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=bc1dcbd90f4cf93214570a9bce83f4176773fb4d;hpb=d8ebbcd57414b1b57f6f422f00516646b21ada53;p=fa-stable.git

diff --git a/sales/includes/db/customers_db.inc b/sales/includes/db/customers_db.inc
index bc1dcbd9..f9b111a0 100644
--- a/sales/includes/db/customers_db.inc
+++ b/sales/includes/db/customers_db.inc
@@ -55,11 +55,14 @@ function delete_customer($customer_id)
 	begin_transaction();
 	delete_entity_contacts('customer', $customer_id);
 
-	$sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($customer_id);;
+	$sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no=".db_escape($customer_id);
 	db_query($sql,"cannot delete customer");
 	commit_transaction();
 }
 
+/*
+	This function probably should be renamed to get_customer_summary
+*/
 function get_customer_details($customer_id, $to=null, $all=true)
 {
 
@@ -79,7 +82,7 @@ function get_customer_details($customer_id, $to=null, $all=true)
 	$due = "IF (trans.type=".ST_SALESINVOICE.", trans.due_date, trans.tran_date)";
     $sql = "SELECT debtor.name, debtor.curr_code, terms.terms, debtor.credit_limit,
     			credit_status.dissallow_invoices, credit_status.reason_description,
-				Sum(IFNULL($value,0)) AS Balance,
+				Sum($value) AS Balance,
 				Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > 0,$value,0)) AS Due,
 				Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past1,$value,0)) AS Overdue1,
 				Sum(IF ((TO_DAYS('$todate') - TO_DAYS($due)) > $past2,$value,0)) AS Overdue2
@@ -89,8 +92,10 @@ function get_customer_details($customer_id, $to=null, $all=true)
 				 .TB_PREF."credit_status credit_status
 			WHERE
 					debtor.payment_terms = terms.terms_indicator
-	 			AND debtor.credit_status = credit_status.id
-			 	AND debtor.debtor_no = ".db_escape($customer_id);
+	 			AND debtor.credit_status = credit_status.id";
+	 if ($customer_id)
+		$sql .= " AND debtor.debtor_no = ".db_escape($customer_id);
+
 	if (!$all)
 		$sql .= " AND ABS(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount - trans.alloc) > ".FLOAT_COMP_DELTA;
 	$sql .= " GROUP BY
@@ -192,7 +197,7 @@ function get_customer_currency($customer_id=null, $branch_id=null)
 	$result = db_query($sql, "Retreive currency of customer $customer_id");
 
 	$myrow=db_fetch_row($result);
-	return $myrow[0];
+	return $myrow ? $myrow[0] : get_company_currency();
 }
 
 function get_customers_search($customer)