X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=c862cca236fbd0819bc0d14d38229886025cd939;hb=279d7962a249da9cbc3074360e3a68a23a31145e;hp=d76073bde355eed3985174f3852b6261ddacedaa;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index d76073bd..c862cca2 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -1,7 +1,43 @@
 <?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 . "/purchasing/includes/purchasing_db.inc");
 
+//--------------------------------------------------------------------------------------------------
+
+function copy_from_cart()
+{
+	$cart = &$_SESSION['PO'];
+
+	$_POST['supplier_id'] = $cart->supplier_id;
+	$_POST['OrderDate'] = $cart->orig_order_date;
+    $_POST['supp_ref'] = $cart->supp_ref;
+    $_POST['ref'] = $cart->reference;
+	$_POST['Comments'] = $cart->Comments;
+    $_POST['StkLocation'] = $cart->Location;
+    $_POST['delivery_address'] = $cart->delivery_address;
+}
+
+function copy_to_cart()
+{
+	$cart = &$_SESSION['PO'];
+
+	$cart->supplier_id = $_POST['supplier_id'];	
+	$cart->orig_order_date = $_POST['OrderDate'];
+	$cart->reference = $_POST['ref'];
+	$cart->supp_ref = $_POST['supp_ref'];
+	$cart->Comments = $_POST['Comments'];	
+	$cart->Location = $_POST['StkLocation'];
+	$cart->delivery_address = $_POST['delivery_address'];
+}
 // ------------------------------------------------------------------------------
 
 function get_supplier_details_to_order(&$order, $supplier_id)
@@ -19,50 +55,47 @@ function get_supplier_details_to_order(&$order, $supplier_id)
 
 //---------------------------------------------------------------------------------------------------
 
-function create_new_po()
+function create_new_po($trans_type, $trans_no)
 {
-	if (isset($_SESSION['PO']))
-	{
-		unset ($_SESSION['PO']->line_items);
-		$_SESSION['PO']->lines_on_order = 0;
-		unset ($_SESSION['PO']);
-	}
+	global $Refs;
 
-	session_register("PO");
+	if (isset($_SESSION['PO']))
+		unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
 
-	$_SESSION['PO'] = new purch_order;
-	$_POST['OrderDate'] = Today();
+	$cart = new purch_order;
+	$_POST['OrderDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 		$_POST['OrderDate'] = end_fiscalyear();
-	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
+	$cart->orig_order_date = $_POST['OrderDate'];
+
+	$cart->trans_type = $trans_type;
+	$cart->order_no = $trans_no;
+	/*read in all the selected order into the Items cart  */
+	if ($trans_no) {
+		read_po($trans_no, $cart);
+		$cart->order_no = $trans_no;
+	} else
+		$cart->reference = $Refs->get_next($trans_type);
+	$_SESSION['PO'] = &$cart;
 }
 
 //---------------------------------------------------------------------------------------------------
 
 function display_po_header(&$order)
 {
-	global $table_style2;
+	global $table_style2, $Ajax, $Refs;
 
 	$editable = ($order->order_no == 0);
 
-	start_table("width=80% $table_style2");
-	echo "<tr><td valign=center>"; // outer table
-	echo "<table>";
+	start_outer_table("width=80% $table_style2");
 
+	table_section(1);
     if ($editable)
     {
-        if (!isset($_POST['supplier_id']) && (get_global_supplier() != reserved_words::get_all()))
+        if (!isset($_POST['supplier_id']) && (get_global_supplier() != ALL_TEXT))
         	$_POST['supplier_id'] = get_global_supplier();
 
-    	supplier_list_row(_("Supplier:"), 'supplier_id', $_POST['supplier_id'], false, true);
-
-    	if ($order->supplier_id != $_POST['supplier_id'])
-    	{
-    		// supplier has changed
-    		// delete all the order items - drastic but necessary because of
-    		// change of currency, etc
-    		$order->clear_items();
-    	}
+    	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true);
 	}
 	else
 	{
@@ -70,9 +103,19 @@ function display_po_header(&$order)
 		label_row(_("Supplier:"), $order->supplier_name);
     }
 
-	//if ($editable || ($order->supplier_id != $_POST['supplier_id']))
-	get_supplier_details_to_order($order, $_POST['supplier_id']);
-
+	if ($order->supplier_id != get_post('supplier_id',-1)) {
+		$old_supp = $order->supplier_id;
+		get_supplier_details_to_order($order, $_POST['supplier_id']);
+		// supplier default price update
+		foreach ($order->line_items as $line_no=>$item) {
+			$line = &$order->line_items[$line_no];
+			$line->price =  get_purchase_price ($order->supplier_id, $line->stock_id);
+			$line->quantity =
+				$line->quantity/get_purchase_conversion_factor ($old_supp, $line->stock_id)
+					*get_purchase_conversion_factor ($order->supplier_id, $line->stock_id);
+		}
+	    $Ajax->activate('items_table');
+	}
 	set_global_supplier($_POST['supplier_id']);
 
 	if (!is_company_currency($order->curr_code))
@@ -84,7 +127,7 @@ function display_po_header(&$order)
 
     if ($editable)
     {
-    	ref_row(_("Reference:"), 'ref', '', references::get_next(systypes::po()));
+    	ref_row(_("Reference:"), 'ref');
     }
     else
     {
@@ -92,11 +135,8 @@ function display_po_header(&$order)
     	label_row(_("Reference:"), $order->reference);
     }
 
-	echo "</table>";
+	table_section(2);
 
-	echo "</td><td valign=center>"; // outer table
-
-	echo "<table height='5'>";
 	// check this out?????????
 	//if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
 	//	$_POST['OrderDate'] = $order->orig_order_date;
@@ -106,25 +146,18 @@ function display_po_header(&$order)
 	//	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 	//		$_POST['OrderDate'] = end_fiscalyear();
 	//}
-	date_row(_("Order Date:"), 'OrderDate', '', $_POST['OrderDate'], 0, 0, 0);
-
-  	text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
-
-	echo "</table>";
-
-	echo "</td><td valign=center>"; // outer table
+	date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true);
+	if (isset($_POST['_OrderDate_changed'])) {
+		$Ajax->activate('_ex_rate');
+	}
 
