diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index ca183becb2c..d14164136b8 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -2231,7 +2231,7 @@ class AccountMove(models.Model):
         self.write({'state': 'draft'})
 
     def button_cancel(self):
-        self.write({'state': 'cancel'})
+        self.write({'auto_post': False, 'state': 'cancel'})
 
     def action_invoice_sent(self):
         """ Open a window to compose an email, with the edi invoice template
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 69d5499c6ad..2fa1f3e067b 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -987,6 +987,8 @@
                                         <field name="invoice_source_email"
                                                widget="email"
                                                attrs="{'invisible': ['|', ('move_type', 'not in', ('in_invoice', 'in_refund')), ('invoice_source_email', '=', False)]}"/>
+                                        <field name="auto_post"
+                                               attrs="{'invisible': [('move_type', '!=', 'in_invoice')], 'readonly': ['|',('reversed_entry_id', '!=', False),('state','!=','draft')]}"/>
                                         <field name="to_check"/>
                                     </group>
                                     <group string="Payments"
@@ -1005,7 +1007,7 @@
                                 <group id="other_tab_entry_group">
                                     <group name="misc_group">
                                         <field name="auto_post"
-                                               attrs="{'invisible': [('move_type', '!=', 'entry')], 'readonly': [('reversed_entry_id', '!=', False)]}"/>
+                                               attrs="{'invisible': [('move_type', '!=', 'entry')], 'readonly': ['|',('reversed_entry_id', '!=', False),('state','!=','draft')]}"/>
                                         <field name="reversed_entry_id"
                                                attrs="{'invisible': [('move_type', '!=', 'entry')]}"/>
                                         <field name="to_check"