X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=5ef26f8cad0e7b3386da24c41a4cf16b772416f4;hb=c2f32b7b39e8c21c29f66fee832938b2ad2f31cb;hp=5d64b1448d62dea94f4f7be9c38fc56f5dff8d51;hpb=fd59c60718609c1bf3240a303030167a4f1b1885;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 5d64b144..5ef26f8c 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -1,24 +1,72 @@
 <?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>.
+***********************************************************************/
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/manufacturing.inc");
 
 //--------------------------------------------------------------------------------
 function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
 {
+	// calculate item price to sum of kit element prices factor for 
+	// value distribution over all exploded kit items
+	 $std_price = get_kit_price($new_item, $order->customer_currency, 
+		$order->sales_type,	$order->price_factor, get_post('OrderDate'), true);
 
-	foreach ($order->line_items AS $order_item)
-	{
-		if (strcasecmp($order_item->stock_id, $new_item) == 0)
+	if ($std_price == 0)
+		$price_factor = 0;
+	else
+		$price_factor = $price/$std_price;
+
+	$kit = get_item_kit($new_item);
+	$item_num = db_num_rows($kit);
+
+	while($item = db_fetch($kit)) {
+		$std_price = get_kit_price($item['stock_id'], $order->customer_currency, 
+			$order->sales_type,	$order->price_factor, get_post('OrderDate'), true);
+
+		// rounding differences are included in last price item in kit
+		$item_num--;
+		if ($item_num) {
+			$price -= $item['quantity']*$std_price*$price_factor;
+			$item_price = $std_price*$price_factor;
+		} else {
+			if ($item['quantity']) 
+				$price = $price/$item['quantity'];
+			$item_price = $price;
+		}
+		$item_price = round($item_price, user_price_dec());
+
+	 if (!$item['is_foreign'] && $item['item_code'] != $item['stock_id'])
+	 {	// this is sales kit - recurse 
+		add_to_order($order, $item['stock_id'], $new_item_qty*$item['quantity'],
+			$item_price, $discount, $std_price);
+	 }
+	 else
+	 {	// stock item record eventually with foreign code
+
+		// check duplicate stock item
+		foreach ($order->line_items as $order_item)
 		{
-			display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
-			break;
+			if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
+			{
+				display_warning(_("For Part :").$item['stock_id']. " " 
+					. _("This item is already on this order. You have been warned."));
+				break;
+			}
 		}
+		$order->add_to_cart (count($order->line_items),	$item['stock_id'], 
+			$new_item_qty*$item['quantity'], $item_price, $discount);
+	 }
 	}
-
-	$order->add_to_cart (count($order->line_items),$new_item, $new_item_qty, $price, $discount);
 }
-
 //---------------------------------------------------------------------------------
 
 function get_customer_details_to_order(&$order, $customer_id, $branch_id)
@@ -32,7 +80,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 	if ($myrow['dissallow_invoices'] == 1)
 		$ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
 
-	$deliver = $myrow['address']; // in case no delivery address.
+	$deliver = $myrow['address']; // in case no branch address use company address
 
 	$order->set_customer($customer_id, $name, $myrow['curr_code'], 
 		$myrow['discount'], $myrow['pymt_discount']);
@@ -58,10 +106,9 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 	$order->set_branch($branch_id, $myrow["tax_group_id"],
 	$myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
 
-	$address = $myrow["br_post_address"];
+	$address = trim($myrow["br_post_address"]) != '' ? $myrow["br_post_address"]
+		: (trim($myrow["br_address"]) != '' ? $myrow["br_address"]:$deliver);
 
-	if (strlen($address) <= 1)	// if branch has no address
-		$address = $deliver;	// set sales order address
 	$order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
 		$address);
 	if ($order->trans_type == 10) {
@@ -120,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)
@@ -136,7 +184,7 @@ function display_order_summary($title, &$order, $editable_items=false)
 			{
 				edit_button_cell("Edit$line_no", _("Edit"),
 				_('Edit document line'));
-				edit_button_cell("Delete$line_no", _("Delete"),
+				delete_button_cell("Delete$line_no", _("Delete"),
 				_('Remove line from document'));
 			}
 			end_row();
@@ -166,10 +214,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 {
 	global $table_style, $Ajax;
 
-	start_table("width=80% $table_style");
-	echo "<tr><td valign=top>"; // outer table
-	echo "<table>";
+	start_outer_table("width=80% $table_style");
 
+	table_section(1);
+	
 	$customer_error = "";
 	$change_prices = 0;
 
@@ -260,28 +308,22 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		} // changed branch
 	}
 
-	if ($_SESSION['Items']->trans_type!=30) {
+	if ($order->trans_type != 30) {
 		ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 	}
 
-	echo "</table>";
-
-	echo "</td><td>"; // outer table
-
 	if (!is_company_currency($order->customer_currency))
 	{
+	    table_section(2);
+
 	    div_start('currency');
-		echo "<table height='5'>";
 		label_row(_("Customer Currency:"), $order->customer_currency);
 		exchange_rate_display($order->customer_currency, get_company_currency(),
 			($editable ? $_POST['OrderDate'] : $order->document_date));
-		echo "</table>";
 	    div_end();
-		echo "</td><td>"; // outer table
 	}
+	table_section(3);
 
-
-	echo "<table height='5'>";
 	if ($order->trans_type == 10 && $order->pos != -1) {
 		sale_payment_list_cells(_('Payment:'), 'cash', null, true);
 		$cash_payment = get_post('cash', 0);
@@ -316,11 +358,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	}
 
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
-	echo "</table>";
-
-	echo "</td><td>"; // outer table
-
-	echo "<table height='5'>";
+	
+	table_section(4);
 
 	if ($editable)
 	{
@@ -330,7 +369,10 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		date_row($date_text, 'OrderDate',
 		  _('Date of order receive'), null, 0, 0, 0, null, true);
 		if (isset($_POST['_OrderDate_changed'])) {
-			$change_prices = 1;
+			if (!is_company_currency($order->customer_currency) 
+				&& (get_base_sales_type()>0)) {
+					$change_prices = 1;
+			}
 			$Ajax->activate('currency');
 			if ($order->trans_type == 10) {
 				$_POST['delivery_date'] = get_invoice_duedate(get_post('customer_id'), get_post('OrderDate'));
@@ -342,25 +384,15 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		{	// 2008-11-12 Joe Hunt added dimensions
 			$dim = get_company_pref('use_dimension');
 			if ($dim > 0)
-			{
-				if ($order->dimension_id != $_POST['dimension_id']) {
-					$order->dimension_id = $_POST['dimension_id'];
-					$Ajax->activate('dimension_id');
-				}	
-				dimensions_list_row(_("Dimension:"), 'dimension_id', null, true, ' ', false, 1, true);
-				if ($dim > 1)
-				{
-					if ($order->dimension2_id != $_POST['dimension2_id']) {
-						$order->dimension2_id = $_POST['dimension2_id'];
-						$Ajax->activate('dimension2_id');
-					}	
-					dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', null, true, ' ', false, 2, true);
-				}	
-			}		
-			if ($dim < 2)
-				hidden('dimension2_id', 0);
-			if ($dim < 1)
+				dimensions_list_row(_("Dimension").":", 'dimension_id', 
+					null, true, ' ', false, 1, false);
+			else
 				hidden('dimension_id', 0);
+			if ($dim > 1)
+				dimensions_list_row(_("Dimension")." 2:", 'dimension2_id', 
+					null, true, ' ', false, 2, false);
+			else
+				hidden('dimension2_id', 0);
 		}	
 	}
 	else
@@ -372,26 +404,20 @@ 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);
 	}
-	echo "</table>";
-
-	echo "</td></tr>";
 
-	end_table(1); // outer table
+	end_outer_table(1); // outer table
 
 	if ($change_prices != 0) {
 		foreach ($order->line_items as $line_no=>$item) {
 			$line = &$order->line_items[$line_no];
-			$line->price = get_price($line->stock_id, $order->customer_currency,
+			$line->price = get_kit_price($line->stock_id, $order->customer_currency,
 				$order->sales_type, $order->price_factor, get_post('OrderDate'));
 		//		$line->discount_percent = $order->default_discount;
 		}
 	    $Ajax->activate('items_table');
 	}
-	$f = fopen(dirname(__FILE__)."/debug.txt", "w");
-	fwrite($f, "dimension=".$order->dimension_id.",dimension 2=".$order->dimension2_id."\n");
-	fclose($f);
 
 	return $customer_error;
 }
@@ -405,22 +431,24 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 	alt_table_row_color($rowcounter);
 
 	$id = find_submit('Edit');
-	if ($line_no!=-1 && $line_no == $id)
+	if ($line_no!=-1 && $line_no == $id) // edit old line
 	{
 		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
 		$dec = get_qty_dec($_POST['stock_id']);
 		$_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
+	else	// prepare new line
 	{
-		stock_items_list_cells(null,'stock_id', null, false, true);
+		sales_items_list_cells(null,'stock_id', null, false, true);
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
@@ -430,15 +458,14 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 		$item_info = get_item_edit_info($_POST['stock_id']);
 		$units = $item_info["units"];
-		$dec = get_qty_dec($_POST['stock_id']);
+		$dec = $item_info['decimals'];
 		$_POST['qty'] = number_format2(1, $dec);
-
-		$_POST['price'] = price_format(get_price ($_POST['stock_id'],
+		$price = get_kit_price($_POST['stock_id'],
 			$order->customer_currency, $order->sales_type,
-			$order->price_factor, get_post('OrderDate')));
+			$order->price_factor, get_post('OrderDate'));
+		$_POST['price'] = price_format($price);
 		// default to the customer's discount %
 		$_POST['Disc'] = percent_format($order->default_discount * 100);
-
 	}
 
 	qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
@@ -459,10 +486,10 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 
 	if ($id!=-1)
 	{
-		edit_button_cell('UpdateItem', _("Update"),
-				_('Confirm changes'));
-		edit_button_cell('CancelItemChanges', _("Cancel"),
-				_('Cancel changes'));
+		button_cell('UpdateItem', _("Update"),
+				_('Confirm changes'), ICON_UPDATE);
+		button_cell('CancelItemChanges', _("Cancel"),
+				_('Cancel changes'), ICON_CANCEL);
 		hidden('LineNo', $line_no);
 		set_focus('qty');
 	}
@@ -481,17 +508,17 @@ function display_delivery_details(&$order)
 {
 	global $table_style2, $Ajax;
 
-div_start('delivery');	
+	div_start('delivery');	
 
 	if (get_post('cash', 0)) {	// Direct payment sale
 		display_heading(_('Cash payment'));
-		echo "<table $table_style2 width=60% align=center>";
+		start_table("$table_style2 width=60%");
 		label_row(_("Deliver from Location:"), $order->location_name);
 
 		hidden('Location', $order->Location);
 		label_row(_("Cash account:"), $order->account_name);
 		textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
-		echo "</table>";
+		end_table();
 	} else {
 
 		if ($order->trans_type==10)
@@ -510,10 +537,8 @@ div_start('delivery');
 			$delname = _("Required Delivery Date").':';
 		}
 		display_heading($title);
-		echo "<br>";
-		start_table("$table_style2 width=90%");
-		echo "<tr valign=top><td>"; // outer table
-		echo "<table>";
+		start_outer_table("$table_style2 width=90%");
+		table_section(1);
 
 		locations_list_row(_("Deliver from Location:"), 'Location', null, 
 			false, true);
@@ -531,11 +556,7 @@ div_start('delivery');
 		text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25,
 		    _('Phone number of ordering person. Defaults to branch phone number'));
 
-		echo "</table>";
-
-		echo "</td><td>"; // outer table
-
-		echo "<table>";
+		table_section(2);
 
 		text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25,
 		  _('Customer reference number for this order (if any)'));
@@ -545,9 +566,8 @@ div_start('delivery');
 	    	price_format(get_post('freight_cost',0)));
 
 		shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
-		echo "</table>";
-		echo "</td></tr>";
-		end_table(1); // outer table
+
+		end_outer_table(1);
 	}
 	div_end();
 }
@@ -556,6 +576,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 . ": " .