X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=ce0b8604c9f6d4e3fbc1472a766c23896cd6ac04;hb=e39803c300ad0071a20d0c1977b5db6d79aa91c4;hp=42d324aa0d732ce328ae11ed22277c2bea919dd0;hpb=86b4fb041e5eb3963d40b55387a77198e3fd6844;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 42d324aa..ce0b8604 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -123,6 +123,9 @@ 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
@@ -139,7 +142,8 @@ function display_order_summary($title, &$order, $editable_items=false)
 	display_heading($title);
 
     div_start('items_table');
-	start_table(TABLESTYLE, "colspan=7 width=90%");
+	start_table(TABLESTYLE, "width='90%'");
+
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
 		_("Delivered"),
 		_("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), "");
@@ -242,7 +246,7 @@ function display_order_header(&$order, $editable, $date_text)
 {
 	global $Ajax, $SysPrefs;
 
-	start_outer_table(TABLESTYLE2, "width=80%");
+	start_outer_table(TABLESTYLE2, "width='80%'");
 
 	table_section(1);
 	
@@ -374,7 +378,9 @@ 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']) {
+	start_row();
+	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');
@@ -390,12 +396,12 @@ 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'");
 	}
+	end_row();
 
 	if($editable) {
 		$str = sales_types_list_row(_("Price List:"), 'sales_type', null, true);
@@ -568,7 +574,7 @@ function display_delivery_details(&$order)
 	if ($order->payment_terms['cash_sale']) {	// Direct payment sale
 		$Ajax->activate('items_table');
 		display_heading(_('Cash payment'));
-		start_table(TABLESTYLE2, "width=60%");
+		start_table(TABLESTYLE2, "width='60%'");
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
  		if (list_updated('Location'))
@@ -599,10 +605,18 @@ function display_delivery_details(&$order)
 			$delname = _("Required Delivery Date").':';
 		}
 		display_heading($title);
-		start_outer_table(TABLESTYLE2, "width=90%");
+		start_outer_table(TABLESTYLE2, "width='90%'");
 		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');
 
@@ -610,7 +624,7 @@ function display_delivery_details(&$order)
 		date_row($delname, 'delivery_date',
 			$order->trans_type==ST_SALESORDER ?  _('Enter requested day of delivery') 
 				: $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : '');
-		text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
+		text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 50, 60,
 			_('Additional identifier for delivery e.g. name of receiving person'));
 
 		textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5,
@@ -631,4 +645,3 @@ function display_delivery_details(&$order)
 	div_end();
 }
 
-?>
\ No newline at end of file