X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=6d74bcbe43572f1a803c7bcd734d11065c22cd39;hb=45aa0f7f7e8a8683305bbdbc58fdb3b791d2115e;hp=55690ee3ac7ec83373e9896a43818e479a120b22;hpb=e9ad9e87f5eb2682d2e91c93134250fd8a8d2ad9;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 55690ee3..6d74bcbe 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -153,7 +153,7 @@ function display_po_header(&$order)
 
     if ($editable)
     {
-    	ref_row(_("Reference:"), 'ref');
+    	ref_row(_("Reference:"), 'ref', '', null, false, $order->trans_type, array('date'=> @$_POST['OrderDate']));
     }
     else
     {
@@ -172,7 +172,7 @@ function display_po_header(&$order)
 		dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
 	if (get_company_pref('use_dimension') == 2)
 		dimensions_list_row(_('Dimension 2').':', 'dimension2', null, true, _('Default'), false, 2);
-	locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); 
+	locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true, $order->fixed_asset); 
 
 	table_section(3);
 
@@ -211,13 +211,18 @@ 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[] = '';
+
    	table_header($th);
 
 	$id = find_submit('Edit');
@@ -231,8 +236,12 @@ function display_po_items(&$order, $editable=true)
     		alt_table_row_color($k);
         	label_cell($po_line->stock_id);
     		label_cell($po_line->item_description);
-            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 ($order->fixed_asset)
+    		    label_cell(1);
+         	else
+            	qty_cell($po_line->quantity, 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);
@@ -348,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');
@@ -380,8 +390,12 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	else
 	{
 
-		// Manufcatured item can be purchased
-		stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30));
+		// Manufactured item can be purchased
+		if ($order->fixed_asset)
+			stock_purchasable_fa_list_cells(null, 'stock_id', null, false, true, false, true, $order->line_items);
+		else
+			stock_items_list_cells(null, 'stock_id', null, false, true, false, true, array('editable' => 30, 'where'=>array("NOT no_purchase")));
+
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
@@ -400,8 +414,14 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 		$qty_rcvd = '';
 	}
 
-	qty_cells(null, 'qty', null, null, null, $dec);
-	qty_cell($qty_rcvd, false, $dec);
+	if ($order->fixed_asset) {
+		label_cell(1, '', 'qty');
+		hidden('qty', 1);
+	} else
+		qty_cells(null, 'qty', null, null, null, $dec);
+
+	if (!$new)
+		qty_cell($qty_rcvd, false, $dec);
 
 	label_cell($_POST['units'], '', 'units');
 	if ($order->trans_type == ST_PURCHORDER)