diff --git a/pabi_asset_management/security/ir.model.access.csv b/pabi_asset_management/security/ir.model.access.csv
index 6de56eed4..0e1b1294b 100755
--- a/pabi_asset_management/security/ir.model.access.csv
+++ b/pabi_asset_management/security/ir.model.access.csv
@@ -40,4 +40,6 @@ access_account_asset_request_line_management_asset_user,access_account_asset_req
 access_account_asset_management_asset_user,access_account_asset_management_asset_user,account_asset_management.model_account_asset,pabi_asset_management.group_assets_report,1,1,0,0
 access_account_asset_profile_management_asset_user,access_account_asset_profile_management_asset_user,account_asset_management.model_account_asset_profile,pabi_asset_management.group_assets_report,1,1,0,0
 access_account_asset_removal_lines_purchase_user,access_account_asset_removal_lines_purchase_user,model_account_asset_removal_lines,purchase.group_purchase_user,1,0,0,0
-access_account_asset_removal_lines_account_user,access_account_asset_removal_lines_account_user,model_account_asset_removal_lines,account.group_account_user,1,1,1,1
\ No newline at end of file
+access_account_asset_removal_lines_account_user,access_account_asset_removal_lines_account_user,model_account_asset_removal_lines,account.group_account_user,1,1,1,1
+access_account_asset_transfer_account_admin,access_account_asset_transfer_account_admin,model_account_asset_transfer,pabi_base.group_nstda_account_admin,1,1,1,0
+access_account_asset_transfer_target_account_admin,access_account_asset_transfer_target_account_admin,model_account_asset_transfer_target,pabi_base.group_nstda_account_admin,1,1,1,0
\ No newline at end of file
diff --git a/pabi_asset_management/views/asset_transfer_view.xml b/pabi_asset_management/views/asset_transfer_view.xml
index 7ba180d13..99ddcd9e3 100755
--- a/pabi_asset_management/views/asset_transfer_view.xml
+++ b/pabi_asset_management/views/asset_transfer_view.xml
@@ -57,18 +57,18 @@
                     <header>
                         <button name="action_draft" states="draft2"
                           string="Set Source Assets" type="object"
-                          groups="purchase.group_purchase_user"/>
+                          groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
                         <button name="action_draft2" states="draft,ready"
                           string="Set Target Assets" type="object"
-                          groups="purchase.group_purchase_user,account.group_account_user"/>
+                          groups="purchase.group_purchase_user,account.group_account_user,pabi_base.group_nstda_account_admin"/>
                         <button name="action_ready" states="draft2"
                           string="Submit to Finance" type="object" class="oe_highlight"
-                          groups="purchase.group_purchase_user"/>
+                          groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
                         <button name="action_done" states="ready"
                           string="Transfer" type="object" class="oe_highlight"
-                          groups="account.group_account_user"/>  <!-- Only Accountant can Transfer -->
+                          groups="account.group_account_user,pabi_base.group_nstda_account_admin"/>  <!-- Only Accountant can Transfer -->
                         <button name="action_cancel" states="draft" string="Cancel" type="object"
-                          groups="purchase.group_purchase_user"/>
+                          groups="purchase.group_purchase_user,pabi_base.group_nstda_account_admin"/>
                           <field name="state" widget="statusbar" statusbar_visible="draft,draft2,ready,done"/>
                     </header>
                     <sheet>
@@ -143,7 +143,7 @@
                         <field name="note" placeholder="Add an internal note here..."/>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user,pabi_base.group_nstda_account_admin"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
@@ -197,7 +197,7 @@
 
         <menuitem parent="menu_asset_actions" id="menu_action_account_asset_transfer"
           action="action_account_asset_transfer"
-          groups="purchase.group_purchase_user,account.group_account_user"/>
+          groups="purchase.group_purchase_user,account.group_account_user,pabi_base.group_nstda_account_admin"/>
 
     </data>
 </openerp>
diff --git a/pabi_asset_management/wizard/account_asset_reverse.py b/pabi_asset_management/wizard/account_asset_reverse.py
index 92102da7e..979266fc0 100644
--- a/pabi_asset_management/wizard/account_asset_reverse.py
+++ b/pabi_asset_management/wizard/account_asset_reverse.py
@@ -22,6 +22,27 @@ class AccountAssetReverse(models.TransientModel):
         string='Notes',
         size=1000,
     )
+    void_date_remove = fields.Date(
+        string='Asset Removal Date',
+        default=fields.Date.today,
+        required=True,
+        copy=False,
+    )
+    void_account_residual_value_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Residual Value Account',
+        domain=[('type', '=', 'other')],
+        required=True,
+        default=lambda self: self.env['account.account'].search([('code','=','1214010002')])
+    )
+    void_posting_regime = fields.Selection(
+        [('residual_value', _('Residual Value')),
+         ('gain_loss_on_sale', _('Gain/Loss on Sale')),],
+        string='Removal Entry Policy',
+        required=True,
+        default='residual_value',
+        #default=lambda self: self._get_posting_regime(),
+    )
 
     @api.multi
     def reverse(self):
@@ -54,7 +75,7 @@ def reverse(self):
                     (asset.code, ))
             # Reverse entry
             move_dict = move.copy_data({})[0]
-            move_dict['ref'] = _(u'ยกเลิกเลขครุภัณฑ์: %s') % asset.display_name
+            move_dict['ref'] = _(u'%s / %s') % (asset.code,self.note)
             move_dict['journal_id'] = 417   #change Asset Journal => Asset Journal (No-Budget)
             for line in move_dict.get('line_id', []):
                 line[2]['asset_profile_id'] = False
@@ -64,6 +85,12 @@ def reverse(self):
             AccountMove._reconcile_voided_entry([move.id, rev_move.id])
             rev_move.button_validate()
             # Set asset removed
+            res = asset.open_entries()
+            move_id = self.env['account.move'].search(res['domain'])
+            for move in move_id:
+                  move.date = self.void_date_remove
+                  asset.date_remove = self.void_date_remove
+                  asset.note = self.note
             asset.write({'status': self.target_status.id,
                          'state': 'removed'})
             asset.message_post(body=_('-- Void/Removed --\n%s') % self.note)
diff --git a/pabi_asset_management/wizard/account_asset_reverse_view.xml b/pabi_asset_management/wizard/account_asset_reverse_view.xml
index 86572a3a0..26beb7d44 100644
--- a/pabi_asset_management/wizard/account_asset_reverse_view.xml
+++ b/pabi_asset_management/wizard/account_asset_reverse_view.xml
@@ -24,7 +24,10 @@
                   </p>
                   <group>
                       <group>
+                          <field name="void_date_remove"/>
                           <field name="target_status"/>
+                          <field name="void_posting_regime"/>
+                          <field name="void_account_residual_value_id"/>
                       </group>
                       <group>
                           <field name="note" nolabel="1" placeholder="Reson for remove..."/>