diff --git a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php
index 9592cd93..328655a8 100644
--- a/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php
+++ b/app/Classes/Modules/Exports/Services/ExportsARCreditNoteReport.php
@@ -6,6 +6,7 @@ namespace App\Classes\Modules\Exports\Services;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\KVPKey;
+use App\Classes\ValueObjects\Constants\RemarkRefundReason;
 use App\Models\KeyValuePair;
 use App\Models\Transaction;
 use Maatwebsite\Excel\Concerns\Exportable;
@@ -39,11 +40,11 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR
             'Description',
             'Reason',
             'DeptNo',
-            'Qty',
-            'UnitPrice',
+            'Amount',
             'AccNo',
             'submiteinvoice',
             'ConsolidatedEinvoice',
+            'KnockOffDocType',
             'KnockOffDocNo',
             'KnockOffAmt',
         ];
@@ -74,8 +75,8 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR
         $booking  = null;
         $autoCountSalesInvoiceId = null;
         $formattedDocumentDate = null;
-        $refundRemark  = null;
-
+        $refundRemarkGroup  = null;
+        $refundRemarkGroupAccNo  = null;
         $company = $transaction->owner->owner;
         $kvps = KeyValuePair::where('value', $transaction->id)
             ->where('key', 'App\Models\Transaction')
@@ -86,6 +87,13 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR
             if ($kvp && $kvp->owner && $kvp->owner->owner && $kvp->owner->owner->type === 1) {
                 $refundTransaction = $kvp->owner;
                 $refundRemark = $refundTransaction->remarks && $refundTransaction->remarks->first() ? $refundTransaction->remarks->first()->content : null;
+                if($refundRemark){
+                    $refundRemarkGroup = RemarkRefundReason::REFUND_REASONS[$refundRemark] ?? null;
+                    if($refundRemarkGroup){
+                        $refundRemarkGroupAccNo = RemarkRefundReason::REFUND_REASONS_GROUP[$refundRemarkGroup] ?? null;
+                    }
+                    $refundRemarkGroup = strtoupper($refundRemarkGroup);
+                }
                 $booking = $refundTransaction->owner->booking;
                 if($booking){
                     $metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO)->first();
@@ -112,14 +120,14 @@ class ExportsARCreditNoteReport implements FromQuery, WithHeadings, WithHeadingR
             $formattedDocumentDate,                 //DocDate
             $company->debtor,                       //DebtorCode
             $booking ? $booking->marking : '',      //Ref
-            $refundRemark ?? '',                    //Description
-            $refundRemark ?? '',                    //Reason
+            $refundRemarkGroup ?? '',               //Description
+            $refundRemarkGroup ?? '',               //Reason
             'C',                                    //DeptNo
-            '1',                                    //Qty
-            number_format($transaction->amount, 2), //UnitPrice
-            '511-0000',                             //AccNo
-            'F',                                    //submiteinvoice
+            number_format($transaction->amount, 2), //Amount
+            $refundRemarkGroupAccNo ?? '',          //AccNo
+            'T',                                    //submiteinvoice
             $company->e_invoice ? 'F' : 'T',        //ConsolidatedEinvoice
+            'RI',                                   //KnockOffDocType
             $autoCountSalesInvoiceId ?? '',         //KnockOffDocNo
             number_format($transaction->amount, 2), //KnockOffAmt
         ];
diff --git a/app/Classes/ValueObjects/Constants/RemarkRefundReason.php b/app/Classes/ValueObjects/Constants/RemarkRefundReason.php
index d8143b21..d56a554a 100644
--- a/app/Classes/ValueObjects/Constants/RemarkRefundReason.php
+++ b/app/Classes/ValueObjects/Constants/RemarkRefundReason.php
@@ -13,4 +13,9 @@ class RemarkRefundReason
         'Cancel Full Order' => 'Return Inward',
         'Others' => '',
     ];
+
+    public const REFUND_REASONS_GROUP = [
+        'Return Inward' => '510-0000',
+        'Discount Allowed' => '511-0000',
+    ];
 }