X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fsales_order_entry.php;h=23410132e3290a820e37c2f90061117ccb212609;hb=063c5f22068dbbd6adccacaf5bd0f66b2eda8e4f;hp=08e8e7d6bd67b267c43ce204479f60f1bb627636;hpb=1f82a87e119d3b3749cf42f3024d7493ef6d8420;p=fa-stable.git

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 08e8e7d6..23410132 100644
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -34,11 +34,19 @@ set_page_security( @$_SESSION['Items']->trans_type,
 			ST_CUSTDELIVERY => 'SA_SALESDELIVERY',
 			ST_SALESINVOICE => 'SA_SALESINVOICE'),
 	array(	'NewOrder' => 'SA_SALESORDER',
-			'ModifySalesOrder' => 'SA_SALESORDER',
+			'ModifyOrderNumber' => 'SA_SALESORDER',
+			'AddedID' => 'SA_SALESORDER',
+			'UpdatedID' => 'SA_SALESORDER',
 			'NewQuotation' => 'SA_SALESQUOTE',
 			'ModifyQuotationNumber' => 'SA_SALESQUOTE',
+			'NewQuoteToSalesOrder' => 'SA_SALESQUOTE',
+			'AddedQU' => 'SA_SALESQUOTE',
+			'UpdatedQU' => 'SA_SALESQUOTE',
 			'NewDelivery' => 'SA_SALESDELIVERY',
-			'NewInvoice' => 'SA_SALESINVOICE')
+			'AddedDN' => 'SA_SALESDELIVERY', 
+			'NewInvoice' => 'SA_SALESINVOICE',
+			'AddedDI' => 'SA_SALESINVOICE'
+			)
 );
 
 $js = '';
@@ -54,12 +62,12 @@ if ($use_date_picker) {
 if (isset($_GET['NewDelivery']) && is_numeric($_GET['NewDelivery'])) {
 
 	$_SESSION['page_title'] = _($help_context = "Direct Sales Delivery");
-	create_cart(ST_CUSTDELIVERY, $_GET['NewDelivery']);
+	create_cart(ST_CUSTDELIVERY, 0);
 
 } elseif (isset($_GET['NewInvoice']) && is_numeric($_GET['NewInvoice'])) {
 
 	$_SESSION['page_title'] = _($help_context = "Direct Sales Invoice");
-	create_cart(ST_SALESINVOICE, $_GET['NewInvoice']);
+	create_cart(ST_SALESINVOICE, 0);
 
 } elseif (isset($_GET['ModifyOrderNumber']) && is_numeric($_GET['ModifyOrderNumber'])) {
 
@@ -223,6 +231,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();
@@ -237,27 +247,31 @@ function copy_to_cart()
 	$cart->Comments =  $_POST['Comments'];
 
 	$cart->document_date = $_POST['OrderDate'];
-//	if ($cart->trans_type == ST_SALESINVOICE) {
+
+	$newpayment = false;
+
 	if (isset($_POST['payment']) && ($cart->payment != $_POST['payment'])) {
 		$cart->payment = $_POST['payment'];
 		$cart->payment_terms = get_payment_terms($_POST['payment']);
+		$newpayment = true;
 	}
 	if ($cart->payment_terms['cash_sale']) {
-		$cart->due_date = $cart->document_date;
-		$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
-		$cart->freight_cost = input_num('freight_cost');
-		$cart->ship_via = 1;
-		$cart->deliver_to = '';//$_POST['deliver_to'];
+		if ($newpayment) {
+			$cart->due_date = $cart->document_date;
+			$cart->phone = $cart->cust_ref = $cart->delivery_address = '';
+			$cart->ship_via = 0;
+			$cart->deliver_to = '';
+		}
 	} else {
 		$cart->due_date = $_POST['delivery_date'];
 		$cart->cust_ref = $_POST['cust_ref'];
-		$cart->freight_cost = input_num('freight_cost');
 		$cart->deliver_to = $_POST['deliver_to'];
 		$cart->delivery_address = $_POST['delivery_address'];
 		$cart->phone = $_POST['phone'];
-		$cart->Location = $_POST['Location'];
 		$cart->ship_via = $_POST['ship_via'];
 	}
+	$cart->Location = $_POST['Location'];
+	$cart->freight_cost = input_num('freight_cost');
 	if (isset($_POST['email']))
 		$cart->email =$_POST['email'];
 	else
@@ -265,11 +279,11 @@ function copy_to_cart()
 	$cart->customer_id	= $_POST['customer_id'];
 	$cart->Branch = $_POST['branch_id'];
 	$cart->sales_type = $_POST['sales_type'];
-	// POS
+
 	if ($cart->trans_type!=ST_SALESORDER && $cart->trans_type!=ST_SALESQUOTE) { // 2008-11-12 Joe Hunt
 		$cart->dimension_id = $_POST['dimension_id'];
 		$cart->dimension2_id = $_POST['dimension2_id'];
-	}	
+	}
 }
 
 //-----------------------------------------------------------------------------
@@ -354,7 +368,7 @@ function can_process() {
 	}
 
 
