X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=0e069ad8b358274e2824dcfd50268bf260357f1c;hb=b80d3fae8ac36bf66f6f446ced6c1a692899e56e;hp=ea0c819dc7ea76e5f2d5f37b980f7c2d37ffd77b;hpb=4def49c9e0be02ccdf814188c2a72ebd969a7a98;p=fa-stable.git

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index ea0c819d..0e069ad8 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -7,22 +7,17 @@ include_once($path_to_root . "/includes/manufacturing.inc");
 
 function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
 {
-    $already_on_order = 0;
 
 	foreach ($order->line_items AS $order_item)
 	{
-        if (strcasecmp($order_item->stock_id, $new_item) == 0)
-        {
-            $already_on_order = 1;
-            display_error(_("For Part :") . $new_item . " " . "This item is already on this order.  You can change the quantity ordered of the existing line if necessary.");
-        }
+		if (strcasecmp($order_item->stock_id, $new_item) == 0)
+		{
+			display_notification(_("For Part :") . $new_item . " " . _("This item is already on this order. You have been warned."));
+			break;
+		}
 	}
 
-
-    if ($already_on_order != 1)
-    {
-         $order->add_to_cart ($new_item, $new_item_qty, $price, $discount);
-    } /* end of if not already on the order */
+	$order->add_to_cart (count($order->line_items),$new_item, $new_item_qty, $price, $discount);
 }
 
 //---------------------------------------------------------------------------------
@@ -30,69 +25,50 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
 function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 {
 	$ret_error = "";
-	// Now check to ensure this account is not on hold */
-	$sql = "SELECT ".TB_PREF."debtors_master.name, ".TB_PREF."debtors_master.address, ".TB_PREF."credit_status.dissallow_invoices,
-		".TB_PREF."debtors_master.sales_type AS salestype, ".TB_PREF."sales_types.sales_type, ".TB_PREF."debtors_master.curr_code,
-		".TB_PREF."debtors_master.discount
-		FROM ".TB_PREF."debtors_master, ".TB_PREF."credit_status, ".TB_PREF."sales_types
-		WHERE ".TB_PREF."debtors_master.sales_type=".TB_PREF."sales_types.id
-			AND ".TB_PREF."debtors_master.credit_status=".TB_PREF."credit_status.id
-			AND ".TB_PREF."debtors_master.debtor_no = '" . $customer_id . "'";
-
-	$result =db_query($sql,"Customer Record Retreive");
 
-	$myrow = db_fetch($result);
+	$myrow = get_customer_to_order($customer_id);
 
-	$order->customer_id = $customer_id;
-	$order->Branch = $branch_id;
-	$order->customer_name = $myrow['name'];
+	$name = $myrow['name'];
 
 	if ($myrow['dissallow_invoices'] == 1)
 		$ret_error = _("The selected customer account is currently on hold. Please contact the credit control personnel to discuss.");
 
-	if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+/*	if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
 	{
 		$ret_error = _("The selected customer does not have any branches. Please create at least one branch.");
 		unset($_POST['branch_id']);
-		$order->Branch = "";
+		$order->Branch = 0;
 	}
+*/
+	$deliver = $myrow['address']; // in case no delivery address.
 
-	# the sales type determines the price list to be used by default
-	$order->default_sales_type = $myrow['salestype'];
-	$order->sales_type_name = $myrow['sales_type'];
-	$order->customer_currency = $myrow['curr_code'];
-	$order->default_discount = $myrow['discount'];
-	$deliver = $myrow['address']; // in case no deliveraddress.
+	$order->set_customer($customer_id, $name, $myrow['curr_code'], $myrow['discount']);
 
-	if ($order->Branch != "")
+	// the sales type determines the price list to be used by default
+	$order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included']);
+
+//	if ($order->Branch != 0)
 	{
-    	# the branch was also selected from the customer selection so default the delivery details from the customer branches table cust_branch. The order process will ask for branch details later anyway
-	 	$sql = "SELECT ".TB_PREF."cust_branch.br_name, ".TB_PREF."cust_branch.br_post_address, phone, email,
-			default_location, default_ship_via,
-			".TB_PREF."tax_groups.name AS tax_group_name, ".TB_PREF."tax_groups.id AS tax_group_id
-			FROM ".TB_PREF."cust_branch, ".TB_PREF."tax_groups
-				WHERE ".TB_PREF."cust_branch.tax_group_id = ".TB_PREF."tax_groups.id
-					AND ".TB_PREF."cust_branch.branch_code='" . $order->Branch . "'
-					AND ".TB_PREF."cust_branch.debtor_no = '" . $order->customer_id . "'";
-
-    	$result = db_query($sql,"Customer Branch Record Retreive");
-
-    	if (db_num_rows($result) == 0)
-    	{
-			return _("The selected customer and branch are not valid, or the customer does not have any branches.");
-    	}
-
-    	$myrow = db_fetch($result);
-    	$order->deliver_to = $myrow["br_name"];
-    	$order->delivery_address = $myrow["br_post_address"];
-    	if (strlen($order->delivery_address) <= 1)
-    		$order->delivery_address = $deliver;
-    	$order->phone = $myrow["phone"];
-    	$order->email = $myrow["email"];
-    	$order->Location = $myrow["default_location"];
-    	$order->ship_via = $myrow["default_ship_via"];
-		$order->tax_group_name = $myrow["tax_group_name"];
-		$order->tax_group_id = $myrow["tax_group_id"];
+		$result = get_branch_to_order($customer_id, $branch_id);
+
+		if (db_num_rows($result) == 0)
+		{
+		return _("The selected customer and branch are not valid, or the customer does not have any branches.");
+		}
+
+		$myrow = db_fetch($result);
+
+		$order->set_branch($branch_id, $myrow["tax_group_id"],
+		$myrow["tax_group_name"], $myrow["phone"], $myrow["email"]);
+
+		$address = $myrow["br_post_address"];
+
+		if (strlen($address) <= 1)	// if branch has no address
+			$address = $deliver;	// set sales order address
+
+		$order->set_location($myrow["default_location"], $myrow["location_name"]);
+		$order->set_delivery($myrow["default_ship_via"], $myrow["br_name"],
+		$address);
 	}
 
 	return $ret_error;
@@ -107,56 +83,68 @@ function display_order_summary($title, &$order, $editable_items=false)
 	display_heading($title);
 	start_table("$table_style colspan=7 width=90%");
 	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
-		_("Unit"), _("Price"), _("Discount %"), _("Total"), "", "");
+		_("Delivered"),
+		_("Unit"), _("Price"), _("Discount %"), _("Total"), "");
+
+	if ($order->trans_no==0) {
+	unset( $th[3] );
+	}
+
+	if (count($order->line_items)) $th[]= '';
+
 	table_header($th);
 
 	$total = 0;
 	$k = 0;  //row colour counter
 
