X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=9d87d93558b59985ccdb8ab20c5b3a136f7a9036;hb=b8ca787d4997e98d29af963f9e23534796381c44;hp=0b578aef8e75e857fe6d0141b9765e3c7fc827ca;hpb=c0ec8e1827bd2bfab21a5692ac16ebd4af3e292e;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 0b578aef..9d87d935 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -34,20 +34,28 @@ set_page_security( @$_SESSION['Items']->trans_type,
 			ST_CUSTDELIVERY => 'SA_SALESDELIVERY',
 			ST_SALESINVOICE => 'SA_SALESINVOICE'),
 	array(	'NewOrder' => 'SA_SALESORDER',
-			'ModifySalesOrder' => 'SA_SALESORDER',
+			'ModifyOrderNumber' => 'SA_SALESORDER',
+			'AddedID' => 'SA_SALESORDER',
+			'UpdatedID' => 'SA_SALESORDER',
 			'NewQuotation' => 'SA_SALESQUOTE',
 			'ModifyQuotationNumber' => 'SA_SALESQUOTE',
+			'NewQuoteToSalesOrder' => 'SA_SALESQUOTE',
+			'AddedQU' => 'SA_SALESQUOTE',
+			'UpdatedQU' => 'SA_SALESQUOTE',
 			'NewDelivery' => 'SA_SALESDELIVERY',
-			'NewInvoice' => 'SA_SALESINVOICE')
+			'AddedDN' => 'SA_SALESDELIVERY', 
+			'NewInvoice' => 'SA_SALESINVOICE',
+			'AddedDI' => 'SA_SALESINVOICE'
+			)
 );
 
 $js = '';
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
-if ($use_date_picker) {
+if (user_use_date_picker()) {
 	$js .= get_js_date_picker();
 }
 
@@ -58,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';
@@ -87,6 +100,17 @@ if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 }
 
 page($_SESSION['page_title'], false, false, "", $js);
