diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ConfirmTransactionFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ConfirmTransactionFragment.java
index 109f350..42a19ce 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/ConfirmTransactionFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/ConfirmTransactionFragment.java
@@ -246,7 +246,6 @@ public class ConfirmTransactionFragment extends DataBindingFragment implements D
         public void onConfirm(){
 
             if (sharedViewModel.transactionsType.getValue() == TransactionsType.TIP_ADJUSTMENT) {
-
                 routeId = R.id.action_confirmTransactionFragment_to_inputTipAmountFragment;
                 safeNavigateToRouteId();
 
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
index 6fee0b4..54c2863 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_ui/InputTraceNoFragment.java
@@ -173,6 +173,7 @@ public class InputTraceNoFragment extends DataBindingFragment {
                             }
 
                             sharedViewModel.payDetail.setValue(payDetail);
+                            sharedViewModel.setAmount(POSUtil.getInstance().getDecimalAmountSeparatorFormat(payDetail.getAmount()));
 
                             if(sharedViewModel.hostType.getValue() == HostType.MPU) {
                                 boolean isMpu = "MPU".equals(payDetail.getAccountType());
diff --git a/app/src/main/res/layout/fragment_print_receipt_screen.xml b/app/src/main/res/layout/fragment_print_receipt_screen.xml
index 4123609..5246a3f 100644
--- a/app/src/main/res/layout/fragment_print_receipt_screen.xml
+++ b/app/src/main/res/layout/fragment_print_receipt_screen.xml
@@ -187,7 +187,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{sharedViewModel._currencyText+` `+sharedViewModel.amount}"
+                        android:text="@{sharedViewModel.payDetail != null ? POSUtil.getInstance().currencyCodeToText(sharedViewModel.payDetail.currencyCode)+` `+POSUtil.getInstance().getDecimalAmountVoidFormat(sharedViewModel.payDetail) : sharedViewModel._currencyText+` `+sharedViewModel.amount}"
                         android:textColor="@color/colorTextTitle"
                         android:textSize="14sp"
                         android:textStyle="bold"
diff --git a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
index 6001bed..97a2b69 100644
--- a/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
+++ b/paylibs/src/main/java/com/utsmyanmar/paylibs/print/printx/BaseXPrint.java
@@ -404,7 +404,7 @@ public abstract class BaseXPrint {
         print2ColumnsStringNoSpace("ENTRY MODE :", PrintUtils.getInstance().getEntryType(payDetail.getCardType()));
         print2ColumnsStringNoSpace("EXP DATE   :",PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate()));
         print2ColumnsStringNoSpace("CARD TYPE  :", payDetail.getAccountType());
-        print2ColumnsStringNoSpace("TRACE NUM  :", payDetail.getVoucherNo());
+        print2ColumnsStringNoSpace("TRACE NUM  :", payDetail.getInvoiceNo());
 
         if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) {
             print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName);
@@ -527,7 +527,7 @@ public abstract class BaseXPrint {
             printer.appendPrnStr("BTH NO:" + batchNum, fontNormal, AlignEnum.LEFT,false);
         } else {
 //                printer.printColumnsString(new String[]{"BATCH NO :" + batchNum, "INV NO: " + invoiceNo}, new int[]{2, 2}, new int[]{0, 2}, null);
-            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + traceNo, fontNormal, AlignEnum.LEFT,false);
         }
 
 //        printer.appendPrnStr("\n", fontNormal, AlignEnum.LEFT,false);
@@ -576,7 +576,7 @@ public abstract class BaseXPrint {
         print2ColumnsStringNoSpace("ENTRY MODE:", PrintUtils.getInstance().getEntryType(payDetail.getCardType()));
         print2ColumnsStringNoSpace("EXP DATE  :",PrintUtils.getInstance().getFormatExpDate(payDetail.getEXPDate()));
         print2ColumnsStringNoSpace("CARD TYPE :", payDetail.getAccountType());
-        print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo());
+        print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getInvoiceNo());
 
         if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) {
             print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName);
@@ -1586,7 +1586,7 @@ public abstract class BaseXPrint {
         if (payDetail.getTransactionType() == TransactionsType.MMQR.value && payDetail.getQrTransStatus() == 1) {
             printer.appendPrnStr("TRACE NO     :" + traceNum , fontNormal, AlignEnum.LEFT,false);
         } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value) {
-            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + traceNum, fontNormal, AlignEnum.LEFT,false);
         } else if (payDetail.getTransType().equals(SUMMARY)) {
             printer.appendPrnStr("HOST      :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT,false);
         }
@@ -1675,7 +1675,7 @@ public abstract class BaseXPrint {
 //            printer.appendPrnStr("INV NO    :" + invoiceNo , fontNormal, AlignEnum.LEFT,false);
             printer.appendPrnStr("TRACE NO     :" + traceNum , fontNormal, AlignEnum.LEFT,false);
         } else if (!payDetail.getTransType().equals(SETTLEMENT) && !payDetail.getTransType().equals(SUMMARY) && payDetail.getTransactionType() != TransactionsType.MMQR_REFUND.value && payDetail.getTransactionType() != TransactionsType.MMQR.value) {
-//            printer.appendPrnStr("BTH NO  :" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT,false);
+//            printer.appendPrnStr("BTH NO  :" + batchNum + " INV NO:" + traceNum, fontNormal, AlignEnum.LEFT,false);
         } else if (payDetail.getTransType().equals(SUMMARY)) {
             printer.appendPrnStr("HOST   :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT,false);
         }