-	foreach ($order->line_items as $stock_item)
+	$id = find_submit('Edit');
+	
+	foreach ($order->line_items as $line_no=>$stock_item)
 	{
 
-		$line_total = $stock_item->quantity * $stock_item->price * (1 - $stock_item->discount_percent);
+		$line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent),
+		   user_price_dec());
 
-		if (!isset($_GET['Edit']))
-			$id = "";
-		else
-			$id = $_GET['Edit'];
-		if (!$editable_items || $id != $stock_item->stock_id)
+
+		if (!$editable_items || $id != $line_no)
 		{
-    		alt_table_row_color($k);
+			alt_table_row_color($k);
 
 			view_stock_status_cell($stock_item->stock_id);
 
-    		label_cell($stock_item->item_description);
-    		qty_cell($stock_item->quantity);
-    		label_cell($stock_item->units);
-    		amount_cell($stock_item->price);
+			label_cell($stock_item->item_description, "nowrap" );
+			qty_cell($stock_item->qty_dispatched);
+
+			if ($order->trans_no!=0)
+			amount_cell($stock_item->qty_done);
 
-    		amount_cell($stock_item->discount_percent * 100);
-    		amount_cell($line_total);
+			label_cell($stock_item->units);
+			amount_cell($stock_item->price);
 
-    		if ($editable_items)
-    		{
-        		edit_link_cell(SID . "Edit=$stock_item->stock_id");
-        		delete_link_cell(SID . "Delete=$stock_item->stock_id");
-    		}
-        	end_row();
+			percent_cell($stock_item->discount_percent * 100);
+			amount_cell($line_total);
+
+			if ($editable_items)
+			{
+				edit_button_cell("Edit$line_no", _("Edit"));
+				edit_button_cell("Delete$line_no", _("Delete"));
+			}
+			end_row();
 		}
 		else
 		{
-			sales_order_item_controls($order, $stock_item->stock_id);
+			sales_order_item_controls($order, $k,  $line_no);
 		}
 
 		$total += $line_total;
 	}
 
