X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=2af450093abb0b65674e65a839d28c378db532cd;hb=84ebe8b3ebc1fc3e6508d75a4f39ce4a868b0b14;hp=0d2b3d33dbc7c1d011ea9d1525b8ea8e7d864a07;hpb=170d0390d753d3f2a7f30c4ed59488d7992426d8;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 0d2b3d33..2af45009 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -372,7 +372,6 @@ function display_order_header(&$order, $editable, $date_text)
 			$row = get_customer_to_order($_POST['customer_id']);
 			if ($row['dissallow_invoices'] == 1)
 				$customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
-		
 		}
 	}
 
@@ -380,10 +379,10 @@ function display_order_header(&$order, $editable, $date_text)
 
 	table_section(2);
 
-	if (!is_company_currency($order->customer_currency))
+	if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY)))
 	{
 		label_row(_("Customer Currency:"), $order->customer_currency);
-		exchange_rate_display($order->customer_currency, get_company_currency(),
+		exchange_rate_display(get_company_currency(), $order->customer_currency,
 			($editable ? $_POST['OrderDate'] : $order->document_date));
 	}
 
@@ -520,7 +519,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 	}
 	else	// prepare new line
 	{
-		sales_items_list_cells(null,'stock_id', null, false, true);
+		sales_items_list_cells(null,'stock_id', null, false, true, true);
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');