diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 006e9c77221..b96ab8e5362 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -606,7 +606,7 @@
                         <button name="%(action_view_account_move_reversal)d" string="Reverse Entry"
                                 type="action" groups="account.group_account_invoice" data-hotkey="z"
                                 attrs="{'invisible': ['|', ('move_type', '!=', 'entry'), '|', ('state', '!=', 'posted'), ('payment_state', '=', 'reversed')]}"/>
-                        <button name="action_reverse" string='Add Credit Note'
+                        <button name="action_reverse" string='Credit Note'
                                 type='object' groups="account.group_account_invoice"
                                 attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'in_invoice')), ('state', '!=', 'posted')]}"/>
                         <!-- Cancel -->
diff --git a/addons/account_debit_note/models/account_move.py b/addons/account_debit_note/models/account_move.py
index 177e6236a2c..ae247e86195 100644
--- a/addons/account_debit_note/models/account_move.py
+++ b/addons/account_debit_note/models/account_move.py
@@ -28,3 +28,7 @@ class AccountMove(models.Model):
             'view_mode': 'tree,form',
             'domain': [('debit_origin_id', '=', self.id)],
         }
+
+    def action_debit_note(self):
+        action = self.env.ref('account_debit_note.action_view_account_move_debit').read()[0]
+        return action
diff --git a/addons/account_debit_note/views/account_move_view.xml b/addons/account_debit_note/views/account_move_view.xml
index 0a2dc555a64..58bbeeaa5eb 100644
--- a/addons/account_debit_note/views/account_move_view.xml
+++ b/addons/account_debit_note/views/account_move_view.xml
@@ -5,13 +5,6 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
-            <button name="action_reverse" position="after">
-                <field name="debit_origin_id" invisible="1"/>
-                <button name="%(action_view_account_move_debit)d" string='Add Debit Note'
-                                type='action' groups="account.group_account_invoice"
-                                attrs="{'invisible': ['|', '|', ('debit_origin_id', '!=', False),
-                                        ('move_type', 'not in', ('out_invoice', 'in_invoice', 'out_refund', 'in_refund')), ('state', '!=', 'posted')]}"/>
-            </button>
             <div class="oe_button_box" position="inside">
                 <button type="object" class="oe_stat_button" name="action_view_debit_notes" icon="fa-plus" attrs="{'invisible': [('debit_note_count', '=', 0)]}">
                     <div class="o_field_widget o_stat_info">
@@ -25,4 +18,18 @@
             </field>
         </field>
     </record>
+
+    <record model="ir.actions.server" id="action_move_debit_note">
+        <field name="name">Debit Note</field>
+        <field name="model_id" ref="model_account_move"/>
+        <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
+        <field name="binding_model_id" ref="account.model_account_move" />
+        <field name="binding_view_types">form</field>
+        <field name="state">code</field>
+        <field name="code">
+if records:
+    action = records.action_debit_note()
+        </field>
+    </record>
+
 </odoo>
diff --git a/addons/account_debit_note/wizard/account_debit_note.py b/addons/account_debit_note/wizard/account_debit_note.py
index 1c02083f4fc..b03addb8d1b 100644
--- a/addons/account_debit_note/wizard/account_debit_note.py
+++ b/addons/account_debit_note/wizard/account_debit_note.py
@@ -33,6 +33,10 @@ class AccountDebitNote(models.TransientModel):
         move_ids = self.env['account.move'].browse(self.env.context['active_ids']) if self.env.context.get('active_model') == 'account.move' else self.env['account.move']
         if any(move.state != "posted" for move in move_ids):
             raise UserError(_('You can only debit posted moves.'))
+        elif any(move.debit_origin_id for move in move_ids):
+            raise UserError(_("You can't make a debit note for an invoice that is already linked to a debit note."))
+        elif any(move.move_type not in ['out_invoice', 'in_invoice', 'out_refund', 'in_refund'] for move in move_ids):
+            raise UserError(_("You can make a debit note only for a Customer Invoice, a Customer Credit Note, a Vendor Bill or a Vendor Credit Note."))
         res['move_ids'] = [(6, 0, move_ids.ids)]
         return res