+
+if (isset($_GET['ModifyOrderNumber']) && is_prepaid_order_open($_GET['ModifyOrderNumber']))
+{
+	display_error(_("This order cannot be edited because there are invoices or payments related to it, and prepayment terms were used."));
+	end_page(); exit;
+}
+if (isset($_GET['ModifyOrderNumber']))
+	check_is_editable(ST_SALESORDER, $_GET['ModifyOrderNumber']);
+elseif (isset($_GET['ModifyQuotationNumber']))
+	check_is_editable(ST_SALESQUOTE, $_GET['ModifyQuotationNumber']);
+
 //-----------------------------------------------------------------------------
 
 if (list_updated('branch_id')) {
@@ -109,6 +133,8 @@ if (isset($_GET['AddedID'])) {
 	submenu_option(_("Make &Delivery Against This Order"),
 		"/sales/customer_delivery.php?OrderNumber=$order_no");
 
+	submenu_option(_("Work &Order Entry"),	"/manufacturing/work_order_entry.php?");
+
 	submenu_option(_("Enter a &New Order"),	"/sales/sales_order_entry.php?NewOrder=0");
 
 	display_footer_exit();
@@ -204,13 +230,10 @@ if (isset($_GET['AddedID'])) {
 	submenu_print(_("&Print Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, 'prtopt');
 	submenu_print(_("&Email Sales Invoice"), ST_SALESINVOICE, $invoice."-".ST_SALESINVOICE, null, 1);
 	set_focus('prtopt');
-	
-	$sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations
-			WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice);
-	$result = db_query($sql, "could not retrieve customer allocation");
-	$row = db_fetch($result);
+
+	$row = db_fetch(get_allocatable_from_cust_transactions(null, $invoice, ST_SALESINVOICE));
 	if ($row !== false)
-		submenu_print(_("Print &Receipt"), $row['trans_type_from'], $row['trans_no_from']."-".$row['trans_type_from'], 'prtopt');
+		submenu_print(_("Print &Receipt"), $row['type'], $row['trans_no']."-".$row['type'], 'prtopt');
 
 	display_note(get_gl_view_str(ST_SALESINVOICE, $invoice, _("View the GL &Journal Entries for this Invoice")),0, 1);
 
@@ -221,9 +244,14 @@ if (isset($_GET['AddedID'])) {
 		submenu_option(_("Enter a &New Direct Invoice"),
 			"/sales/sales_order_entry.php?NewInvoice=0");
 
+	if ($row === false)
+		submenu_option(_("Entry &customer payment for this invoice"), "/sales/customer_payments.php?SInvoice=".$invoice);
+
+	submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice");
+
 	display_footer_exit();
 } else
-	check_edit_conflicts();
+	check_edit_conflicts(get_post('cart_id'));
 //-----------------------------------------------------------------------------
 
 function copy_to_cart()
@@ -235,24 +263,34 @@ function copy_to_cart()
 	$cart->Comments =  $_POST['Comments'];
 
 	$cart->document_date = $_POST['OrderDate'];
-	if ($cart->trans_type == ST_SALESINVOICE)
-		$cart->cash = $_POST['cash']; 
-	if ($cart->cash) {
-		$cart->due_date = $cart->document_date;
-		$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
-		$cart->freight_cost = 0;
-		$cart->ship_via = 1;
-		$cart->deliver_to = '';//$_POST['deliver_to'];
+
+	$newpayment = false;
+
+	if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) {
+		$cart->payment = $_POST['payment'];
+		$cart->payment_terms = get_payment_terms($_POST['payment']);
+		$newpayment = true;
+	}
+	if ($cart->payment_terms['cash_sale']) {
+		if ($newpayment) {
+			$cart->due_date = $cart->document_date;
+			$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
+			$cart->ship_via = 0;
+			$cart->deliver_to = '';
+			$cart->prep_amount = 0;
+		}
 	} else {
 		$cart->due_date = $_POST['delivery_date'];
 		$cart->cust_ref = $_POST['cust_ref'];
-		$cart->freight_cost = input_num('freight_cost');
 		$cart->deliver_to = $_POST['deliver_to'];
 		$cart->delivery_address = $_POST['delivery_address'];
 		$cart->phone = $_POST['phone'];
-		$cart->Location = $_POST['Location'];
 		$cart->ship_via = $_POST['ship_via'];
+		if (!$cart->trans_no || ($cart->trans_type == ST_SALESORDER && !$cart->is_started()))
+			$cart->prep_amount = input_num('prep_amount', 0);
 	}
+	$cart->Location = $_POST['Location'];
+	$cart->freight_cost = input_num('freight_cost');
 	if (isset($_POST['email']))
 		$cart->email =$_POST['email'];
 	else
@@ -260,11 +298,12 @@ function copy_to_cart()
 	$cart->customer_id	= $_POST['customer_id'];
 	$cart->Branch = $_POST['branch_id'];
 	$cart->sales_type = $_POST['sales_type'];
-	// POS
+
 	if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
 		$cart->dimension_id = $_POST['dimension_id'];
 		$cart->dimension2_id = $_POST['dimension2_id'];
-	}	
+	}
+	$cart->ex_rate = input_num('_ex_rate', null);
 }
 
 //-----------------------------------------------------------------------------
@@ -290,36 +329,53 @@ function copy_from_cart()
 
 	$_POST['branch_id'] = $cart->Branch;
 	$_POST['sales_type'] = $cart->sales_type;
+	$_POST['prep_amount'] = price_format($cart->prep_amount);
 	// POS 
-	if ($cart->trans_type == ST_SALESINVOICE)
-		$_POST['cash'] = $cart->cash;
+	$_POST['payment'] = $cart->payment;
 	if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
 		$_POST['dimension_id'] = $cart->dimension_id;
 		$_POST['dimension2_id'] = $cart->dimension2_id;
-	}	
+	}
 	$_POST['cart_id'] = $cart->cart_id;
