From ff1202c8d4e95b2028bbdf9e4e3566239862efd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= Date: Thu, 27 Mar 2025 22:22:08 +0100 Subject: [PATCH] [IMP] nfu_sale_order_batch_packaging: adjust webshop to new sale_order_batch fields --- sale_order_batch/models/sale_order.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sale_order_batch/models/sale_order.py b/sale_order_batch/models/sale_order.py index 130ddfe..46c2f56 100644 --- a/sale_order_batch/models/sale_order.py +++ b/sale_order_batch/models/sale_order.py @@ -7,6 +7,16 @@ class SaleOrder(models.Model): batch_id = fields.Many2one("sale.order.batch", copy=False, check_company=True, domain="[('state','!=','closed')]") + def _get_current_batch(self): + """ + Returns the current batch of the sale order. + :return: sale.order.batch + """ + self.ensure_one() + return self.env["sale.order.batch"].search( + [("state", "=", "open"), ("company_id", "=", self.company_id.id)], limit=1 + ) + def action_add_to_batch(self): """ TODO: Add Wizard to choose between batches if more than one existis. Picking the first one for now. @@ -14,10 +24,8 @@ class SaleOrder(models.Model): for sale_order in self: company = sale_order.company_id sale_order = sale_order.with_company(company) - batch = self.env["sale.order.batch"].search( - [("state", "=", "open"), ("company_id", "=", company.id)], limit=1 - ) if not sale_order.batch_id and sale_order.state in ["draft", "sent"]: + batch = sale_order._get_current_batch() if not batch: batch = sale_order.env["sale.order.batch"].create({}) sale_order.batch_id = batch