X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=618030a450d3a3855a42d386ef9e3778228232ef;hb=247a958cc67f9479eb746984b23a660ff9334563;hp=f3e84af7aeca494dc06d25e2a938c6e7f9796047;hpb=19dce8c7be29e4cc8e7be92d044259348373d456;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index f3e84af7..618030a4 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -66,9 +66,14 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 
 } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
 
-	$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
 	create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
 
+	if (isset($_GET['FixedAsset'])) {
+		$_SESSION['page_title'] = _($help_context = "Fixed Assets Sale");
+		$_SESSION['Items']->fixed_asset = true;
+  	} else
+		$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
+
 } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
 
 	$help_context = 'Modifying Sales Order';
@@ -332,10 +337,10 @@ function copy_from_cart()
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
-  global 	$Ajax;
+  	global 	$Ajax;
 
-  $Ajax->activate('items_table');
-  set_focus('_stock_id_edit');
+  	$Ajax->activate('items_table');
+  	set_focus('_stock_id_edit');
 }
 
 //--------------------------------------------------------------------------------
@@ -380,7 +385,7 @@ function can_process() {
 		return false;
 	}
 	if ($_SESSION['Items']->payment_terms['cash_sale'] == 0) {
-		if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] < 0) && ((input_num('prep_amount')<=0) ||
+		if (!$_SESSION['Items']->is_started() && ($_SESSION['Items']->payment_terms['days_before_due'] == -1) && ((input_num('prep_amount')<=0) ||
 			input_num('prep_amount')>$_SESSION['Items']->get_trans_total())) {
 			display_error(_("Pre-payment required have to be positive and less than total amount."));
 			set_focus('prep_amount');
@@ -526,7 +531,7 @@ function check_item_data()
 		return false;
 	}
 
-	$cost_home = get_standard_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt
+	$cost_home = get_unit_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt
 	$cost = $cost_home / get_exchange_rate_from_home_currency($_SESSION['Items']->customer_currency, $_SESSION['Items']->document_date);
 	if (input_num('price') < $cost)
 	{
@@ -565,7 +570,7 @@ function handle_delete_item($line_no)
     if ($_SESSION['Items']->some_already_delivered($line_no) == 0) {
 	    $_SESSION['Items']->remove_from_cart($line_no);
     } else {
-	display_error(_("This item cannot be deleted because some of it has already been delivered."));
+		display_error(_("This item cannot be deleted because some of it has already been delivered."));
     }
     line_start_focus();
 }
@@ -624,7 +629,6 @@ function  handle_cancel_order()
 			meta_forward($path_to_root.'/index.php','application=orders');
 		}
 	}
-	$Ajax->activate('_page_body');
 	processing_end();
 	display_footer_exit();
 }
@@ -689,7 +693,10 @@ if (isset($_POST['CancelItemChanges'])) {
 }
 
 //--------------------------------------------------------------------------------
-check_db_has_stock_items(_("There are no inventory items defined in the system."));
+if ($_SESSION['Items']->fixed_asset)
+	check_db_has_disposable_fixed_assets(_("There are no fixed assets defined in the system."));
+else
+	check_db_has_stock_items(_("There are no inventory items defined in the system."));
 
 check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
 
@@ -740,13 +747,13 @@ if ($customer_error == "") {
 		submit_center_first('ProcessOrder', $porder,
 		    _('Check entered data and save document'), 'default');
 		submit_center_last('CancelOrder', $cancelorder,
-	   		_('Cancels document entry or removes sales order when editing an old document'), true);
+	   		_('Cancels document entry or removes sales order when editing an old document'));
 		submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
 	} else {
 		submit_center_first('ProcessOrder', $corder,
 		    _('Validate changes and update document'), 'default');
 		submit_center_last('CancelOrder', $cancelorder,
-	   		_('Cancels document entry or removes sales order when editing an old document'), true);
+	   		_('Cancels document entry or removes sales order when editing an old document'));
 		if ($_SESSION['Items']->trans_type==ST_SALESORDER)
 			submit_js_confirm('CancelOrder', _('You are about to cancel undelivered part of this order.\nDo you want to continue?'));
 		else