-		
+	$_POST['_ex_rate'] = $cart->ex_rate;
 }
 //--------------------------------------------------------------------------------
 
 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');
 }
 
 //--------------------------------------------------------------------------------
 function can_process() {
-	global $Refs;
 
+	global $Refs, $SysPrefs;
+
+	copy_to_cart();
+
+	if (!get_post('customer_id')) 
+	{
+		display_error(_("There is no customer selected."));
+		set_focus('customer_id');
+		return false;
+	} 
+	
+	if (!get_post('branch_id')) 
+	{
+		display_error(_("This customer has no branch defined."));
+		set_focus('branch_id');
+		return false;
+	} 
+	
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date is invalid."));
 		set_focus('OrderDate');
 		return false;
 	}
 	if ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !is_date_in_fiscalyear($_POST['OrderDate'])) {
-		display_error(_("The entered date is not in fiscal year"));
+		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('OrderDate');
 		return false;
 	}
@@ -328,14 +384,25 @@ function can_process() {
 		set_focus('AddItem');
 		return false;
 	}
-	if ($_SESSION['Items']->cash == 0) {
-	if (strlen($_POST['deliver_to']) <= 1) {
-		display_error(_("You must enter the person or company to whom delivery should be made to."));
-		set_focus('deliver_to');
+	if (!$SysPrefs->allow_negative_stock() && ($low_stock = $_SESSION['Items']->check_qoh()))
+	{
+		display_error(_("This document cannot be processed because there is insufficient quantity for items marked."));
 		return false;
 	}
+	if ($_SESSION['Items']->payment_terms['cash_sale'] == 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');
+			return false;
+		}
+		if (strlen($_POST['deliver_to']) <= 1) {
+			display_error(_("You must enter the person or company to whom delivery should be made to."));
+			set_focus('deliver_to');
+			return false;
+		}
 
-		if (strlen($_POST['delivery_address']) <= 1) {
+		if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) {
 			display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."));
 			set_focus('delivery_address');
 			return false;
@@ -357,7 +424,6 @@ function can_process() {
 			set_focus('delivery_date');
 			return false;
 		}
-		//if (date1_greater_date2($_SESSION['Items']->document_date, $_POST['delivery_date'])) {
 		if (date1_greater_date2($_POST['OrderDate'], $_POST['delivery_date'])) {
 			if ($_SESSION['Items']->trans_type==ST_SALESQUOTE)
 				display_error(_("The requested valid date is before the date of the quotation."));
@@ -367,48 +433,81 @@ function can_process() {
 			return false;
 		}
 	}
-	if (!$Refs->is_valid($_POST['ref'])) {
+	else
+	{
+		if (!db_has_cash_accounts())
+		{
+			display_error(_("You need to define a cash account for your Sales Point."));
+			return false;
+		}	
+	}	
+	if (!$Refs->is_valid($_POST['ref'], $_SESSION['Items']->trans_type)) {
 		display_error(_("You must enter a reference."));
 		set_focus('ref');
 		return false;
 	}
+	if (!db_has_currency_rates($_SESSION['Items']->customer_currency, $_POST['OrderDate']))
+		return false;
+	
+   	if ($_SESSION['Items']->get_items_total() < 0) {
+		display_error("Invoice total amount cannot be less than zero.");
+		return false;
+	}
+
+	if ($_SESSION['Items']->payment_terms['cash_sale']) 
+		$_SESSION['Items']->due_date = $_SESSION['Items']->document_date;
 	return true;
 }
 
 //-----------------------------------------------------------------------------
 
-if (isset($_POST['ProcessOrder']) && can_process()) {
+if (isset($_POST['update'])) {
 	copy_to_cart();
+	$Ajax->activate('items_table');
+}
+
+if (isset($_POST['ProcessOrder']) && can_process()) {
 
 	$modified = ($_SESSION['Items']->trans_no != 0);
 	$so_type = $_SESSION['Items']->so_type;
-	$_SESSION['Items']->write(1);
-	if (count($messages)) { // abort on failure or error messages are lost
-		$Ajax->activate('_page_body');
-		display_footer_exit();
-	}
-	$trans_no = key($_SESSION['Items']->trans_no);
-	$trans_type = $_SESSION['Items']->trans_type;
-	new_doc_date($_SESSION['Items']->document_date);
-	processing_end();
-	if ($modified) {
-		if ($trans_type == ST_SALESQUOTE)
-			meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
-		else	
-			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
-	} elseif ($trans_type == ST_SALESORDER) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
-	} elseif ($trans_type == ST_SALESQUOTE) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
-	} elseif ($trans_type == ST_SALESINVOICE) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
-	} else {
-		meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
-	}
-}
 
-if (isset($_POST['update'])) {
-	$Ajax->activate('items_table');
+	$ret = $_SESSION['Items']->write(1);
+	if ($ret == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		$ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today()));
+		if ($ref != $_SESSION['Items']->reference)
+		{
+			unset($_POST['ref']); // force refresh reference
+			display_error(_("The reference number field has been increased. Please save the document again."));
+		}
+		set_focus('ref');
+	}
+	else
+	{
+		if (count($messages)) { // abort on failure or error messages are lost
+			$Ajax->activate('_page_body');
+			display_footer_exit();
+		}
+		$trans_no = key($_SESSION['Items']->trans_no);
+		$trans_type = $_SESSION['Items']->trans_type;
+		new_doc_date($_SESSION['Items']->document_date);
+		processing_end();
+		if ($modified) {
+			if ($trans_type == ST_SALESQUOTE)
+				meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
+			else	
+				meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+		} elseif ($trans_type == ST_SALESORDER) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+		} elseif ($trans_type == ST_SALESQUOTE) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
+		} elseif ($trans_type == ST_SALESINVOICE) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
+		} else {
+			meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+		}
+	}	
 }
 
 //--------------------------------------------------------------------------------
