[MERGE] forward port branch 11.0 up to 1058976369e

2018-02-01 18:15:34 +01:00
parent 4227c0b3d0 c96e865551
commit 1888989d53
2 changed files with 2 additions and 2 deletions
@@ -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()
@@ -39,6 +39,7 @@
                        <field name="expiration_date"/>
                        <field name="partner_id"/>
                        <field name="order_id"/>
+                        <field name="sales_order_id"/>
                    </group>
                </sheet>
            </form>