X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fui%2Fgrn_ui.inc;h=1112ce077f1e0cadcd72a137be1826c5f30bf25f;hb=0dfa3ce0411c9d123d25d6a0079668e551a88b14;hp=2fe18c151b4b2de472cc7d26c39ab3b9b5c82fa3;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/purchasing/includes/ui/grn_ui.inc b/purchasing/includes/ui/grn_ui.inc
index 2fe18c15..1112ce07 100644
--- a/purchasing/includes/ui/grn_ui.inc
+++ b/purchasing/includes/ui/grn_ui.inc
@@ -11,57 +11,78 @@
 ***********************************************************************/
 //---------------------------------------------------------------------------------------------------
 
-function display_grn_summary(&$po, $editable=false)
+function display_grn_summary(&$po)
 {
-	global $table_style2;
-    start_table("$table_style2 width=90%");
-    
+
+   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(systypes::po(), $po->order_no),
+
+    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'");
+
+	label_cells(_("Delivery Date"), $po->orig_order_date, "class='tableheader2'"); // FIXME: delivery date
 	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'] = references::get_next(25);
-    	ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
-    	    	
+    	    $_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;
-        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'] = Today();
-    	
-    	date_cells(_("Date Items Received"), 'DefaultReceivedDate', '', null, 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);	
+     	  	$_POST['DefaultReceivedDate'] = new_doc_date();
+
+    	date_row(_("Date Items Received"), 'DefaultReceivedDate', '', true, 0, 0, 0, '', true);
+
+	table_section(3);
+		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