X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=1484b91c142570cdd4cb748047647879a14b383b;hb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;hp=f9f1b3f4b2c569634c27203ff159f83a741f9af2;hpb=de320b43ef41373a90d9061483b6e8970947fdfa;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index f9f1b3f4..1484b91c 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -55,15 +55,6 @@ function display_po_header(&$order)
         	$_POST['supplier_id'] = get_global_supplier();
 
     	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
-
-    	if ($order->supplier_id != $_POST['supplier_id'])
-    	{
-    		// supplier has changed
-    		// delete all the order items - drastic but necessary because of
-    		// change of currency, etc
-    		$order->clear_items();
-		// FIX
-    	}
 	}
 	else
 	{
@@ -84,11 +75,9 @@ function display_po_header(&$order)
 
 	if (!is_company_currency($order->curr_code))
 	{
-//FIX div currency ?
 		label_row(_("Supplier Currency:"), $order->curr_code);
 		exchange_rate_display($order->curr_code, get_company_currency(),
 			$_POST['OrderDate']);
-
 	}
 
     if ($editable)
@@ -115,7 +104,10 @@ function display_po_header(&$order)
 	//	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 	//		$_POST['OrderDate'] = end_fiscalyear();
 	//}
-	date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0);
+	date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0, null, true);
+	if (isset($_POST['_OrderDate_changed'])) {
+		$Ajax->activate('_ex_rate');
+	}
 
   	text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
 
@@ -188,7 +180,6 @@ function display_po_items(&$order, $editable=true)
 		if ($po_line->Deleted == false)
 		{
     		$line_total =	round($po_line->quantity * $po_line->price,  user_price_dec());
-//    		if (!$editable || ($id != $po_line->line_no))
     		if (!$editable || ($id != $line_no))
 			{
     			alt_table_row_color($k);
@@ -206,8 +197,6 @@ function display_po_items(&$order, $editable=true)
 					  _('Edit document line'));
 					edit_button_cell("Delete$line_no", _("Delete"),
 					  _('Remove line from document'));
-//                    edit_link_cell(SID."Edit=" . $po_line->line_no);
-//                    delete_link_cell(SID."Delete=" . $po_line->line_no);
                 }
         		end_row();
 			}
@@ -289,19 +278,15 @@ function po_item_controls(&$order, $stock_id=null)
 	start_row();
 
 	$id = find_submit('Edit');
-	if ($id && $stock_id != null)
+	if (($id != -1) && $stock_id != null)
 	{
 		hidden('line_no', $id);
 
-		if (!isset($_POST['stock_id']))
-			$_POST['stock_id'] = $order->line_items[$id]->stock_id;
-		$dec = get_qty_dec($_POST['stock_id']);
-		if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
-			$_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
-		if (!isset($_POST['price']) || ($_POST['price'] == ""))
-			$_POST['price'] = price_format($order->line_items[$id]->price);
-		if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == ""))
-			$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
+		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
+			$dec = get_qty_dec($_POST['stock_id']);
+		$_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
+		$_POST['price'] = price_format($order->line_items[$id]->price);
+		$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
 
 		$_POST['units'] = $order->line_items[$id]->units;
 
@@ -315,7 +300,7 @@ function po_item_controls(&$order, $stock_id=null)
 		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
 
 		stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
-		if(isset($_POST['_stock_id_update'])) {
+		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
 			    $Ajax->activate('qty');
@@ -325,8 +310,8 @@ function po_item_controls(&$order, $stock_id=null)
     	$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
-		$dec = get_qty_dec($_POST['stock_id']);
-   		$_POST['qty'] = qty_format(1, $_POST['stock_id'], $dec);
+   		$dec = $item_info["decimals"];
+   		$_POST['qty'] =	number_format2(1, $dec);
 		$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
 		$_POST['req_del_date'] = add_days(Today(), 10);
 	}