-	if (!isset($_GET['Edit']) && $editable_items)
-		sales_order_item_controls($order);
+	if ($id==-1 && $editable_items)
+		sales_order_item_controls($order, $k);
 
-	$display_total = number_format2($total,user_price_dec());
-	label_row(_("Total Excluding Tax/Shipping"), $display_total, "colspan=6 align=right",
-		"nowrap align=right");
+	$display_total = price_format($total);
+	label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right",
+		"nowrap align=right", 2);
 
 	end_table();
 }
@@ -171,52 +159,81 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 	echo "<table>";
 
 	$customer_error = "";
+		$change_prices = 0;
 
 	if (isset($order) && !$editable)
 	{
 		// can't change the customer/branch if items already received on this order
 		echo $order->customer_name . " - " . $order->deliver_to;
+		hidden('customer_id', $order->customer_id);
+		hidden('branch_id', $order->Branch);
+		hidden('sales_type', $order->sales_type);
 	}
 	else
 	{
 
-        if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
-        	$_POST['customer_id'] = get_global_customer();
+		if (!isset($_POST['customer_id']) && (get_global_customer() != reserved_words::get_all()))
+				$_POST['customer_id'] = get_global_customer();
 
 		customer_list_row(_("Customer:"), 'customer_id', null, false, true);
 
 		if (!isset($_POST['delivery_date']))
 		{
-			if ($order->direct_invoice)
-				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date =
+			if ($order->trans_type==10)
+				$_POST['delivery_date'] = $_SESSION['Items']->due_date =
 					get_invoice_duedate($_POST['customer_id'], $_POST['OrderDate']);
 			else
-				$_POST['delivery_date'] = $_SESSION['Items']->delivery_date =
-					add_days($_POST['OrderDate'], 10);
+				$_POST['delivery_date'] = $_SESSION['Items']->due_date =
+					add_days($_POST['OrderDate'], 10); // FIX this should be in company prefs
 		}
 		if ($order->customer_id != $_POST['customer_id'])
 		{
 			// customer has changed
-
-			// delete all the order items - drastic but necessary because of
-			// change of currency, sales type, etc
-    		$order->clear_items();
-
 			// clear the branch selection
 			unset($_POST['branch_id']);
 		}
-
-		customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true);
-
 		if (!isset($_POST['branch_id']))
 			$_POST['branch_id'] = "";
-		//set_global_customer($_POST['customer_id']);
-		if (($order->customer_id != $_POST['customer_id']) ||
-			($order->Branch != $_POST['branch_id']))
-			$customer_error = get_customer_details_to_order($order, $_POST['customer_id'], $_POST['branch_id']);
 
+		customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'branch_id', null, false, true, true);
+
+		if (!isset($_POST['branch_id']) || $_POST['branch_id'] == "")
+		{
+			$customer_error = _("The selected customer does not have any branches. Please create at least one branch.");
+			unset($_POST['branch_id']);
+			$order->Branch = 0;
+		} else
+		{
+			//set_global_customer($_POST['customer_id']);
+			if (($order->customer_id != $_POST['customer_id']) ||
+				($order->Branch != $_POST['branch_id'])) {
+
+				$old_order = (PHP_VERSION<5) ? $order : clone( $order );
+				$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;
+				$_POST['phone'] = $order->phone;
+				$_POST['sales_type'] = $order->sales_type;
+
+				// change prices if necessary
+				// what about discount in template case?
+				if ( $old_order->customer_currency!=$order->customer_currency
+					|| $old_order->sales_type!=$order->sales_type
+				//  || $old_order->default_discount!=$order->default_discount
+					) {
+					$change_prices = 1;
+				}
+
+			}
+		} // changed branch
 		set_global_customer($_POST['customer_id']);
 	}
