From 6dd52a01a2c1a284dfc4def923e519662d3ff6ee Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Mon, 30 Jan 2017 10:29:31 +0100 Subject: [PATCH] [FIX] sale_coupon: Do not validate generated coupons on SO cancellation --- models/sale_coupon.py | 2 ++ models/sale_order.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/models/sale_coupon.py b/models/sale_coupon.py index 1156e6b275a..8c89f272adb 100644 --- a/models/sale_coupon.py +++ b/models/sale_coupon.py @@ -36,6 +36,8 @@ class SaleCoupon(models.Model): program_id = fields.Many2one('sale.coupon.program', "Program") order_id = fields.Many2one('sale.order', 'Order Reference', readonly=True, help="The sales order from which coupon is generated") + sales_order_id = fields.Many2one('sale.order', 'Applied on order', readonly=True, + help="The sales order on which the coupon is applied") discount_line_product_id = fields.Many2one('product.product', related='program_id.discount_line_product_id', help='Product used in the sales order to apply the discount.') diff --git a/models/sale_order.py b/models/sale_order.py index 2574362a9d2..4af53adc3a4 100644 --- a/models/sale_order.py +++ b/models/sale_order.py @@ -7,7 +7,7 @@ from odoo import api, fields, models class SaleOrder(models.Model): _inherit = "sale.order" - applied_coupon_ids = fields.One2many('sale.coupon', 'order_id', string="Applied Coupons", copy=False) + applied_coupon_ids = fields.One2many('sale.coupon', 'sales_order_id', string="Applied Coupons", copy=False) generated_coupon_ids = fields.One2many('sale.coupon', 'order_id', string="Offered Coupons", copy=False) reward_amount = fields.Float(compute='_compute_reward_total') no_code_promo_program_ids = fields.Many2many('sale.coupon.program', string="Applied Immediate Promo Programs",