From 844f6e95e5713717584801e0283f59f92eb8c855 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Thu, 22 Apr 2021 08:20:07 +0000 Subject: [PATCH] [FIX] gift_card: fix compute name and typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Courtesy of @willmakenoise Commented on commit ae7e1f64f8f4d7bfe21f329721eb1bb21d0593d1 closes odoo/odoo#69658 X-original-commit: 88beb09b736e4a51d64bf35cbb29c2cb739e4d06 Signed-off-by: Jérémy Kersten (jke) --- addons/gift_card/models/gift_card.py | 3 +-- addons/gift_card/models/sale_order.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/gift_card/models/gift_card.py b/addons/gift_card/models/gift_card.py index 80ed4b94bdc..8acc1763a51 100644 --- a/addons/gift_card/models/gift_card.py +++ b/addons/gift_card/models/gift_card.py @@ -38,10 +38,9 @@ class GiftCard(models.Model): ('check_amount', 'CHECK(initial_amount >= 0)', 'The initial amount must be positive.') ] - @api.depends("balance") def _compute_name(self): for record in self: - record.name = _("Gift #%s", self.id) + record.name = _("Gift #%s", record.id) @api.depends("initial_amount", "redeem_line_ids") def _compute_balance(self): diff --git a/addons/gift_card/models/sale_order.py b/addons/gift_card/models/sale_order.py index 53073e6d7b0..8329b6fc14a 100644 --- a/addons/gift_card/models/sale_order.py +++ b/addons/gift_card/models/sale_order.py @@ -22,8 +22,8 @@ class SaleOrder(models.Model): # create and send gift card when order become confirmed for record in self.filtered(lambda so: so.state == 'sale'): - for gift_card_oder_line in record.order_line.filtered(lambda ol: ol.product_id.is_gift_card): - gift_card_oder_line._create_gift_cards() + for gift_card_order_line in record.order_line.filtered(lambda ol: ol.product_id.is_gift_card): + gift_card_order_line._create_gift_cards() record.sudo()._send_gift_card_mail() def _pay_with_gift_card(self, gift_card): @@ -83,7 +83,7 @@ class SaleOrderLine(models.Model): _inherit = "sale.order.line" generated_gift_card_ids = fields.One2many('gift.card', "buy_line_id", string="Bought Gift Card") - gift_card_id = fields.Many2one('gift.card', help="Deduced from this Gift Card", copy=False) + gift_card_id = fields.Many2one('gift.card', help="Deducted from this Gift Card", copy=False) def _is_not_sellable_line(self): return self.gift_card_id or super()._is_not_sellable_line()