+
+	if ($_SESSION['Items']->trans_type!=30) {
+		ref_cells(_("Reference").':', 'ref', null, '');
+	}
+
 	echo "</table>";
 
 	echo "</td><td>"; // outer table
@@ -226,13 +243,34 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 		echo "<table height='5'>";
 		label_row(_("Customer Currency:"), $order->customer_currency);
 		exchange_rate_display($order->customer_currency, get_company_currency(),
-			($editable?$_POST['OrderDate']:$order->orig_order_date), $editable);
+			($editable ? $_POST['OrderDate'] : $order->document_date), $editable);
 		echo "</table>";
 		echo "</td><td>"; // outer table
 	}
 
+	if( $order->sales_type != $_POST['sales_type']) {
+		$myrow = get_sales_type($_POST['sales_type']);
+		$order->set_sales_type($myrow['id'], $myrow['sales_type'],
+		$myrow['tax_included']);
+		$change_prices = 1;
+	}
+
+		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,
+				$order->sales_type);
+		//		$line->discount_percent = $order->default_discount;
+		}
+	}
+
 	echo "<table height='5'>";
-	label_row(_("Sales Type:"), $order->sales_type_name);
+	if($editable)
+		sales_types_list_row(_("Price List"), 'sales_type', $_POST['sales_type'], true);
+	else {
+		label_row(_("Price List:"), $order->sales_type_name);
+	}
 	label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 	echo "</table>";
 
@@ -242,30 +280,21 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
 	if ($editable)
 	{
-    	if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
-    		$_POST['OrderDate'] = $order->orig_order_date;
+		if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
+			$_POST['OrderDate'] = $order->document_date;
 
 		date_row($date_text, 'OrderDate');
 	}
 	else
 	{
-		label_row($date_text, $order->orig_order_date);
-		hidden('OrderDate', $order->orig_order_date);
+		label_row($date_text, $order->document_date);
+		hidden('OrderDate', $order->document_date);
 	}
 
 	if ($display_tax_group)
 	{
-		if ($editable)
-		{
-            if (!isset($_POST['tax_group_id']))
-            	$_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id;
-            tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
-		}
-		else
-		{
-			label_row(_("Tax Group:"), $order->tax_group_name);
-			hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
-		}
+	    label_row(_("Tax Group:"), $order->tax_group_name);
+	    hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
 	}
 	echo "</table>";
 
@@ -278,26 +307,21 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
 //--------------------------------------------------------------------------------
 
-function sales_order_item_controls(&$order, $stock_id=null)
+function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
 {
-	start_row();
+	alt_table_row_color($rowcounter);
 
-	if (isset($_GET['Edit']) && $stock_id != null)
+	$id = find_submit('Edit');
+	if ($line_no!=-1 && $line_no == $id)
 	{
-		if (!isset($_POST['stock_id']))
-			$_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id;
-		if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
-			$_POST['qty'] = $order->line_items[$_GET['Edit']]->quantity;
-		if (!isset($_POST['price']) || ($_POST['price'] == ""))
-			$_POST['price'] = $order->line_items[$_GET['Edit']]->price;
-		if (!isset($_POST['Disc']) || ($_POST['Disc'] == ""))
-			$_POST['Disc'] = ($order->line_items[$_GET['Edit']]->discount_percent)*100;
-
-		$_POST['units'] = $order->line_items[$_GET['Edit']]->units;
-
+		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
+		$_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched);
+		$_POST['price'] = price_format($order->line_items[$id]->price);
+		$_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
+		$_POST['units'] = $order->line_items[$id]->units;
 		hidden('stock_id', $_POST['stock_id']);
 		label_cell($_POST['stock_id']);
-		label_cell($order->line_items[$stock_id]->item_description);
+		label_cell($order->line_items[$line_no]->item_description, "nowrap");
 	}
 	else
 	{
@@ -310,31 +334,37 @@ function sales_order_item_controls(&$order, $stock_id=null)
 		}
 		else
 		{
-			text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if(event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
+		text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
 			stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'");
 		}
 		$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
-   		$_POST['qty'] = 1;
-		$_POST['price'] = get_price ($_POST['stock_id'], $order->customer_id);
+		$_POST['qty'] = qty_format(1);
+		$_POST['price'] = price_format(get_price ($_POST['stock_id'],
+			$order->customer_currency, $order->sales_type));
 		// default to the customer's discount %
-		$_POST['Disc'] = $order->default_discount * 100;
+		$_POST['Disc'] = percent_format($order->default_discount * 100);
 	}
 
