X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=3b0489e352e8000db7a3b8a48be480d78602c117;hb=cf015790b7363cfcf29b98c82d20787c8d703fc1;hp=1df65425ab1da1f74faceeb4e8e1448c7416bdae;hpb=c935a4090e3f152dd5549217d69b5b5036197024;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 1df65425..3b0489e3 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -47,7 +47,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 		if (db_num_rows($result) == 0)
 		{
 		return _("The selected customer and branch are not valid, or the customer does not have any branches.");
-		} 
+		}
 
 		$myrow = db_fetch($result);
 
@@ -62,6 +62,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 		$order->set_location($myrow["default_location"], $myrow["location_name"]);
 		$order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
 		$address);
+		if ($order->trans_type == 10)
+			$order->due_date = get_invoice_duedate($customer_id, $order->document_date);
 	}
 
 	return $ret_error;
@@ -108,7 +110,7 @@ function display_order_summary($title, &$order, $editable_items=false)
 			view_stock_status_cell($stock_item->stock_id);
 
 			label_cell($stock_item->item_description, "nowrap" );
-			qty_cell($stock_item->qty_dispatched);
+			qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id));
 
 			if ($order->trans_no!=0)
 				amount_cell($stock_item->qty_done);
@@ -132,7 +134,7 @@ function display_order_summary($title, &$order, $editable_items=false)
 		{
 			sales_order_item_controls($order, $k,  $line_no);
 		}
-		
+
 		$total += $line_total;
 	}
 
@@ -179,7 +181,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 			$_POST['branch_id'] = '';
 			$Ajax->activate('branch_id');
   		}
-		customer_branches_list_row(_("Branch:"), 
+		customer_branches_list_row(_("Branch:"),
 	  	  $_POST['customer_id'], 'branch_id', null, false, true, true);
 
 		if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
@@ -203,6 +205,11 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				$_POST['deliver_to'] = $order->deliver_to;
 				$_POST['delivery_address'] = $order->delivery_address;
 				$_POST['phone'] = $order->phone;
+				if ($order->trans_type == 10)
+				{
+					$_POST['delivery_date'] = $order->due_date;
+					$Ajax->activate('delivery_date');
+				}
 				$Ajax->activate('Location');
 				$Ajax->activate('deliver_to');
 				$Ajax->activate('phone');
@@ -315,7 +322,8 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 	if ($line_no!=-1 && $line_no == $id)
 	{
 		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
-		$_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched);
+		$dec = get_qty_dec($_POST['stock_id']);
+		$_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec);
 		$_POST['price'] = price_format($order->line_items[$id]->price);
 		$_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
 		$units = $order->line_items[$id]->units;
@@ -330,32 +338,33 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 		if(isset($_POST['_stock_id_update'])) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
+			    $Ajax->activate('qty');
 			    $Ajax->activate('line_total');
 		}
 
 		$item_info = get_item_edit_info($_POST['stock_id']);
 		$units = $item_info["units"];
-
-		$_POST['qty'] = qty_format(1);
+		$dec = get_qty_dec($_POST['stock_id']);
+		$_POST['qty'] = number_format2(1, $dec);
 
 		$_POST['price'] = price_format(get_price ($_POST['stock_id'],
-			$order->customer_currency, $order->sales_type, 
+			$order->customer_currency, $order->sales_type,
 			$order->price_factor, $order->document_date));
 		// default to the customer's discount %
 		$_POST['Disc'] = percent_format($order->default_discount * 100);
 
 	}
 
-	qty_cells(null, 'qty', qty_format($_POST['qty']));
+	qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
 
 	if ($order->trans_no!=0) {
-		amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done);
+		qty_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done, false, $dec);
 	}
 
 	label_cell($units, '', 'units');
 
 	$str = amount_cells(null, 'price');
-	
+
 	small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec());
 
 	$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
@@ -370,11 +379,10 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 				_('Cancel changes'));
 		hidden('LineNo', $line_no);
 		set_focus('qty');
-		$Ajax->addFocus(true, 'qty');
 	}
 	else
 	{
-		submit_cells('AddItem', _("Add Item"), "colspan=2", 
+		submit_cells('AddItem', _("Add Item"), "colspan=2",
 		    _('Add new item to document'), true);
 	}
 
@@ -410,7 +418,7 @@ function display_delivery_details(&$order)
 
 	locations_list_row(_("Deliver from Location:"), 'Location', $order->Location);
 
-	date_row($delname, 'delivery_date', 
+	date_row($delname, 'delivery_date',
 	    _('Enter requested day of delivery'), $order->due_date, 0, 0, 0);
 
 	text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,