-  	echo "<table height='5'>";
+  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+	locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); 
 
-	echo "<tr><td>" . _("Receive Into:") . "</td>";
-	echo "<td>";
-    locations_list('StkLocation', null);
-    echo "  ";
-    submit('GetAddress', _("Get Address"));
-	echo "</td></tr>";
+	table_section(3);
 
     if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" ||
-    	isset($_POST['GetAddress']) || !isset($_POST['delivery_address']) ||
+    	isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) ||
     	$_POST['delivery_address'] == "")
     {
     	/*If this is the first time the form loaded set up defaults */
@@ -137,21 +170,20 @@ function display_po_header(&$order)
         {
     	  	$loc_row = db_fetch($result);
     	  	$_POST['delivery_address'] = $loc_row["delivery_address"];
+			$Ajax->activate('delivery_address');
     	  	$_SESSION['PO']->Location = $_POST['StkLocation'];
     	  	$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
 
         }
         else
         { /*The default location of the user is crook */
-    	  	echo "<br>" . _("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record.");
+    	  	display_error(_("The default stock location set up for this user is not a currently defined stock location. Your system administrator needs to amend your user record."));
         }
     }
 
 	textarea_row(_("Deliver to:"), 'delivery_address', $_POST['delivery_address'], 35, 4);
-  	echo "</table>";
 
-	echo "</td></tr>";
-	end_table(); // outer table
+	end_outer_table(); // outer table
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -162,64 +194,71 @@ function display_po_items(&$order, $editable=true)
 
     display_heading(_("Order Items"));
 
+    div_start('items_table');
     start_table("$table_style width=80%");
 
-   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Unit"),
-   		_("Required Delivery Date"), _("Price"), _("Line Total"));
-
+   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
+		_("Received"), _("Unit"),
+   		_("Required Delivery Date"), _("Price"), _("Line Total"), "");
+	if ($order->trans_type != ST_PURCHORDER)
+		array_remove($th, 5);
+		
 	if (count($order->line_items)) $th[] = '';
    	table_header($th);
 
+	$id = find_submit('Edit');
 	$total = 0;
 	$k = 0;
