X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_credit_ui.inc;h=811167d603aa9103d82f1401c88eb3ee79d71a1c;hb=7e627484a9dbc0653469eb5ea22ba0cd2b036cc0;hp=751d7bd30cb8ba7debccd5a31f573705375a86fb;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index 751d7bd3..811167d6 100644
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -18,7 +18,7 @@ function display_credit_header(&$order)
 
 	customer_list_row(_("Customer:"), 'customer_id', null, false, true);
 
-	if ($order->customer_id != $_POST['customer_id'])
+	if ($order->customer_id != $_POST['customer_id'] || $order->sales_type != $_POST['sales_type_id'])
 	{
 		// customer has changed
 
@@ -68,8 +68,8 @@ function display_credit_header(&$order)
 	echo "<table height='5'>";
 
     if (!isset($_POST['sales_type_id']))
-    	$_POST['sales_type_id'] = $order->default_sales_type;
-    sales_types_list_row(_("Sales Type"), 'sales_type_id', $_POST['sales_type_id']);
+    	$_POST['sales_type_id'] = $order->sales_type;
+    sales_types_list_row(_("Sales Type"), 'sales_type_id', $_POST['sales_type_id'], true);
 
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 	echo "</table>";
@@ -215,7 +215,8 @@ function credit_edit_item_controls(&$order, $line_no=-1)
 		$_POST['units'] = $item_info["units"];
 
    		$_POST['qty'] = 0;
-		$_POST['price'] = get_price($_POST['stock_id'], $order->customer_id);
+		$_POST['price'] = get_price($_POST['stock_id'],
+		     $order->customer_currency, $order->sales_type);
 		// default to the customer's discount %
 		$_POST['Disc'] = $order->default_discount * 100;
 	}