diff --git a/commission_simple/models/commission_result.py b/commission_simple/models/commission_result.py
index e6902e4..fa8d876 100644
--- a/commission_simple/models/commission_result.py
+++ b/commission_simple/models/commission_result.py
@@ -63,7 +63,7 @@ class CommissionResult(models.Model):
         return super().unlink()
 
     def draft2done(self):
-        self.write({'state': 'done'})
+        self.filtered(lambda x: x.state == 'draft').write({'state': 'done'})
 
     def backtodraft(self):
         self.write({'state': 'draft'})
diff --git a/commission_simple/views/commission_result.xml b/commission_simple/views/commission_result.xml
index 9487fea..7928df2 100644
--- a/commission_simple/views/commission_result.xml
+++ b/commission_simple/views/commission_result.xml
@@ -72,6 +72,13 @@
     <field name="model">commission.result</field>
     <field name="arch" type="xml">
         <tree decoration-info="state == 'draft'">
+            <header>
+                <button
+                    name="draft2done"
+                    type="object"
+                    string="Validate"
+                />
+            </header>
             <field name="date_range_id" optional="show"/>
             <field name="date_start" optional="hide"/>
             <field name="date_end" optional="hide"/>
diff --git a/commission_simple_agent_purchase/models/commission_result.py b/commission_simple_agent_purchase/models/commission_result.py
index 4a76ceb..92f3662 100644
--- a/commission_simple_agent_purchase/models/commission_result.py
+++ b/commission_simple_agent_purchase/models/commission_result.py
@@ -15,7 +15,7 @@ class CommissionResult(models.Model):
 
     def draft2done(self):
         for result in self:
-            if result.assign_type == 'agent':
+            if result.state == "draft" and result.assign_type == 'agent':
                 if not result.purchase_id:
                     vals = result._prepare_purchase_order()
                     po = self.env['purchase.order'].create(vals)