X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=80d6a3b5a803396c549e09f363d8cfd33a4b5e9b;hb=1c502501a16dbb08e3f031e3c3a3038540c8b296;hp=44f2b3930b86a0bf75166d4e6581928a244850b6;hpb=95ff74b5722826544743a01daf527aa3c9efe11a;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 44f2b393..80d6a3b5 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -166,7 +166,7 @@ function display_po_header(&$order)
 	if ($order->trans_type==ST_SUPPINVOICE)
 		date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
-  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60);
 
 	if (get_company_pref('use_dimension'))
 		dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
@@ -211,11 +211,15 @@ function display_po_items(&$order, $editable=true)
     div_start('items_table');
     start_table(TABLESTYLE, "width='80%'");
 
-   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
-		_("Received"), _("Unit"),
-   		_("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+	$new = $order->order_no == 0;
+
+   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"),
+   		_("Unit"), _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+
 	if ($order->trans_type != ST_PURCHORDER)
 		array_remove($th, 5);
+	if ($new)
+		array_remove($th, 3);
 
 	if (count($order->line_items)) $th[] = '';
 
@@ -236,8 +240,8 @@ function display_po_items(&$order, $editable=true)
     		    label_cell(1);
          	else
             	qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
-
-            qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
+			if (!$new)
+	            qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
     		label_cell($po_line->units);
 			if ($order->trans_type == ST_PURCHORDER)
         	    label_cell($po_line->req_del_date);
@@ -353,6 +357,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
    global $Ajax, $SysPrefs;
 
 	alt_table_row_color($rowcounter);
+	$new = $order->order_no == 0;
 
 	$dec2 = 0;
 	$id = find_submit('Edit');
@@ -398,10 +403,13 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 			    $Ajax->activate('req_del_date');
 			    $Ajax->activate('line_total');
 		}
-    	$item_info = get_item_edit_info($_POST['stock_id']);
-		$_POST['units'] = $item_info["units"];
 
-   		$dec = $item_info["decimals"];
+		$dec = 0; $_POST['units'] = '';
+    	$item_info = get_item_edit_info($_POST['stock_id']);
+    	if ($item_info) {
+			$_POST['units'] = $item_info["units"];
+	   		$dec = $item_info["decimals"];
+	   	}
    		$_POST['qty'] =	number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
 		$_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
 		if ($order->trans_type == ST_PURCHORDER)
@@ -415,7 +423,8 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	} else
 		qty_cells(null, 'qty', null, null, null, $dec);
 
-	qty_cell($qty_rcvd, false, $dec);
+	if (!$new)
+		qty_cell($qty_rcvd, false, $dec);
 
 	label_cell($_POST['units'], '', 'units');
 	if ($order->trans_type == ST_PURCHORDER)