X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=638bf263c678873ef33b9f7a91f82a81fe020e89;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=add2b7094175387a9fc74fca106b46940910bf32;hpb=3faff3b471c0953bc1d11a6c00308779787a55f2;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index add2b709..638bf263 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -51,7 +51,7 @@ set_page_security( @$_SESSION['Items']->trans_type,
 
 $js = '';
 
-if ($use_popup_windows) {
+if ($SysPrefs->use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
 }
 
@@ -431,7 +431,7 @@ function can_process() {
 			return false;
 		}	
 	}	
-	if (!$Refs->is_valid($_POST['ref'])) {
+	if (!$Refs->is_valid($_POST['ref'], $_SESSION['Items']->trans_type)) {
 		display_error(_("You must enter a reference."));
 		set_focus('ref');
 		return false;
@@ -462,7 +462,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 	if ($ret == -1)
 	{
 		display_error(_("The entered reference is already in use."));
-		$ref = get_next_reference($_SESSION['Items']->trans_type);
+		$ref = $Refs->get_next($_SESSION['Items']->trans_type, null, array('date' => Today()));
 		if ($ref != $_SESSION['Items']->reference)
 		{
 			display_error(_("The reference number field has been increased. Please save the document again."));
@@ -514,7 +514,7 @@ function check_item_data()
 		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) && (!SysPrefs->$allow_negative_prices() || $is_inventory_item)) {
+	} 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;
@@ -624,7 +624,6 @@ function  handle_cancel_order()
 			meta_forward($path_to_root.'/index.php','application=orders');
 		}
 	}
-	$Ajax->activate('_page_body');
 	processing_end();
 	display_footer_exit();
 }
@@ -633,9 +632,9 @@ function  handle_cancel_order()
 
 function create_cart($type, $trans_no)
 { 
-	global $Refs;
+	global $Refs, $SysPrefs;
 
-	if (!$_SESSION['SysPrefs']->db_ok) // create_cart is called before page() where the check is done
+	if (!$SysPrefs->db_ok) // create_cart is called before page() where the check is done
 		return;
 
 	processing_start();
@@ -658,7 +657,7 @@ function create_cart($type, $trans_no)
 			$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;
@@ -726,7 +725,7 @@ hidden('cart_id');
 $customer_error = display_order_header($_SESSION['Items'], !$_SESSION['Items']->is_started(), $idate);
 
 if ($customer_error == "") {
-	start_table(TABLESTYLE, "width=80%", 10);
+	start_table(TABLESTYLE, "width='80%'", 10);
 	echo "<tr><td>";
 	display_order_summary($orderitems, $_SESSION['Items'], true);
 	echo "</td></tr>";
@@ -740,13 +739,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
@@ -759,4 +758,3 @@ if ($customer_error == "") {
 
 end_form();
 end_page();
-?>
\ No newline at end of file