X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=bd99f58eeb8a5893d56cdbb2523c0c4d0800fe8a;hb=a5516c489de9179966d0874047bc44ba32c0a765;hp=d9e20583a3f655437c0015b8c035361de907943c;hpb=e7d70d0540ce162382b3ffcf50bff9f8e467bfeb;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index d9e20583..bd99f58e 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -353,7 +353,7 @@ function display_order_header(&$order, $editable, $date_text)
 		else
 		{
 			$row = get_customer_to_order($_POST['customer_id']);
-			if ($row['dissallow_invoices'] == 1)
+			if ($row && $row['dissallow_invoices'] == 1)
 				$customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
 		}
 	}
@@ -515,8 +515,11 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
         }		
 
 		$item_info = get_item_edit_info($_POST['stock_id']);
-		$units = $item_info["units"];
-		$dec = $item_info['decimals'];
+		$units = ''; $dec = 2;
+		if ($item_info) {
+				$units = $item_info["units"];
+				$dec = $item_info['decimals'];
+		}
 		$_POST['qty'] = number_format2(1, $dec);
 		$price = get_kit_price($_POST['stock_id'],
 			$order->customer_currency, $order->sales_type,
@@ -629,7 +632,7 @@ function display_delivery_details(&$order)
 		text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 50, 60,
 			_('Additional identifier for delivery e.g. name of receiving person'));
 
-		textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5,
+		textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, 255,
 			_('Delivery address. Default is address of customer branch'));
 
 		table_section(2);