X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fitem_adjustments_ui.inc;h=cfe697fa1c30efd813e678766ed6efd38d39c7fe;hb=9478a0cdeaf9201d2f3947e11e58d90354050025;hp=28f38f0a0723abd90d8c8130922e51e0762b27a1;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index 28f38f0a..cfe697fa 100644
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	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/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
@@ -7,49 +16,30 @@ include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 function add_to_order(&$order, $new_item, $new_item_qty, $standard_cost)
 {
-    $allready_on_order = 0;
-
-	foreach ($order->line_items as $order_item) 
-	{
-        if (strcasecmp($order_item->stock_id, $new_item) == 0) 
-        {
-            $allready_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 ($allready_on_order != 1)
-    {
-         $order->add_to_cart ($new_item, $new_item_qty, $standard_cost);
-    } /* end of if not already on the order */
+    if ($order->find_cart_item($new_item))
+         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.");
+	else
+         $order->add_to_cart (count($order->line_items), $new_item, $new_item_qty, $standard_cost);
 }
 
 //--------------------------------------------------------------------------------
 
 function display_order_header(&$order)
 {
-	global $table_style2;
-	
-	start_table("width=70% $table_style2"); // outer table
-	echo "<tr><td valign=top width=33%>"; 
-	echo "<table>"; // inner table
-
-	locations_list_row(_("Location:"), 'StockLocation', null);
-	ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::inventory_adjustment()));
-
-	echo "</table>"; // inner table
+	global $table_style2, $Refs;
 
-	echo "</td><td width=33%>"; 
+	start_outer_table("width=70% $table_style2"); // outer table
+	table_section(1);
 
-	echo "<table>"; // inner table
+	locations_list_row(_("Location:"), 'StockLocation', null);
+	ref_row(_("Reference:"), 'ref', '', $Refs->get_next(ST_INVADJUST));
 
-    date_row(_("Date:"), 'AdjDate');
+	table_section(2, "33%");
 
-	echo "</table>"; // inner table
+    date_row(_("Date:"), 'AdjDate', '', true);
 
-	echo "</td><td width=33%>"; 
+	table_section(3, "33%");
 
-	echo "<table>"; // inner table
     movement_types_list_row(_("Detail:"), 'type', null);
 
     if (!isset($_POST['Increase']))
@@ -57,10 +47,7 @@ function display_order_header(&$order)
     yesno_list_row(_("Type:"), 'Increase', $_POST['Increase'],
     	_("Positive Adjustment"), _("Negative Adjustment"));
 
-	echo "</table>"; // inner table
-
-	echo "</td></tr>"; 
-	end_table(1); // outer table
+	end_outer_table(1); // outer table
 }
 
 //---------------------------------------------------------------------------------
@@ -70,99 +57,114 @@ function display_adjustment_items($title, &$order)
 	global $table_style, $path_to_root;
 
 	display_heading($title);
+    div_start('items_table');
 	start_table("$table_style width=80%");
-	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), 
-		_("Unit"), _("Unit Cost"), _("Total"));
+	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
+		_("Unit"), _("Unit Cost"), _("Total"), "");
 	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)
 	{
 
-		$quantity = number_format2($stock_item->quantity,user_qty_dec());
-
 		$total += ($stock_item->standard_cost * $stock_item->quantity);
 
-		if (!isset($_GET['Edit']) || $_GET['Edit'] != $stock_item->stock_id)
+		if ($id != $line_no)
 		{
     		alt_table_row_color($k);
 
-			label_cell("<a target='_blank' href='$path_to_root/inventory/inquiry/stock_status.php?" . SID . "stock_id=" . $stock_item->stock_id . "'>$stock_item->stock_id</a>");
+			view_stock_status_cell($stock_item->stock_id);
 			label_cell($stock_item->item_description);
-			label_cell($quantity, "nowrap align=right");
+    		qty_cell($stock_item->quantity, false, get_qty_dec($stock_item->stock_id));
 			label_cell($stock_item->units);
-			amount_cell($stock_item->standard_cost);
+			amount_decimal_cell($stock_item->standard_cost);
 			amount_cell($stock_item->standard_cost * $stock_item->quantity);
 
-			edit_link_cell(SID . "Edit=$stock_item->stock_id");
-			delete_link_cell(SID . "Delete=$stock_item->stock_id");
+			edit_button_cell("Edit$line_no", _("Edit"),
+				_('Edit document line'));
+			delete_button_cell("Delete$line_no", _("Delete"),
+				_('Remove line from document'));
 			end_row();
-		} 
-		else 
+		}
+		else
 		{
-			adjustment_edit_item_controls($order, $stock_item->stock_id);
+			adjustment_edit_item_controls($order, $line_no);
 		}
 	}
 
