X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fgrn_ui.inc;h=059c7bd13e270e09bb04d81b92e6b7aeee13e94e;hb=879a85f0d6bab6e938c816d6b6a615e18c6b2101;hp=a0fdae4bdc981f0c88f405a7bccee431893473cc;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index a0fdae4b..059c7bd1 100644
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -11,57 +11,81 @@
 ***********************************************************************/
 //---------------------------------------------------------------------------------------------------
 
-function display_grn_summary(&$po, $editable=false)
+function display_grn_summary(&$po)
 {
-	global $table_style2, $Refs;
-    start_table("$table_style2 width=90%");
-    
+	global $Refs;
+    start_table(TABLESTYLE2, "width=90%");
+
     start_row();
 	label_cells(_("Supplier"), $po->supplier_name, "class='tableheader2'");
-    
+
     if (!is_company_currency($po->curr_code))
     	label_cells(_("Order Currency"), $po->curr_code, "class='tableheader2'");
-    
+
     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(_("Supplier's Reference"), $po->requisition_no, "class='tableheader2'");
 	end_row();
-		
+
    	start_row();
-    if ($editable) 
-    {
+   	label_cells(_("Reference"), $po->reference, "class='tableheader2'");
+   	label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'");
+	label_cells(_("Supplier's Reference"), $po->supp_ref, "class='tableheader2'");
+
+    end_row();
+
+   	label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'", "colspan=9");
+
+    if ($po->Comments != "")
+    	label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
+    end_table(1);
+}
+
+function edit_grn_summary(&$po)
+{
+	global $Refs;
+
+	start_outer_table(TABLESTYLE2, "width=80%");
+
+	table_section(1);
+		label_row(_("Supplier"), $po->supplier_name);
+
+    	if (!is_company_currency($po->curr_code))
+    		label_row(_("Order Currency"), $po->curr_code);
+
+	    label_row(_("For Purchase Order"), get_trans_view_str(ST_PURCHORDER, $po->order_no));
+
+		label_row(_("Ordered On"), $po->orig_order_date);
+
+	table_section(2);
     	if (!isset($_POST['ref']))
     	    $_POST['ref'] = $Refs->get_next(ST_SUPPRECEIVE);
-    	ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
-    	    	
+    	ref_row(_("Reference"), 'ref', '', null);
+
         if (!isset($_POST['Location']))
         	$_POST['Location'] = $po->Location;
-        label_cell(_("Deliver Into Location"), "class='tableheader2'");
-        locations_list_cells(null, "Location", $_POST['Location']);
-        
+
+        locations_list_row(_("Deliver Into Location"), "Location", $_POST['Location']);
+
     	if (!isset($_POST['DefaultReceivedDate']))
      	  	$_POST['DefaultReceivedDate'] = new_doc_date();
-    	
-    	date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, "class='tableheader2'");    
-        
-    } 
-    else 
-    {
-    	label_cells(_("Reference"), $po->reference, "class='tableheader2'");
-    	label_cells(_("Deliver Into Location"), get_location_name($po->Location), "class='tableheader2'");
-    }
-    
-    end_row();
-    
-    if (!$editable)
-    
-    	label_row(_("Delivery Address"), $po->delivery_address, "class='tableheader2'", "colspan=9");
-    
-    if ($po->Comments != "")
-    	label_row(_("Order Comments"), $po->Comments, "class='tableheader2'", "colspan=9");
-    end_table(1);	
+
+    	date_row(_("Date Items Received"), 'DefaultReceivedDate', '', 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);
+
+    	if ($po->Comments != "")
+    		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'));
+	end_outer_table(1);
 }
 
 ?>
\ No newline at end of file