diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index d64cfeda184..1cc71ad27cd 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -152,7 +152,7 @@ class AccountMove(models.Model):
         ], string='Type', required=True, store=True, index=True, readonly=True, tracking=True,
         default="entry", change_default=True)
     type_name = fields.Char('Type Name', compute='_compute_type_name')
-    to_check = fields.Boolean(string='To Check', default=False,
+    to_check = fields.Boolean(string='To Check', default=False, tracking=True,
         help='If this checkbox is ticked, it means that the user was not sure of all the related information at the time of the creation of the move and that the move needs to be checked again.')
     journal_id = fields.Many2one('account.journal', string='Journal', required=True, readonly=True,
         states={'draft': [('readonly', False)]},
@@ -2557,6 +2557,10 @@ class AccountMove(models.Model):
             'views': [[view_id, 'form']],
         }
 
+    def button_set_checked(self):
+        for move in self:
+            move.to_check = False
+
     def button_draft(self):
         AccountMoveLine = self.env['account.move.line']
         excluded_move_ids = []
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index d16e5842f5a..c4acdc3dc24 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -405,6 +405,7 @@
                     <field name="amount_total_signed" sum="Total Amount" string="Total" decoration-bf="1"/>
                     <field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'posted'"/>
                     <field name="currency_id" invisible="1"/>
+                    <field name="to_check" optional="hide" widget="boolean_toggle"/>
                 </tree>
             </field>
         </record>
@@ -444,6 +445,7 @@
                     <field name="state" widget="badge" decoration-success="state == 'posted'" decoration-info="state == 'draft'" optional="show"/>
                     <field name="payment_state" widget="badge" decoration-danger="payment_state == 'not_paid'" decoration-warning="payment_state in ('partial', 'in_payment')" decoration-success="payment_state in ('paid', 'reversed')" attrs="{'invisible': [('payment_state', 'in', ('invoicing_legacy'))]}"/>
                     <field name="move_type" invisible="context.get('default_move_type', True)"/>
+                    <field name="to_check" optional="hide" widget="boolean_toggle"/>
                   </tree>
             </field>
         </record>
@@ -567,9 +569,14 @@
                                 attrs="{'invisible': ['|', ('move_type', 'not in', ('out_invoice', 'in_invoice')), ('state', '!=', 'posted')]}"/>
                         <!-- Cancel -->
                         <button name="button_cancel" string="Cancel Entry" type="object" groups="account.group_account_invoice"
-                                attrs="{'invisible' : ['|', ('id', '=', False), ('state', '!=', 'draft')]}"/>
+                                attrs="{'invisible' : ['|', '|', ('id', '=', False), ('state', '!=', 'draft'),('move_type', '!=', 'entry')]}"/>
+                        <button name="button_cancel" string="Cancel" type="object" groups="account.group_account_invoice"
+                                attrs="{'invisible' : ['|', '|', ('id', '=', False), ('state', '!=', 'draft'),('move_type', '==', 'entry')]}"/>
                         <button name="button_draft" string="Reset to Draft" type="object" groups="account.group_account_invoice"
                                 attrs="{'invisible' : [('show_reset_to_draft_button', '=', False)]}"/>
+                        <!-- Set as Checked -->
+                        <button name="button_set_checked" string="Set as Checked" type="object" groups="account.group_account_invoice"
+                                attrs="{'invisible' : [('to_check', '=', False)]}"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,posted"/>
                     </header>
                     <!-- Invoice outstanding credits -->