X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fpo_ui.inc;h=34252f3427a325df1302e5ec08a2986b195e02c9;hb=71d682a4c6063256396a3d8fe15f0c534b4cf46f;hp=44f2b3930b86a0bf75166d4e6581928a244850b6;hpb=6fb80166484027d3c4f29a25b6bbb52c299dd983;p=fa-stable.git

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 44f2b393..34252f34 100644
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -18,7 +18,7 @@ function copy_from_cart()
 	$cart = &$_SESSION['PO'];
 
 	$_POST['supplier_id'] = $cart->supplier_id;
-	$_POST['OrderDate'] = $cart->orig_order_date;
+	$_POST['OrderDate'] = $cart->tran_date;
 	if ($cart->trans_type == ST_SUPPINVOICE)
 		$_POST['due_date'] = $cart->due_date;
     $_POST['supp_ref'] = $cart->supp_ref;
@@ -40,7 +40,7 @@ function copy_to_cart()
 	$cart = &$_SESSION['PO'];
 
 	$cart->supplier_id = $_POST['supplier_id'];	
-	$cart->orig_order_date = $_POST['OrderDate'];
+	$cart->tran_date = $_POST['OrderDate'];
 	if ($cart->trans_type == ST_SUPPINVOICE)
 	{
 		$cart->due_date = $_POST['due_date'];
@@ -64,7 +64,7 @@ function copy_to_cart()
 
 //---------------------------------------------------------------------------------------------------
 
-function create_new_po($trans_type, $trans_no)
+function create_cart($trans_type, $trans_no)
 {
 	global $Refs;
 
@@ -72,20 +72,28 @@ function create_new_po($trans_type, $trans_no)
 		unset ($_SESSION['PO']->line_items, $_SESSION['PO']);
 
 	$cart = new purch_order;
-	$_POST['OrderDate'] = new_doc_date();
-	if (!is_date_in_fiscalyear($_POST['OrderDate']))
-		$_POST['OrderDate'] = end_fiscalyear();
-	$cart->due_date = $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);
+
+	if ($trans_type == ST_SUPPRECEIVE && $trans_no != 0) {
+		read_grn($trans_no, $cart);
+		foreach($cart->line_items as &$line) {
+			$line->qty_old = $line->quantity; // for concurrency checks
+			$line->qty_received -= $line->quantity;
+		}
+	} else {
 		$cart->order_no = $trans_no;
-	} else
-		$cart->reference = $Refs->get_next($trans_type, null,
-			array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+		$_POST['OrderDate'] = new_doc_date();
+		if (!is_date_in_fiscalyear($_POST['OrderDate']))
+			$_POST['OrderDate'] = end_fiscalyear();
+		$cart->due_date = $cart->tran_date = $_POST['OrderDate'];
+		/* 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, null,
+				array('supplier_id' => $cart->supplier_id, 'date' => get_post('OrderDate')));
+	}
 	$_SESSION['PO'] = &$cart;
 }
 
@@ -137,7 +145,7 @@ function display_po_header(&$order)
 		'OrderDate', '', true, 0, 0, 0, null, true);
 
 	if (isset($_POST['_OrderDate_changed'])) {
-		$order->orig_order_date = $_POST['OrderDate'];
+		$order->tran_date = $_POST['OrderDate'];
 	    get_duedate_from_terms($order);
 	    $_POST['due_date'] = $order->due_date;
 		$Ajax->activate('due_date');
@@ -166,7 +174,7 @@ function display_po_header(&$order)
 	if ($order->trans_type==ST_SUPPINVOICE)
 		date_row(_("Due Date:"), 'due_date', '', false, 0, 0, 0, null, true);
 
-  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 16, 15);
+  	text_row(_("Supplier's Reference:"), 'supp_ref', null, 20, 60);
 
 	if (get_company_pref('use_dimension'))
 		dimensions_list_row(_('Dimension').':', 'dimension', null, true, _('Default'), false, 1);
@@ -211,11 +219,15 @@ function display_po_items(&$order, $editable=true)
     div_start('items_table');
     start_table(TABLESTYLE, "width='80%'");
 
-   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"),
-		_("Received"), _("Unit"),
-   		_("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+	$new = $order->order_no == 0;
+
+   	$th = array(_("Item Code"), _("Item Description"), _("Quantity"), _("Received"),
+   		_("Unit"), _("Required Delivery Date"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Line Total"), "");
+
 	if ($order->trans_type != ST_PURCHORDER)
 		array_remove($th, 5);
+	if ($new)
+		array_remove($th, 3);
 
 	if (count($order->line_items)) $th[] = '';
 
@@ -236,8 +248,8 @@ function display_po_items(&$order, $editable=true)
     		    label_cell(1);
          	else
             	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));
+			if (!$new)
+	            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);
@@ -309,7 +321,7 @@ function display_po_summary(&$po, $is_self=false, $editable=false)
     }
 	end_row();
 	start_row();
-    label_cells(_("Date"), $po->orig_order_date, "class='tableheader2'");
+    label_cells(_("Date"), $po->tran_date, "class='tableheader2'");
 
     if ($editable)
     {
@@ -353,6 +365,7 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
    global $Ajax, $SysPrefs;
 
 	alt_table_row_color($rowcounter);
+	$new = $order->order_no == 0;
 
 	$dec2 = 0;
 	$id = find_submit('Edit');
@@ -415,7 +428,8 @@ function po_item_controls(&$order, &$rowcounter, $line_no=-1)
 	} else
 		qty_cells(null, 'qty', null, null, null, $dec);
 
-	qty_cell($qty_rcvd, false, $dec);
+	if (!$new)
+		qty_cell($qty_rcvd, false, $dec);
 
 	label_cell($_POST['units'], '', 'units');
 	if ($order->trans_type == ST_PURCHORDER)