X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=aa0d8bcc442ab8fe1dab6eba7ff29220a3db6dc9;hb=6425de92749015d0e7ab29b5fd071a9d70cbb7d5;hp=1484b91c142570cdd4cb748047647879a14b383b;hpb=22764a38ba722898cf7209435bbf41ba872e6948;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 1484b91c..aa0d8bcc 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_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 . "/purchasing/includes/purchasing_db.inc");
 
 // ------------------------------------------------------------------------------
@@ -31,7 +40,7 @@ function create_new_po()
 	session_register("PO");
 
 	$_SESSION['PO'] = new purch_order;
-	$_POST['OrderDate'] = Today();
+	$_POST['OrderDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['OrderDate']))
 		$_POST['OrderDate'] = end_fiscalyear();
 	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
@@ -45,16 +54,15 @@ function display_po_header(&$order)
 
 	$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()))
         	$_POST['supplier_id'] = get_global_supplier();
 
-    	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true);
+    	supplier_list_row(_("Supplier:"), 'supplier_id', null, false, true, false, true);
 	}
 	else
 	{
@@ -68,6 +76,7 @@ function display_po_header(&$order)
 		foreach ($order->line_items as $line_no=>$item) {
 			$line = &$order->line_items[$line_no];
 			$line->price =  get_purchase_price ($order->supplier_id, $_POST['stock_id']);
+			$line->quantity =  get_purchase_conversion_factor ($order->supplier_id, $_POST['stock_id']);
 		}
 	    $Ajax->activate('items_table');
 	}
@@ -90,11 +99,8 @@ function display_po_header(&$order)
     	label_row(_("Reference:"), $order->reference);
     }
 
-	echo "</table>";
-
-	echo "</td><td valign=center>"; // outer table
+	table_section(2);
 
-	echo "<table height='5'>";
 	// check this out?????????
 	//if (!isset($_POST['OrderDate']) || $_POST['OrderDate'] == "")
 	//	$_POST['OrderDate'] = $order->orig_order_date;
@@ -104,24 +110,20 @@ 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, null, true);
+	date_row(_("Order Date:"), 'OrderDate', '', true, 0, 0, 0, null, true);
 	if (isset($_POST['_OrderDate_changed'])) {
 		$Ajax->activate('_ex_rate');
 	}
 
   	text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15);
 
-	echo "</table>";
-
-	echo "</td><td valign=center>"; // outer table
-
-  	echo "<table height='5'>";
-
 	echo "<tr><td>" . _("Receive Into:") . "</td>";
 	echo "<td>";
     locations_list('StkLocation', null, false, true);
 	echo "</td></tr>";
 
+	table_section(3);
+
     if (!isset($_POST['StkLocation']) || $_POST['StkLocation'] == "" ||
     	isset($_POST['_StkLocation_update']) || !isset($_POST['delivery_address']) ||
     	$_POST['delivery_address'] == "")
@@ -148,10 +150,8 @@ function display_po_header(&$order)
     }
 
 	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
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -165,8 +165,9 @@ function display_po_items(&$order, $editable=true)
     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 (count($order->line_items)) $th[] = '';
    	table_header($th);
@@ -186,6 +187,7 @@ function display_po_items(&$order, $editable=true)
         		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);
                 label_cell($po_line->req_del_date);
     			amount_cell($po_line->price);
@@ -195,7 +197,7 @@ function display_po_items(&$order, $editable=true)
                 {
 					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();
@@ -294,12 +296,13 @@ function po_item_controls(&$order, $stock_id=null)
 		label_cell($_POST['stock_id']);
 		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);
+		stock_purchasable_items_list_cells(null, 'stock_id', null, false, false, true);
 		if (list_updated('stock_id')) {
 			    $Ajax->activate('price');
 			    $Ajax->activate('units');
@@ -311,12 +314,14 @@ function po_item_controls(&$order, $stock_id=null)
 		$_POST['units'] = $item_info["units"];
 
    		$dec = $item_info["decimals"];
-   		$_POST['qty'] =	number_format2(1, $dec);
+   		$_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['req_del_date'] = add_days(Today(), 10);
+		$qty_rcvd = '';
 	}
 
 	qty_cells(null, 'qty', null, null, null, $dec);
+	qty_cell($qty_rcvd, false, $dec);
 
 	label_cell($_POST['units'], '', 'units');
 	date_cells(null, 'req_del_date', '', null, 0, 0, 0);
@@ -328,10 +333,10 @@ function po_item_controls(&$order, $stock_id=null)
 
 	if ($id!=-1)
 	{
-		edit_button_cell('UpdateLine', _("Update"),
-				_('Confirm changes'));
-		edit_button_cell('CancelUpdate', _("Cancel"),
-				_('Cancel changes'));
+		button_cell('UpdateLine', _("Update"),
+				_('Confirm changes'), ICON_UPDATE);
+		button_cell('CancelUpdate', _("Cancel"),
+				_('Cancel changes'), ICON_CANCEL);
 		set_focus('qty');
 	}
 	else