@@ -416,13 +515,19 @@ if (isset($_POST['update'])) {
 function check_item_data()
 {
 	global $SysPrefs;
-
-	if (!check_num('qty', 0) || !check_num('Disc', 0, 100)) {
+	
+	$is_inventory_item = is_inventory_item(get_post('stock_id'));
+	if(!get_post('stock_id_text', true)) {
+		display_error( _("Item description cannot be empty."));
+		set_focus('stock_id_edit');
+		return false;
+	}
+	elseif (!check_num('qty', 0) || !check_num('Disc', 0, 100)) {
 		display_error( _("The item could not be updated because you are attempting to set the quantity ordered to less than 0, or the discount percent to more than 100."));
 		set_focus('qty');
 		return false;
-	} elseif (!check_num('price', 0)) {
-		display_error( _("Price for item must be entered and can not be less than 0"));
+	} elseif (!check_num('price', 0) && (!$SysPrefs->allow_negative_prices() || $is_inventory_item)) {
+		display_error( _("Price for inventory item must be entered and can not be less than 0"));
 		set_focus('price');
 		return false;
 	} elseif (isset($_POST['LineNo']) && isset($_SESSION['Items']->line_items[$_POST['LineNo']])
@@ -431,21 +536,24 @@ function check_item_data()
 		set_focus('qty');
 		display_error(_("You attempting to make the quantity ordered a quantity less than has already been delivered. The quantity delivered cannot be modified retrospectively."));
 		return false;
-	} // Joe Hunt added 2008-09-22 -------------------------
-	elseif ($_SESSION['Items']->trans_type!=ST_SALESORDER && $_SESSION['Items']->trans_type!=ST_SALESQUOTE && !$SysPrefs->allow_negative_stock() &&
-		is_inventory_item($_POST['stock_id']))
+	}
+
+	$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)
 	{
-		$qoh = get_qoh_on_date($_POST['stock_id'], $_POST['Location'], $_POST['OrderDate']);
-		if (input_num('qty') > $qoh)
+		$dec = user_price_dec();
+		$curr = $_SESSION['Items']->customer_currency;
+		$price = number_format2(input_num('price'), $dec);
+		if ($cost_home == $cost)
+			$std_cost = number_format2($cost_home, $dec);
+		else
 		{
-			$stock = get_item($_POST['stock_id']);
-			display_error(_("The delivery cannot be processed because there is an insufficient quantity for item:") .
-				" " . $stock['stock_id'] . " - " . $stock['description'] . " - " .
-				_("Quantity On Hand") . " = " . number_format2($qoh, get_qty_dec($_POST['stock_id'])));
-			return false;
+			$price = $curr . " " . $price;
+			$std_cost = $curr . " " . number_format2($cost, $dec);
 		}
-		return true;
-	}
+		display_warning(sprintf(_("Price %s is below Standard Cost %s"), $price, $std_cost));
+	}	
 	return true;
 }
 
