X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fsales_order_entry.php;h=3ad5b1991efd2e31145491083d065e279f071c68;hb=032543e8bebfaf5ed19f8a8bad793893af497862;hp=db81c1ce0cf994015093bd9812024e86d4c13b60;hpb=fd59c60718609c1bf3240a303030167a4f1b1885;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index db81c1ce..3ad5b199 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 Affero General Public License,
+	AGPL, 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/agpl-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);
@@ -517,15 +523,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, ICON_OK);
 	} else {
 		submit_center_first('ProcessOrder', $corder,
-		    _('Validate changes and update document'), true, 'confirm.png');
+		    _('Validate changes and update document'), true, ICON_OK);
 	}
 
 	submit_center_last('CancelOrder', $cancelorder,
 	   _('Cancels document entry or removes sales order when editing an old document'),
-	   true, 'escape.png');
+	   true, ICON_CANCEL);
 } else {
 	display_error($customer_error);
 }