X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=40c99ccf0a62835ac4190d6baa1b8bc9d6409a7b;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=3017f0221a9b502a6769bf5292a4d0155e46f66a;hpb=ec3b5ef00ee07bdf7559c8bdb6f857b7464c3fbe;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 3017f022..40c99ccf 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 //
 //	Entry/Modify Sales Order
@@ -18,18 +28,14 @@ include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = '';
 
-if ($ret = context_restore()) {
- // return from new customer add
-	copy_from_cart();
-	if(isset($ret['customer_id']))
-		$_POST['customer_id'] = $ret['customer_id'];
-	if(isset($ret['branch_id']))
-		$_POST['branch_id'] = $ret['branch_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
-	copy_to_cart(); //store context
-	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items');
-}
+editor_redirect( array(
+	'customer_id' => $path_to_root.'/sales/manage/customers.php?debtor_no='.get_post('customer_id'),
+	'branch_id' => $path_to_root.'/sales/manage/customer_branches.php?branch_id='.get_post('branch_id'),
+	));
+
+editor_return( array(
+	'customer_id'=>'customer_id',
+	'branch_id'=>'branch_id'));
 
 if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
@@ -133,7 +139,8 @@ if (isset($_GET['AddedID'])) {
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter a &New Direct Invoice"), "NewInvoice=0");
 
 	display_footer_exit();
-}
+} else
+	check_edit_conflicts();
 
 //-----------------------------------------------------------------------------
 
@@ -172,7 +179,11 @@ function copy_to_cart()
 	$cart->customer_id	= $_POST['customer_id'];
 	$cart->Branch = $_POST['branch_id'];
 	$cart->sales_type = $_POST['sales_type'];
-	// POS 
+	// POS
+	if ($cart->trans_type!=30) { // 2008-11-12 Joe Hunt
+		$cart->dimension_id = $_POST['dimension_id'];
+		$cart->dimension2_id = $_POST['dimension2_id'];
+	}	
 }
 
 //-----------------------------------------------------------------------------
@@ -203,6 +214,12 @@ function copy_from_cart()
 	// POS 
 	if ($cart->trans_type == 10)
 		$_POST['cash'] = $cart->cash;
+	if ($cart->trans_type!=30) { // 2008-11-12 Joe Hunt
+		$_POST['dimension_id'] = $cart->dimension_id;
+		$_POST['dimension2_id'] = $cart->dimension2_id;
+	}	
+	$_POST['cart_id'] = $cart->cart_id;
+		
 }
 //--------------------------------------------------------------------------------
 
@@ -278,7 +295,6 @@ 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');
@@ -340,9 +356,11 @@ function check_item_data()
 function handle_update_item()
 {
 	if ($_POST['UpdateItem'] != '' && check_item_data()) {
+		//alert("description=".$_POST['item_description']);
+		//$_SESSION['items']->line_items[$_POST['LineNo']]->item_description = $_POST['item_description'];
 		$_SESSION['Items']->update_cart_item($_POST['LineNo'],
 		 input_num('qty'), input_num('price'),
-		 input_num('Disc') / 100 );
+		 input_num('Disc') / 100, $_POST['item_description'] );
 	}
   line_start_focus();
 }
@@ -492,6 +510,7 @@ if ($_SESSION['Items']->trans_type == 10) {
 	$corder = _("Commit Order Changes");
 }
 start_form(false, true);
+hidden('cart_id');
 
 $customer_error = display_order_header($_SESSION['Items'],
 	($_SESSION['Items']->any_already_delivered() == 0), $idate);
@@ -509,15 +528,15 @@ if ($customer_error == "") {
 	if ($_SESSION['Items']->trans_no == 0) {
 
 		submit_center_first('ProcessOrder', $porder,
-		    _('Check entered data and save document'), true, 'confirm.png');
+		    _('Check entered data and save document'), true);
 	} else {
 		submit_center_first('ProcessOrder', $corder,
-		    _('Validate changes and update document'), true, 'confirm.png');
+		    _('Validate changes and update document'), true);
 	}
 
 	submit_center_last('CancelOrder', $cancelorder,
 	   _('Cancels document entry or removes sales order when editing an old document'),
-	   true, 'escape.png');
+	   true);
 } else {
 	display_error($customer_error);
 }