X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=28b079cd3ff3192a8a2a15cd07e1ef44237ab970;hb=a5242af68e65661edb7175412444dce536a7f311;hp=a1122708b8f16c05c1e63f572c600c9253cf83e7;hpb=b6af4ea4c99734cfd051395289107bbba5a405e9;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index a1122708..28b079cd 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -1,13 +1,13 @@
 <?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.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
@@ -167,7 +167,8 @@ function display_order_summary($title, &$order, $editable_items=false)
 
 			view_stock_status_cell($stock_item->stock_id);
 
-			label_cell($stock_item->item_description, "nowrap" );
+			//label_cell($stock_item->item_description, "nowrap" );
+			label_cell($stock_item->item_description );
 			qty_cell($stock_item->qty_dispatched, false, get_qty_dec($stock_item->stock_id));
 
 			if ($order->trans_no!=0)
@@ -244,25 +245,27 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		customer_branches_list_row(_("Branch:"),
 	  	  $_POST['customer_id'], 'branch_id', null, false, true, true);
 
-	if( ($order->customer_id != get_post('customer_id', -1)) ||
+		if( ($order->customer_id != get_post('customer_id', -1)) ||
 			($order->Branch != get_post('branch_id', -1)) ||
-			list_updated('customer_id')) {
-
-		if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+			list_updated('customer_id')) 
 		{
-			// ignore errors on customer search box call
-			if ($_POST['customer_id'] == '')
-			    $customer_error = _("No customer found for entered text.");
+
+			if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+			{
+				// ignore errors on customer search box call
+				if ($_POST['customer_id'] == '')
+					$customer_error = _("No customer found for entered text.");
+				else
+					$customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
+				unset($_POST['branch_id']);
+				$order->Branch = 0;
+			} 
 			else
-			    $customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
-		    unset($_POST['branch_id']);
-		    $order->Branch = 0;
-		} else
-		{
+			{
 
 				$old_order = (PHP_VERSION<5) ? $order : clone( $order );
-				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 
+				$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 				$_POST['Location'] = $order->Location;
 				$_POST['deliver_to'] = $order->deliver_to;
 				$_POST['delivery_address'] = $order->delivery_address;
@@ -285,13 +288,13 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				// change prices if necessary
 				// what about discount in template case?
 				if ($old_order->customer_currency != $order->customer_currency) {
-				    $change_prices = 1;
+					$change_prices = 1;
 				}
 				if ($old_order->sales_type != $order->sales_type) {
 				//  || $old_order->default_discount!=$order->default_discount
 					$_POST['sales_type'] = $order->sales_type;
-				    $Ajax->activate('sales_type');
-				    $change_prices = 1;
+					$Ajax->activate('sales_type');
+					$change_prices = 1;
 				}
 				if ($old_order->dimension_id != $order->dimension_id) {
 					$_POST['dimension_id'] = $order->dimension_id;
@@ -303,11 +306,18 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 				}
 				unset($old_order);
 			}
-		set_global_customer($_POST['customer_id']);
+			set_global_customer($_POST['customer_id']);
 		} // changed branch
+		else
+		{
+			$row = get_customer_to_order($_POST['customer_id']);
+			if ($row['dissallow_invoices'] == 1)
+				$customer_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
+		
+		}
 	}
 
-	if ($_SESSION['Items']->trans_type!=30) {
+	if ($order->trans_type != 30) {
 		ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 	}
 
@@ -403,7 +413,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	if ($display_tax_group)
 	{
 	    label_row(_("Tax Group:"), $order->tax_group_name);
-	    hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
+	    hidden('tax_group_id', $order->tax_group_id);
 	}
 
 	end_outer_table(1); // outer table
@@ -437,10 +447,12 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 		$_POST['qty'] = number_format2($order->line_items[$id]->qty_dispatched, $dec);
 		$_POST['price'] = price_format($order->line_items[$id]->price);
 		$_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
+		$_POST['item_description'] = $order->line_items[$id]->item_description;
 		$units = $order->line_items[$id]->units;
 		hidden('stock_id', $_POST['stock_id']);
 		label_cell($_POST['stock_id']);
-		label_cell($order->line_items[$line_no]->item_description, "nowrap");
+		text_cells(null,'item_description', null, 45, 150);
+		//label_cell($order->line_items[$line_no]->item_description, "nowrap");
 	    $Ajax->activate('items_table');
 	}
 	else	// prepare new line
@@ -573,6 +585,7 @@ function check_qoh($order)
 {
 	$msg = '';
 	foreach($order->line_items as $line_no => $line) {
+		if (!is_inventory_item($line['stock_id'])) continue;
 		$qoh = get_qoh_on_date($line->stock_id, $_POST['Location'], $_POST['OrderDate']);
 		if ($line->qty_dispatched > $qoh)	{
 			$msg .= $line->stock_id . " - " . $line->item_description . ": " .