-		if (strlen($_POST['delivery_address']) <= 1) {
+		if ($_SESSION['Items']->trans_type != ST_SALESQUOTE && strlen($_POST['delivery_address']) <= 1) {
 			display_error( _("You should enter the street address in the box provided. Orders cannot be accepted without a valid street address."));
 			set_focus('delivery_address');
 			return false;
@@ -399,12 +413,10 @@ function can_process() {
 		set_focus('ref');
 		return false;
 	}
-   	if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], 
-   		$_SESSION['Items']->trans_type)) {
-   		display_error(_("The entered reference is already in use."));
-		set_focus('ref');
-   		return false;
-   	} elseif ($_SESSION['Items']->get_items_total() < 0) {
+	if (!db_has_currency_rates($_SESSION['Items']->customer_currency, $_POST['OrderDate']))
+		return false;
+	
+   	if ($_SESSION['Items']->get_items_total() < 0) {
 		display_error("Invoice total amount cannot be less than zero.");
 		return false;
 	}
@@ -413,37 +425,47 @@ function can_process() {
 
 //-----------------------------------------------------------------------------
 
+if (isset($_POST['update'])) {
+	copy_to_cart();
+	$Ajax->activate('items_table');
+}
+
 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');
-		display_footer_exit();
-	}
-	$trans_no = key($_SESSION['Items']->trans_no);
-	$trans_type = $_SESSION['Items']->trans_type;
-	new_doc_date($_SESSION['Items']->document_date);
-	processing_end();
-	if ($modified) {
-		if ($trans_type == ST_SALESQUOTE)
-			meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
-		else	
-			meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
-	} elseif ($trans_type == ST_SALESORDER) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
-	} elseif ($trans_type == ST_SALESQUOTE) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
-	} elseif ($trans_type == ST_SALESINVOICE) {
-		meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
-	} else {
-		meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
-	}
-}
 
-if (isset($_POST['update'])) {
-	$Ajax->activate('items_table');
+	$ret = $_SESSION['Items']->write(1);
+	if ($ret == -1)
+	{
+		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
+	}
+	else
+	{
+		if (count($messages)) { // abort on failure or error messages are lost
+			$Ajax->activate('_page_body');
+			display_footer_exit();
+		}
+		$trans_no = key($_SESSION['Items']->trans_no);
+		$trans_type = $_SESSION['Items']->trans_type;
+		new_doc_date($_SESSION['Items']->document_date);
+		processing_end();
+		if ($modified) {
+			if ($trans_type == ST_SALESQUOTE)
+				meta_forward($_SERVER['PHP_SELF'], "UpdatedQU=$trans_no");
+			else	
+				meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$trans_no");
+		} elseif ($trans_type == ST_SALESORDER) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+		} elseif ($trans_type == ST_SALESQUOTE) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedQU=$trans_no");
+		} elseif ($trans_type == ST_SALESINVOICE) {
+			meta_forward($_SERVER['PHP_SELF'], "AddedDI=$trans_no&Type=$so_type");
+		} else {
+			meta_forward($_SERVER['PHP_SELF'], "AddedDN=$trans_no&Type=$so_type");
+		}
+	}	
 }
 
 //--------------------------------------------------------------------------------
@@ -487,6 +509,22 @@ function check_item_data()
 		}
 		return true;
 	}
+	$cost_home = get_standard_cost(get_post('stock_id')); // Added 2011-03-27 Joe Hunt
+	$cost = $cost_home / get_exchange_rate_from_home_currency($_SESSION['Items']->customer_currency, $_SESSION['Items']->document_date);
+	if (input_num('price') < $cost)
+	{
+		$dec = user_price_dec();
+		$curr = $_SESSION['Items']->customer_currency;
+		$price = number_format2(input_num('price'), $dec);
+		if ($cost_home == $cost)
+			$std_cost = number_format2($cost_home, $dec);
+		else
+		{
+			$price = $curr . " " . $price;
+			$std_cost = $curr . " " . number_format2($cost, $dec);
+		}
+		display_warning(sprintf(_("Price %s is below Standard Cost %s"), $price, $std_cost));
+	}	
 	return true;
 }
 
@@ -587,11 +625,7 @@ function create_cart($type, $trans_no)
 	if (isset($_GET['NewQuoteToSalesOrder']))
 	{
 		$trans_no = $_GET['NewQuoteToSalesOrder'];
-		$doc = new Cart(ST_SALESQUOTE, $trans_no);
-		$doc->trans_no = 0;
-		$doc->trans_type = ST_SALESORDER;
-		$doc->reference = $Refs->get_next($doc->trans_type);
-		$doc->document_date = $doc->due_date = new_doc_date();
+		$doc = new Cart(ST_SALESQUOTE, $trans_no, true);
 		$doc->Comments = _("Sales Quotation") . " # " . $trans_no;
 		$_SESSION['Items'] = $doc;
 	}	
@@ -699,6 +733,7 @@ if ($customer_error == "") {
 } else {
 	display_error($customer_error);
 }
+
 end_form();
 end_page();
 ?>
\ No newline at end of file