-	if (!isset($_GET['Edit']))
+	if ($id == -1)
 		adjustment_edit_item_controls($order);
 
-	label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
+	label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2);
 
     end_table();
+	div_end();
 }
 
 //---------------------------------------------------------------------------------
 
-function adjustment_edit_item_controls(&$order, $stock_id=null)
+function adjustment_edit_item_controls(&$order, $line_no=-1)
 {
+	global $Ajax;
 	start_row();
 
-	if (isset($_GET['Edit']) and $stock_id!=null)
+	$dec2 = 0;
+	$id = find_submit('Edit');
+	if ($line_no != -1 && $line_no == $id)
 	{
-		if (!isset($_POST['stock_id']))
-			$_POST['stock_id'] = $order->line_items[$stock_id]->stock_id;
-		if (!isset($_POST['qty']) OR ($_POST['qty']==""))
-			$_POST['qty'] = qty_format($order->line_items[$stock_id]->quantity);
-		if (!isset($_POST['std_cost']) OR ($_POST['std_cost']==""))
-			$_POST['std_cost'] = price_format($order->line_items[$stock_id]->standard_cost);
-
-		$_POST['units'] = $order->line_items[$stock_id]->units;
+		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
+		$_POST['qty'] = qty_format($order->line_items[$id]->quantity, 
+			$order->line_items[$id]->stock_id, $dec);
+		//$_POST['std_cost'] = price_format($order->line_items[$id]->standard_cost);
+		$_POST['std_cost'] = price_decimal_format($order->line_items[$id]->standard_cost, $dec2);
+		$_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[$id]->item_description, 'nowrap');
+	    $Ajax->activate('items_table');
 	}
 	else
 	{
-    	echo "<td colspan=2>";
-    	stock_costable_items_list('stock_id', $_POST['stock_id'], false, true);
-    	echo "</td>";
+    	stock_costable_items_list_cells(null, 'stock_id', null, false, true);
+		if (list_updated('stock_id')) {
+			    $Ajax->activate('units');
+			    $Ajax->activate('qty');
+			    $Ajax->activate('std_cost');
+		}
 
     	$item_info = get_item_edit_info($_POST['stock_id']);
-
-   		$_POST['qty'] = qty_format(0);
-		$_POST['std_cost'] = price_format($item_info["standard_cost"]);
+		$dec = $item_info['decimals'];
+   		$_POST['qty'] = number_format2(0, $dec);
+		//$_POST['std_cost'] = price_format($item_info["standard_cost"]);
+		$_POST['std_cost'] = price_decimal_format($item_info["standard_cost"], $dec2);
 		$_POST['units'] = $item_info["units"];
 	}
 
-	qty_cells(null, 'qty', $_POST['qty']);
+	qty_cells(null, 'qty', $_POST['qty'], null, null, $dec);
+	label_cell($_POST['units'], '', 'units');
 
-	label_cell($_POST['units']);
-	amount_cells(null, 'std_cost', $_POST['std_cost']);
+	//amount_cells(null, 'std_cost', $_POST['std_cost']);
+	amount_cells(null, 'std_cost', null, null, null, $dec2);
 	label_cell("&nbsp;");
 
-	if (isset($_GET['Edit'])) 
+	if ($id != -1)
 	{
-    	submit_cells('UpdateItem', _("Update"));
-    	submit_cells('CancelItemChanges', _("Cancel"));
-	} 
-	else 
+		button_cell('UpdateItem', _("Update"),
+				_('Confirm changes'), ICON_UPDATE);
+		button_cell('CancelItemChanges', _("Cancel"),
+				_('Cancel changes'), ICON_CANCEL);
+		hidden('LineNo', $line_no);
+ 		set_focus('qty');
+	}
+	else
 	{
-		submit_cells('AddItem', _("Add Item"), "colspan=2");
+		submit_cells('AddItem', _("Add Item"), "colspan=2",
+		    _('Add new item to document'), true);
 	}
 
 	end_row();