X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=fd9723dfe6841dc5695e4be418563529014ebb9e;hb=2bbf52478cf6cbf4fb89395f18390f1a6af93f40;hp=4d86b18dd327d06216524590c53b6cf3deee11ef;hpb=88231b75937436aedadf2a751893e887307aa419;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 4d86b18d..fd9723df 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -223,6 +223,8 @@ if (isset($_GET['AddedID'])) {
 		submenu_option(_("Enter a &New Direct Invoice"),
 			"/sales/sales_order_entry.php?NewInvoice=0");
 
+	submenu_option(_("Add an Attachment"), "/admin/attachments.php?filterType=".ST_SALESINVOICE."&trans_no=$invoice");
+
 	display_footer_exit();
 } else
 	check_edit_conflicts();
@@ -250,8 +252,6 @@ function copy_to_cart()
 			$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
 			$cart->ship_via = 1;
 			$cart->deliver_to = '';
-			$cart->Location = $cart->pos['pos_location'];
-			$cart->location_name = $cart->pos['location_name'];
 		}
 	} else {
 		$cart->due_date = $_POST['delivery_date'];
@@ -260,8 +260,8 @@ function copy_to_cart()
 		$cart->delivery_address = $_POST['delivery_address'];
 		$cart->phone = $_POST['phone'];
 		$cart->ship_via = $_POST['ship_via'];
-		$cart->Location = $_POST['Location'];
 	}
+	$cart->Location = $_POST['Location'];
 	$cart->freight_cost = input_num('freight_cost');
 	if (isset($_POST['email']))
 		$cart->email =$_POST['email'];
@@ -427,6 +427,7 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
 	copy_to_cart();
 	$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');