-	text_cells(null, 'qty', $_POST['qty'], 12, 15);
+	qty_cells(null, 'qty', qty_format($_POST['qty']));
+
+	if ($order->trans_no!=0) {
+		amount_cell($line_no==-1 ? 0 :$order->line_items[$line_no]->qty_done);
+	}
 
 	label_cell($_POST['units']);
 	amount_cells(null, 'price');
-	text_cells(null, 'Disc', $_POST['Disc'], 7, 5);
+	small_amount_cells(null, 'Disc', percent_format($_POST['Disc']), null, null, user_percent_dec());
 
 	$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
 	amount_cell($line_total);
 
-	if (isset($_GET['Edit']))
+	if ($id!=-1)
 	{
-    	submit_cells('UpdateItem', _("Update"));
-    	submit_cells('CancelItemChanges', _("Cancel"));
+		edit_button_cell('UpdateItem', _("Update"));
+		edit_button_cell('CancelItemChanges', _("Cancel"));
+		hidden('LineNo', $line_no);
 	}
 	else
 	{
@@ -349,50 +379,57 @@ function sales_order_item_controls(&$order, $stock_id=null)
 function display_delivery_details(&$order)
 {
 	global $table_style2;
-
-	if ($order->direct_invoice)
+	if ($order->trans_type==10)
+	{
+		$title = _("Delivery Details");
+		$delname = _("Due Date").':';
+	}
+	elseif ($order->trans_type==13)
 	{
 		$title = _("Invoice Delivery Details");
-		$delname = _("Due Date");
+		$delname = _("Invoice before").':';
 	}
 	else
 	{
 		$title = _("Order Delivery Details");
-		$delname = _("Required Delivery Date:");
+		$delname = _("Required Delivery Date").':';
 	}
 	display_heading($title);
-    echo "<br>";
-    start_table("$table_style2 width=90%");
-    echo "<tr valign=top><td>"; // outer table
+	echo "<br>";
+	start_table("$table_style2 width=90%");
+	echo "<tr valign=top><td>"; // outer table
 
-    echo "<table>";
-    locations_list_row(_("Deliver from Location:"), 'Location', $order->Location);
+	echo "<table>";
 
-   	date_row($delname, 'delivery_date', $order->delivery_date, 0, 0, 0);
+//	echo $order->Location, $_POST['Location'];
 
-    text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40);
+	locations_list_row(_("Deliver from Location:"), 'Location', $_POST['Location']);
 
-    textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5);
-    text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25);
+	date_row($delname, 'delivery_date', $order->due_date, 0, 0, 0);
 
-    echo "</table>";
+	text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40);
 
-    echo "</td><td>"; // outer table
+	textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5);
+	text_row(_("Contact Phone Number:"), 'phone', $order->phone, 25, 25);
 
-    echo "<table>";
+	echo "</table>";
 
-    text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
-    textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
+	echo "</td><td>"; // outer table
 
-    text_row(_("Shipping Charge:"), 'freight_cost', $order->freight_cost, 10, 10);
+	echo "<table>";
+
+	text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
+	textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
 
-    shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
-	if ($_SESSION['Items']->direct_invoice)
-		textarea_row(_("Memo"), 'InvoiceText', null, 31, 3);
-    echo "</table>";
+	small_amount_row(_("Shipping Charge:"), 'freight_cost', 
+	    price_format($_POST['freight_cost']));
 
-    echo "</td></tr>";
-    end_table(1); // outer table
+	shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);
+
+	echo "</table>";
+
+	echo "</td></tr>";
+	end_table(1); // outer table
 }
 
 ?>
\ No newline at end of file