Fix [0000106] Error during direct invoice for non-ECB currencies.

[fa-stable.git] / sales / sales_order_entry.php

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 6087665f6d5c7e524b40c01a7c7527fab0668a27..3f1b20dba1ce3732f53918e68411bd0d9550fc84 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -28,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);
@@ -143,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();
 
 //-----------------------------------------------------------------------------
 
@@ -221,6 +218,7 @@ function copy_from_cart()
                $_POST['dimension_id'] = $cart->dimension_id;
                $_POST['dimension2_id'] = $cart->dimension2_id;
        }       
+       $_POST['cart_id'] = $cart->cart_id;
                
 }
 //--------------------------------------------------------------------------------
@@ -510,6 +508,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);