From 901bc641fa3c318da9ecaac76791032a70010093 Mon Sep 17 00:00:00 2001
From: Alexandre Fayolle <alexandre.fayolle@camptocamp.com>
Date: Thu, 23 Mar 2017 17:26:20 +0100
Subject: [PATCH] fix sale order workflow

the final draft state was badly broken
BSRTL-174
---
 HISTORY.rst                                           | 1 +
 odoo/local-src/specific_sale/models/sale_order.py     | 3 ++-
 odoo/local-src/specific_sale/views/sale_order_crm.xml | 4 ++++
 odoo/migration.yml                                    | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 69ea246dbb9..7455214f203 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -25,6 +25,7 @@ latest (unreleased)
 
 * Correct sale validation group names
 * fix missing ACLs for hr.employee.status
+* fix sale order validation workflow
 
 **Build**
 
diff --git a/odoo/local-src/specific_sale/models/sale_order.py b/odoo/local-src/specific_sale/models/sale_order.py
index 3da76911d44..f1458cc9f1c 100644
--- a/odoo/local-src/specific_sale/models/sale_order.py
+++ b/odoo/local-src/specific_sale/models/sale_order.py
@@ -177,4 +177,5 @@ def action_confirm(self):
             if order.state == 'draft':
                 order.state = 'final_quote'
             else:
-                order.action_confirm()
+                super(SaleOrder, order).action_confirm()
+        return True
diff --git a/odoo/local-src/specific_sale/views/sale_order_crm.xml b/odoo/local-src/specific_sale/views/sale_order_crm.xml
index cb67595a567..4cce64bae37 100644
--- a/odoo/local-src/specific_sale/views/sale_order_crm.xml
+++ b/odoo/local-src/specific_sale/views/sale_order_crm.xml
@@ -32,6 +32,10 @@
       <xpath expr="//field[@widget='statusbar']" position="replace">
         <field name="state" widget="statusbar" statusbar_visible="draft,final_quote,sent,sale"/>
       </xpath>
+      <xpath expr="//header/button[@name='action_confirm'][1]"
+             position="attributes">
+        <attribute name="states">sent,final_quote</attribute>
+      </xpath>
 
       <notebook position="inside">
         <page string="RocTool" name="roctool">
diff --git a/odoo/migration.yml b/odoo/migration.yml
index 5f2bfe8ac87..4c9859acd6b 100644
--- a/odoo/migration.yml
+++ b/odoo/migration.yml
@@ -131,3 +131,4 @@ migration:
       addons:
         upgrade:
           - specific_hr
+          - specific_sale