@@ -458,6 +566,7 @@ function handle_update_item()
 		 input_num('qty'), input_num('price'),
 		 input_num('Disc') / 100, $_POST['item_description'] );
 	}
+	page_modified();
   line_start_focus();
 }
 
@@ -468,7 +577,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();
 }
@@ -481,9 +590,11 @@ function handle_new_item()
 	if (!check_item_data()) {
 			return;
 	}
-	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
-		input_num('price'), input_num('Disc') / 100);
-	$_POST['_stock_id_edit'] = $_POST['stock_id']	= "";
+	add_to_order($_SESSION['Items'], get_post('stock_id'), input_num('qty'),
+		input_num('price'), input_num('Disc') / 100, get_post('stock_id_text'));
+
+	unset($_POST['_stock_id_edit'], $_POST['stock_id']);
+	page_modified();
 	line_start_focus();
 }
 
@@ -495,36 +606,36 @@ function  handle_cancel_order()
 
 
 	if ($_SESSION['Items']->trans_type == ST_CUSTDELIVERY) {
-		display_note(_("Direct delivery entry has been cancelled as requested."), 1);
+		display_notification(_("Direct delivery entry has been cancelled as requested."), 1);
 		submenu_option(_("Enter a New Sales Delivery"),	"/sales/sales_order_entry.php?NewDelivery=1");
-
 	} elseif ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
-		display_note(_("Direct invoice entry has been cancelled as requested."), 1);
+		display_notification(_("Direct invoice entry has been cancelled as requested."), 1);
 		submenu_option(_("Enter a New Sales Invoice"),	"/sales/sales_order_entry.php?NewInvoice=1");
-	} else {
+	} elseif ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
+	{
+		if ($_SESSION['Items']->trans_no != 0) 
+			delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
+		display_notification(_("This sales quotation has been cancelled as requested."), 1);
+		submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
+	} else { // sales order
 		if ($_SESSION['Items']->trans_no != 0) {
-			if ($_SESSION['Items']->trans_type == ST_SALESORDER && 
-				sales_order_has_deliveries(key($_SESSION['Items']->trans_no)))
-				display_error(_("This order cannot be cancelled because some of it has already been invoiced or dispatched. However, the line item quantities may be modified."));
-			else {
+			$order_no = key($_SESSION['Items']->trans_no);
+			if (sales_order_has_deliveries($order_no))
+			{
+				close_sales_order($order_no);
+				display_notification(_("Undelivered part of order has been cancelled as requested."), 1);
+				submenu_option(_("Select Another Sales Order for Edition"), "/sales/inquiry/sales_orders_view.php?type=".ST_SALESORDER);
+			} else {
 				delete_sales_order(key($_SESSION['Items']->trans_no), $_SESSION['Items']->trans_type);
-				if ($_SESSION['Items']->trans_type == ST_SALESQUOTE)
-				{
-					display_note(_("This sales quotation has been cancelled as requested."), 1);
-					submenu_option(_("Enter a New Sales Quotation"), "/sales/sales_order_entry.php?NewQuotation=Yes");
-				}
-				else
-				{
-					display_note(_("This sales order has been cancelled as requested."), 1);
-					submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes");
-				}
-			}	
+
+				display_notification(_("This sales order has been cancelled as requested."), 1);
+				submenu_option(_("Enter a New Sales Order"), "/sales/sales_order_entry.php?NewOrder=Yes");
+			}
 		} else {
 			processing_end();
 			meta_forward($path_to_root.'/index.php','application=orders');
 		}
 	}
