diff --git a/adapter/poadapter.js b/adapter/poadapter.js
index 042d5f9..bb331a4 100644
--- a/adapter/poadapter.js
+++ b/adapter/poadapter.js
@@ -176,11 +176,10 @@ class PoAdapter extends Adapter {
 			let ratepo = req.body.ratepo;
 			let migo = req.body.migo;
 			let idxpoold = req.body.idxpoold;
-			let currency_id = req.body.currency_id ?? null;
-
-			let currencyFieldsPo = currency_id
-				? ",currency_id='"+currency_id+"',rate_snapshot=(select rate from tbl_currency where _idx='"+currency_id+"' and isdeleted=0 limit 1)"
-				: ",currency_id=NULL,rate_snapshot=NULL";
+			let currencyFieldsPo = curr
+				? ",currency_id=(SELECT _idx FROM tbl_currency WHERE currency='" + curr + "' AND isdeleted=0 LIMIT 1)" +
+				  ",rate_snapshot=(SELECT rate FROM tbl_currency WHERE currency='" + curr + "' AND isdeleted=0 LIMIT 1)"
+				: "";
 
 			let qry = "";
 			if (idxpoold != idxpo && idxpoold != 0) {
@@ -257,7 +256,7 @@ class PoAdapter extends Adapter {
 							vendorid +
 							"',vendorname='" +
 							vendorname +
-							"',uby='" +
+							"'" + currencyFieldsPo + ",uby='" +
 							nik +
 							"',udt=now() ";
 						qry =
@@ -270,7 +269,7 @@ class PoAdapter extends Adapter {
 								vendorid +
 								"',vendorname='" +
 								vendorname +
-								"',uby='" +
+								"'" + currencyFieldsPo + ",uby='" +
 								nik +
 								"',udt=now() ";
 							qry = qry + "where _idx='" + idxpo + "' and isdeleted=0";
@@ -1043,6 +1042,14 @@ class PoAdapter extends Adapter {
 							"',idxpoboq='" +
 							idxpoboq +
 							"',";
+						qry += "currency_id=(SELECT COALESCE(c1._idx,c2._idx) FROM tbl_pr p "
+							+ "LEFT JOIN tbl_currency c1 ON c1._idx=p.currency_id AND c1.isdeleted=0 "
+							+ "LEFT JOIN tbl_currency c2 ON c2.currency=p.curr AND c2.isdeleted=0 "
+							+ "WHERE p._idx='" + idxpr + "' LIMIT 1),"
+							+ "rate_snapshot=(SELECT COALESCE(c1.rate,c2.rate) FROM tbl_pr p "
+							+ "LEFT JOIN tbl_currency c1 ON c1._idx=p.currency_id AND c1.isdeleted=0 "
+							+ "LEFT JOIN tbl_currency c2 ON c2.currency=p.curr AND c2.isdeleted=0 "
+							+ "WHERE p._idx='" + idxpr + "' LIMIT 1),";
 						qry += "iby='" + nik + "',idt=now()";
 						// console.log(qry);