X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=faa2a3c8e2c2283b7be83a6ad7a0e7efba442fdf;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=f58f677c1fea70d472b5c555e331f5b00bf230d3;hpb=06feaeabf5f8376201cf3aeb6367a4c97e1e2cbd;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index f58f677c..faa2a3c8 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -123,11 +123,14 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 	}
 	elseif ($order->trans_type == ST_SALESORDER)
 		$order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by());
+	elseif ($order->trans_type == ST_SALESQUOTE)
+		$order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days());
+
 	if($order->payment_terms['cash_sale']) {
 		$order->set_location($order->pos["pos_location"], $order->pos["location_name"]);
 	} else
 		$order->set_location($myrow["default_location"], $myrow["location_name"]);
-		
+
 	return $ret_error;
 }
 
@@ -135,7 +138,6 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 function display_order_summary($title, &$order, $editable_items=false)
 {
-	global $SysPrefs;
 
 	display_heading($title);
 
@@ -158,8 +160,8 @@ function display_order_summary($title, &$order, $editable_items=false)
 	$k = 0;  //row colour counter
 
 	$id = find_submit('Edit');
-	$has_marked = false;
 
+	$low_stock = $order->check_qoh($_POST['OrderDate'], $_POST['Location']);
 	foreach ($order->get_items() as $line_no=>$stock_item)
 	{
 
@@ -169,23 +171,10 @@ function display_order_summary($title, &$order, $editable_items=false)
 		$qoh_msg = '';
 		if (!$editable_items || $id != $line_no)
 		{
-			if (!$SysPrefs->allow_negative_stock() && is_inventory_item($stock_item->stock_id) && 
-				$order->trans_type != ST_SALESORDER && $order->trans_type!=ST_SALESQUOTE) {
-				$qoh = get_qoh_on_date($stock_item->stock_id, 
-					$_POST['Location'], $_POST['delivery_date']);
-				if (($stock_item->qty_dispatched -$stock_item->qty_done) > $qoh)
-				{
-					// oops, we don't have enough of one of the component items
-					start_row("class='stockmankobg'");
-					$qoh_msg .= $stock_item->stock_id . " - " . $stock_item->item_description . ": " .
-					_("Quantity On Hand") . " = " 
-					. number_format2($qoh, get_qty_dec($stock_item->stock_id)) . '<br>';
-					$has_marked = true;
-				 } else 
-					alt_table_row_color($k);
-			} else {
+			if (in_array($stock_item->stock_id, $low_stock))
+				start_row("class='stockmankobg'");	// notice low stock status
+			else 
 				alt_table_row_color($k);
-			}
 
 			view_stock_status_cell($stock_item->stock_id);
 
@@ -244,12 +233,9 @@ function display_order_summary($title, &$order, $editable_items=false)
 	end_row();
 
 	end_table();
-	if ($has_marked) {
+	if ($low_stock)
 		display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='stockmankofg'");
-		if ($order->trans_type!=30 && !$SysPrefs->allow_negative_stock())
-			display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:")
-				. '<br>'. $qoh_msg);
-	}
+
     div_end();
 }
 
@@ -382,7 +368,7 @@ function display_order_header(&$order, $editable, $date_text)
 	if (!is_company_currency($order->customer_currency) && in_array($order->trans_type, array(ST_SALESINVOICE, ST_CUSTDELIVERY)))
 	{
 		label_row(_("Customer Currency:"), $order->customer_currency);
-		exchange_rate_display($order->customer_currency, get_company_currency(),
+		exchange_rate_display(get_company_currency(), $order->customer_currency,
 			($editable ? $_POST['OrderDate'] : $order->document_date));
 	}
 
@@ -391,7 +377,8 @@ function display_order_header(&$order, $editable, $date_text)
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
 	table_section(3);
-	if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
+	if (($order->pos['cash_sale'] || $order->pos['credit_sale']) 
+		&& !$order->is_started()) {
 		 // editable payment type 
 		if (get_post('payment') !== $order->payment) {
 			$order->payment = get_post('payment');
@@ -407,11 +394,10 @@ function display_order_header(&$order, $editable, $date_text)
 		$paymcat = !$order->pos['cash_sale'] ? PM_CREDIT : 
 			(!$order->pos['credit_sale'] ? PM_CASH : PM_ANY);
 		// all terms are available for SO
-		sale_payment_list_cells(_('Payment:'), 'payment', 
-			(in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER)) 
-			? PM_ANY : $paymcat), null);
+		$is_order = in_array($order->trans_type, array(ST_SALESQUOTE, ST_SALESORDER));
+		sale_payment_list_cells(_('Payment:'), 'payment', $is_order ? PM_ANY : $paymcat, null, true, $is_order);
 	} else {
-		label_cells(_('Payment:'), $order->payment_terms['terms']);
+		label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'");
 	}
 
 	if($editable) {
@@ -519,7 +505,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 	}
 	else	// prepare new line
 	{
-		sales_items_list_cells(null,'stock_id', null, false, true);
+		sales_items_list_cells(null,'stock_id', null, false, true, true);
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
@@ -620,6 +606,14 @@ function display_delivery_details(&$order)
 		table_section(1);
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
+		if ($order->payment_terms['days_before_due'] < 0)
+		{
+			$Ajax->addUpdate('items_table', 'prep_amount', price_format($order->get_trans_total())); // bind to items_table update
+			if (!$order->is_started())
+				amount_row(_("Pre-Payment Required:"), 'prep_amount');
+			else
+				label_row(_("Pre-Payment Required:"), price_format($order->prep_amount), "class='label'");
+		}
 		if (list_updated('Location'))
 			$Ajax->activate('items_table');