diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java
index 6129e71..11e6a4b 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/EmvTransactionProcessViewModel.java
@@ -287,7 +287,11 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
                 /*Jun 15 2022*/
                 PayDetail payDetailRes = tradeData.getPayDetail();
 
-                payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
+                if (transType.getValue() == TransactionsType.VOID) {
+                    payDetailRes.setInvoiceNo(mPayDetail.getInvoiceNo());
+                } else {
+                    payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
+                }
                 LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode());
                 LogUtil.d(TAG,"Transaction Type: "+payDetailRes.getTransactionType());
 
@@ -388,13 +392,16 @@ public class EmvTransactionProcessViewModel extends EmvBaseViewModel implements
 
     @Override
     public void startDemoProcess() {
-        SystemParamsOperation.getInstance().getIncrementInvoiceNum();
+        if (transType.getValue() != TransactionsType.VOID) {
+            SystemParamsOperation.getInstance().getIncrementInvoiceNum();
+        }
 
         PayDetail payDetailRes;
 
         if (transType.getValue() == TransactionsType.VOID) {
 
             payDetailRes = DemoUtil.getInstance().builtDemoVoid(mPayDetail);
+            payDetailRes.setInvoiceNo(mPayDetail.getInvoiceNo());
             processVoidDB(payDetailRes);
 
         } else if (transType.getValue() == TransactionsType.REFUND) {
diff --git a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/TransProcessViewModel.java b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/TransProcessViewModel.java
index 9328f4f..8eede31 100644
--- a/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/TransProcessViewModel.java
+++ b/app/src/main/java/com/utsmm/kbz/ui/core_viewmodel/TransProcessViewModel.java
@@ -139,7 +139,11 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
                 LogUtil.d(TAG,"Transaction Operation Success: "+payDetailRes.getTradeAnswerCode());
                 if (TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V1) || TextUtils.equals(payDetailRes.getTradeAnswerCode(),RC_APPROVED_V2)) {
 
-                    payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
+                    if (transType.getValue() == TransactionsType.VOID) {
+                        payDetailRes.setInvoiceNo(payDetail.getInvoiceNo());
+                    } else {
+                        payDetailRes.setInvoiceNo(SystemParamsOperation.getInstance().getIncrementInvoiceNum());
+                    }
 
                     LogUtil.d(TAG,"MPU Transaction type :"+transType.getValue());
 
@@ -229,13 +233,16 @@ public class TransProcessViewModel extends ViewModel implements ProcessingTransa
 
     @Override
     public void startDemoProcess() {
-        SystemParamsOperation.getInstance().getIncrementInvoiceNum();
+        if (transType.getValue() != TransactionsType.VOID) {
+            SystemParamsOperation.getInstance().getIncrementInvoiceNum();
+        }
 
         PayDetail payDetailRes;
 
         if (transType.getValue() == TransactionsType.VOID) {
 
             payDetailRes = DemoUtil.getInstance().builtDemoVoid(payDetail);
+            payDetailRes.setInvoiceNo(payDetail.getInvoiceNo());
             processVoidDB(payDetailRes);
 
         } else if (transType.getValue() == TransactionsType.REFUND) {
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 62a401a..ca00c7f 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
@@ -405,7 +405,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.getInvoiceNo());
+        print2ColumnsStringNoSpace("TRACE NUM  :", payDetail.getVoucherNo());
 
         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:" + traceNo, fontNormal, AlignEnum.LEFT, false);
+            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, 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.getInvoiceNo());
+        print2ColumnsStringNoSpace("TRACE NUM :", payDetail.getVoucherNo());
 
         if (payDetail.getCardType() != BaseCardType.MAGNETIC.getValue()) {
             print2ColumnsStringNoSpace("CARD HOLDER:", firsLineName);
@@ -1213,7 +1213,7 @@ public abstract class BaseXPrint {
                                 : pay.getCustomerMobile()));
                 printString("DATE    :" + POSUtil.getInstance().formatDisplayDate(pay.getTransDate()));
                 printString("         " + pay.getTransTime());
-                printString("INV NO  :" + pay.getVoucherNo());
+                printString("INV NO  :" + pay.getInvoiceNo());
 
                 if (pay.getTransactionType() == TransactionsType.MMQR_REFUND.value) {
                     printString("RRN     :" + pay.getReferNo());
@@ -1590,7 +1590,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:" + traceNum, fontNormal, AlignEnum.LEFT, false);
+            printer.appendPrnStr("BTH NO:" + batchNum + " INV NO:" + invoiceNo, fontNormal, AlignEnum.LEFT, false);
         } else if (payDetail.getTransType().equals(SUMMARY)) {
             printer.appendPrnStr("HOST      :" + HOST_NAME_MPU + "", fontNormal, AlignEnum.LEFT, false);
         }