From 6e71f3acdffea2edbb72d2d354b443a9c855f659 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Fri, 26 Jan 2018 15:17:50 +0100
Subject: [PATCH 1/2] [FIX] sale_coupon: recompute coupon before confirmation

Instead of after
If "Lock Confirmed Orders" option is checked, a sale order with a coupon can not
be confirmed as the lines are recomputed after the change of state

Fixes odoo/odoo#22333
Closes #1823
---
 models/sale_order.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/models/sale_order.py b/models/sale_order.py
index 9ce09c452e2..4deb0b37481 100644
--- a/models/sale_order.py
+++ b/models/sale_order.py
@@ -36,10 +36,9 @@ class SaleOrder(models.Model):
         return order
 
     def action_confirm(self):
-        res = super(SaleOrder, self).action_confirm()
         self.recompute_coupon_lines()
         self.generated_coupon_ids.write({'state': 'new'})
-        return res
+        return super(SaleOrder, self).action_confirm()
 
     def action_cancel(self):
         res = super(SaleOrder, self).action_cancel()

From c96e86555175559e653151482e4d513dc710ab39 Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Thu, 1 Feb 2018 10:01:39 +0100
Subject: [PATCH 2/2] [FIX] sale_coupon: consumed coupon gets no reference to
 order

The field sales_order_id was not displayed in the sale.coupon form view
to get the information about 'Applied on order'.

opw:806508
---
 views/sale_coupon_views.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/sale_coupon_views.xml b/views/sale_coupon_views.xml
index 5ef1d81d7f7..ef3e6dcbbfe 100644
--- a/views/sale_coupon_views.xml
+++ b/views/sale_coupon_views.xml
@@ -38,6 +38,7 @@
                         <field name="expiration_date"/>
                         <field name="partner_id"/>
                         <field name="order_id"/>
+                        <field name="sales_order_id"/>
                     </group>
                 </sheet>
             </form>