-   	foreach ($order->line_items as $po_line)
+   	foreach ($order->line_items as $line_no => $po_line)
    	{
-
-		if ($po_line->Deleted == false)
+    	$line_total =	round($po_line->quantity * $po_line->price,  user_price_dec());
+    	if (!$editable || ($id != $line_no))
 		{
-    		$line_total =	round($po_line->quantity * $po_line->price,  user_price_dec());
-    		if (!$editable || !isset($_GET['Edit']) || $_GET['Edit'] != $po_line->line_no)
+    		alt_table_row_color($k);
+        	label_cell($po_line->stock_id);
+    		label_cell($po_line->item_description);
+            qty_cell($po_line->quantity, false, get_qty_dec($po_line->stock_id));
+            qty_cell($po_line->qty_received, false, get_qty_dec($po_line->stock_id));
+    		label_cell($po_line->units);
+			if ($order->trans_type == ST_PURCHORDER)
+        	    label_cell($po_line->req_del_date);
+    		amount_decimal_cell($po_line->price);
+            amount_cell($line_total);
+
+			if ($editable)
 			{
-    			alt_table_row_color($k);
-        		label_cell($po_line->stock_id);
-    			label_cell($po_line->item_description);
-                qty_cell($po_line->quantity);
-    			label_cell($po_line->units);
-                label_cell($po_line->req_del_date);
-    			amount_cell($po_line->price);
-                amount_cell($line_total);
-
-                if ($editable)
-                {
-                    edit_link_cell(SID."Edit=" . $po_line->line_no);
-                    delete_link_cell(SID."Delete=" . $po_line->line_no);
-                }
-        		end_row();
+					edit_button_cell("Edit$line_no", _("Edit"),
+					  _('Edit document line'));
+					delete_button_cell("Delete$line_no", _("Delete"),
+						_('Remove line from document'));
 			}
-			else
-			{
-				po_item_controls($order, $po_line->stock_id);
-			}
-    		$total += $line_total;
+		end_row();
+		}
+		else
+		{
+			po_item_controls($order, $k, $line_no);
 		}
+		$total += $line_total;
     }
 
-	if (!isset($_GET['Edit']) && $editable)
-		po_item_controls($order);
+	if ($id==-1 && $editable)
+		po_item_controls($order, $k);
 
     $display_total = price_format($total);
-    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
-    	"nowrap align=right");
+    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan="
+    	.(count($order->line_items) ? 7:6)." align=right",
+    	"nowrap align=right", 2);
 
 	end_table(1);