-	$Ajax->activate('_page_body');
 	processing_end();
 	display_footer_exit();
 }
@@ -533,48 +644,39 @@ function  handle_cancel_order()
 
 function create_cart($type, $trans_no)
 { 
-	global $Refs;
+	global $Refs, $SysPrefs;
+
+	if (!$SysPrefs->db_ok) // create_cart is called before page() where the check is done
+		return;
 
 	processing_start();
-	$doc_type = $type;
 
 	if (isset($_GET['NewQuoteToSalesOrder']))
 	{
 		$trans_no = $_GET['NewQuoteToSalesOrder'];
-		$doc = new Cart(ST_SALESQUOTE, $trans_no);
-		$doc->trans_no = 0;
-		$doc->trans_type = ST_SALESORDER;
-		$doc->reference = $Refs->get_next($doc->trans_type);
-		$doc->document_date = $doc->due_date = new_doc_date();
+		$doc = new Cart(ST_SALESQUOTE, $trans_no, true);
 		$doc->Comments = _("Sales Quotation") . " # " . $trans_no;
 		$_SESSION['Items'] = $doc;
 	}	
 	elseif($type != ST_SALESORDER && $type != ST_SALESQUOTE && $trans_no != 0) { // this is template
-		$doc_type = ST_SALESORDER;
 
 		$doc = new Cart(ST_SALESORDER, array($trans_no));
 		$doc->trans_type = $type;
 		$doc->trans_no = 0;
 		$doc->document_date = new_doc_date();
 		if ($type == ST_SALESINVOICE) {
-			$doc->due_date = get_invoice_duedate($doc->customer_id, $doc->document_date);
-			$doc->pos = user_pos();
-			$pos = get_sales_point($doc->pos);
-			$doc->cash = $pos['cash_sale'];
-			if (!$pos['cash_sale'] || !$pos['credit_sale']) 
-				$doc->pos = -1; // mark not editable payment type
-			else
-				$doc->cash = date_diff2($doc->due_date, Today(), 'd')<2;
+			$doc->due_date = get_invoice_duedate($doc->payment, $doc->document_date);
+			$doc->pos = get_sales_point(user_pos());
 		} else
 			$doc->due_date = $doc->document_date;
-		$doc->reference = $Refs->get_next($doc->trans_type);
+		$doc->reference = $Refs->get_next($doc->trans_type, null, array('date' => Today()));
 		//$doc->Comments='';
 		foreach($doc->line_items as $line_no => $line) {
 			$doc->line_items[$line_no]->qty_done = 0;
 		}
 		$_SESSION['Items'] = $doc;
 	} else
-		$_SESSION['Items'] = new Cart($type,array($trans_no));
+		$_SESSION['Items'] = new Cart($type, array($trans_no));
 	copy_from_cart();
 }
 
@@ -598,7 +700,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."));
 
@@ -632,12 +737,10 @@ if ($_SESSION['Items']->trans_type == ST_SALESINVOICE) {
 start_form();
 
 hidden('cart_id');
-
-$customer_error = display_order_header($_SESSION['Items'],
-	($_SESSION['Items']->any_already_delivered() == 0), $idate);
+$customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
 
 if ($customer_error == "") {
-	start_table("$table_style width=80%", 10);
+	start_table(TABLESTYLE, "width='80%'", 10);
 	echo "<tr><td>";
 	display_order_summary($orderitems, $_SESSION['Items'], true);
 	echo "</td></tr>";
@@ -650,18 +753,23 @@ 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'));
 		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'));
+		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
+			submit_js_confirm('CancelOrder', _('You are about to void this Document.\nDo you want to continue?'));
 	}
 
-	submit_center_last('CancelOrder', $cancelorder,
-	   _('Cancels document entry or removes sales order when editing an old document'));
 } else {
 	display_error($customer_error);
 }
+
 end_form();
 end_page();
-
-?>
\ No newline at end of file