X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fgrn_ui.inc;h=370687ab71760af9f567ff15299ddfec94da716b;hb=5a7ef37131354aabdcf04c639a903e5876b743e4;hp=1112ce077f1e0cadcd72a137be1826c5f30bf25f;hpb=bff9e81e76c1110fea3a047220c0b158db11f825;p=fa-stable.git

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index 1112ce07..370687ab 100644
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -25,7 +25,7 @@ function display_grn_summary(&$po)
     label_cells(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no),
     	"class='tableheader2'");
 
-	label_cells(_("Delivery Date"), $po->orig_order_date, "class='tableheader2'"); // FIXME: delivery date
+	label_cells(_("Delivery On"), $po->tran_date, "class='tableheader2'");
 	end_row();
 
    	start_row();
@@ -56,22 +56,21 @@ function edit_grn_summary(&$po)
 
 	    label_row(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no));
 
-		label_row(_("Ordered On"), $po->orig_order_date);
+		label_row(_("Ordered On"), $po->tran_date);
 
 	table_section(2);
     	if (!isset($_POST['ref']))
-    	    $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE, null, array('supplier' => $po->supplier_id, 'date' => Today()));
-    	ref_row(_("Reference"), 'ref', '', null);
-
+   		    $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE, null, array('supplier' => $po->supplier_id, 'date' => Today()));
+   		ref_row(_("Reference"), 'ref', '', null);
         if (!isset($_POST['Location']))
         	$_POST['Location'] = $po->Location;
 
         locations_list_row(_("Deliver Into Location"), "Location", $_POST['Location']);
 
-    	if (!isset($_POST['DefaultReceivedDate']))
-     	  	$_POST['DefaultReceivedDate'] = new_doc_date();
+    	if (!isset($_POST['tran_date']))
+     	  	$_POST['tran_date'] = new_doc_date();
 
-    	date_row(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, '', true);
+    	date_row(_("Date Items Received"), 'tran_date', '', true, 0, 0, 0, '', true);
 
 	table_section(3);
 		label_row(_("Supplier's Reference"), $po->supp_ref);
@@ -82,7 +81,7 @@ function edit_grn_summary(&$po)
     		label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
 
 	    if (!is_company_currency($po->curr_code))
-			exchange_rate_display(get_company_currency(), $po->curr_code, get_post('DefaultReceivedDate'));
+			exchange_rate_display(get_company_currency(), $po->curr_code, get_post('tran_date'));
 	end_outer_table(1);
 }