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

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index 4ac5c5bc..370687ab 100644
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -13,8 +13,8 @@
 
 function display_grn_summary(&$po)
 {
-	global $Refs;
-    start_table(TABLESTYLE2, "width='90%'");
+
+   start_table(TABLESTYLE2, "width='90%'");
 
     start_row();
 	label_cells(_("Supplier"), $po->supplier_name, "class='tableheader2'");
@@ -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(_("Ordered On"), $po->orig_order_date, "class='tableheader2'");
+	label_cells(_("Delivery On"), $po->tran_date, "class='tableheader2'");
 	end_row();
 
    	start_row();
@@ -45,7 +45,7 @@ function display_grn_summary(&$po)
 function edit_grn_summary(&$po)
 {
 	global $Refs;
-
+	
 	start_outer_table(TABLESTYLE2, "width='80%'");
 
 	table_section(1);
@@ -56,26 +56,23 @@ 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);
-    	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);
-		// currently this is related order supp reference
-//		ref_row(_("Supplier's Reference"), 'supp_ref', _("Supplier's Reference"));
 		label_row(_("Supplier's Reference"), $po->supp_ref);
 
 	   	label_row(_("Delivery Address"), $po->delivery_address);
@@ -84,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);
 }