+	div_end();
 }
 
 //---------------------------------------------------------------------------------------------------
 
 function display_po_summary(&$po, $is_self=false, $editable=false)
 {
-	global $table_style2;
-    start_table("$table_style2 width=90%");
+	global $table_style;
+    start_table("$table_style width=90%");
 
     start_row();
     label_cells(_("Reference"), $po->reference, "class='tableheader2'");
@@ -231,7 +270,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
 
     if (!$is_self)
     {
-    	label_cells(_("Purchase Order"), get_trans_view_str(systypes::po(), $po->order_no),
+    	label_cells(_("Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
     		"class='tableheader2'");
     }
 	end_row();
@@ -251,8 +290,8 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
     		"class='tableheader2'");
     }
 
-    if ($po->requisition_no != "")
-    	label_cells(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'");
+    if ($po->supp_ref != "")
+    	label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
     end_row();
 
     if (!$editable)
@@ -267,60 +306,92 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
 
 //--------------------------------------------------------------------------------
 
-function po_item_controls(&$order, $stock_id=null)
+function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 {
-	start_row();
+   global $Ajax;
 
-	if (isset($_GET['Edit']) && $stock_id != null)
+	alt_table_row_color($rowcounter);
+
+	$dec2 = 0;
+	$id = find_submit('Edit');
+	if (($id != -1) && $line_no == $id)
 	{
-		hidden('line_no', $_GET['Edit']);
+//		hidden('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'] = qty_format($order->line_items[$_GET['Edit']]->quantity);
-		if (!isset($_POST['price']) || ($_POST['price'] == ""))
-			$_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price);
-		if (!isset($_POST['req_del_date']) || ($_POST['req_del_date'] == ""))
-			$_POST['req_del_date'] = $order->line_items[$_GET['Edit']]->req_del_date;
+		$_POST['stock_id'] = $order->line_items[$id]->stock_id;
+		$dec = get_qty_dec($_POST['stock_id']);
+		$_POST['qty'] = qty_format($order->line_items[$id]->quantity, $_POST['stock_id'], $dec);
+		//$_POST['price'] = price_format($order->line_items[$id]->price);
+		$_POST['price'] = price_decimal_format($order->line_items[$id]->price, $dec2);
+		if ($order->trans_type == ST_PURCHORDER)
+			$_POST['req_del_date'] = $order->line_items[$id]->req_del_date;
 
-		$_POST['units'] = $order->line_items[$_GET['Edit']]->units;
+		$_POST['units'] = $order->line_items[$id]->units;
+		$_POST['item_description'] = $order->line_items[$id]->item_description;
 
 		hidden('stock_id', $_POST['stock_id']);
 		label_cell($_POST['stock_id']);
-		label_cell($order->line_items[$_GET['Edit']]->item_description);
+
+		if ($order->line_items[$id]->descr_editable)
+			text_cells(null,'item_description', null, 45, 150);
+		else {
+			hidden('item_description', $_POST['item_description']);
+//			label_cell($_POST['item_description']);
+			label_cell($order->line_items[$id]->item_description); 
+		}
+
+	    $Ajax->activate('items_table');
+		$qty_rcvd = $order->line_items[$id]->qty_received;
 	}
 	else
 	{
-		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
-
-		stock_purchasable_items_list_cells(null, 'stock_id', null, false, true);
+//		hidden('line_no', ($_SESSION['PO']->lines_on_order + 1));
+
+		stock_purchasable_items_list_cells(null, 'stock_id', null, false, true, true);
+		if (list_updated('stock_id')) {
+			    $Ajax->activate('price');
+			    $Ajax->activate('units');
+			    $Ajax->activate('qty');
+			    $Ajax->activate('req_del_date');
+			    $Ajax->activate('line_total');
+		}
     	$item_info = get_item_edit_info($_POST['stock_id']);
 		$_POST['units'] = $item_info["units"];
 
-   		$_POST['qty'] = qty_format(1);
-		$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
-		$_POST['req_del_date'] = add_days(Today(), 10);
+   		$dec = $item_info["decimals"];
+   		$_POST['qty'] =	number_format2(get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']), $dec);
+		//$_POST['price'] = price_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']));
+		$_POST['price'] = price_decimal_format(get_purchase_price ($order->supplier_id, $_POST['stock_id']), $dec2);
+		if ($order->trans_type == ST_PURCHORDER)
+			$_POST['req_del_date'] = add_days(Today(), 10);
+		$qty_rcvd = '';
 	}
 
-	qty_cells(null, 'qty', null);
+	qty_cells(null, 'qty', null, null, null, $dec);
+	qty_cell($qty_rcvd, false, $dec);
 
-	label_cell($_POST['units']);
-	date_cells(null, 'req_del_date', '', null, 0, 0, 0);
-	amount_cells(null, 'price', null);
+	label_cell($_POST['units'], '', 'units');
+	if ($order->trans_type == ST_PURCHORDER)
+		date_cells(null, 'req_del_date', '', null, 0, 0, 0);
+	amount_cells(null, 'price', null, null, null, $dec2);
 
 	//$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
 	$line_total = round(input_num('qty') * input_num('price'),  user_price_dec());
-	amount_cell($line_total);
+	amount_cell($line_total, false, '','line_total');
 
-	if (isset($_GET['Edit']))
+	if ($id!=-1)
 	{
-    	submit_cells('UpdateLine', _("Update"));
-    	submit_cells('CancelUpdate', _("Cancel"));
+		button_cell('UpdateLine', _("Update"),
+				_('Confirm changes'), ICON_UPDATE);
+		button_cell('CancelUpdate', _("Cancel"),
+				_('Cancel changes'), ICON_CANCEL);
+		hidden('line_no', $line_no);
+		set_focus('qty');
 	}
 	else
 	{
-		submit_cells('EnterLine', _("Add Item"), "colspan=2");
+		submit_cells('EnterLine', _("Add Item"), "colspan=2",
+		    _('Add new item to document'), true);
 	}
 
 	end_row();