X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fui%2Finvoice_ui.inc;h=fc779227793c7c0497f8a73933df2665fca5de8a;hb=f478231ee53d429047979736dafda1db9e6fcd72;hp=e21c1adf02f1b03cd1f2954f6e10a06db5acd38d;hpb=45aa0f7f7e8a8683305bbdbc58fdb3b791d2115e;p=fa-stable.git

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index e21c1adf..fc779227 100644
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -146,14 +146,12 @@ function invoice_header(&$supp_trans)
 
 	set_global_supplier($_POST['supplier_id']);
 
-	$supplier_currency = get_supplier_currency($supp_trans->supplier_id);
-
 	$company_currency = get_company_currency();
 
-	if ($supplier_currency != $company_currency)
+	if ($supp_trans->currency != $company_currency)
 	{
-        label_row(_("Supplier's Currency:"), "<b>" . $supplier_currency . "</b>");
-		exchange_rate_display($company_currency, $supplier_currency, $_POST['tran_date']);
+        label_row(_("Supplier's Currency:"), "<b>" . $supp_trans->currency . "</b>");
+		exchange_rate_display($company_currency, $supp_trans->currency, $_POST['tran_date']);
 	}
 
   	label_row(_("Tax Group:"), $supp_trans->tax_description);
@@ -527,12 +525,12 @@ function display_grn_items(&$supp_trans, $mode=0)
     		alt_table_row_color($k);
 
 			$grn_batch = get_grn_batch_from_item($entered_grn->id);
-    		label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch));
+    		label_cell(get_trans_view_str(ST_SUPPRECEIVE, $grn_batch), "nowrap align='right'");
     		if ($mode == 1)
     		{
 //				label_cell($entered_grn->id);
  				$row = get_grn_batch($grn_batch);
-				label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"])); // PO
+				label_cell(get_trans_view_str(ST_PURCHORDER, $row["purch_order_no"]), "nowrap align='right'"); // PO
 			}	
 			label_cell($entered_grn->item_code);
 			label_cell($entered_grn->item_description);