diff --git a/nfu_sale_order_packaging/models/sale_order_batch_product.py b/nfu_sale_order_packaging/models/sale_order_batch_product.py index aef5f9d..c3f5535 100644 --- a/nfu_sale_order_packaging/models/sale_order_batch_product.py +++ b/nfu_sale_order_packaging/models/sale_order_batch_product.py @@ -9,8 +9,13 @@ class SaleOrderBatchProduct(models.Model): @api.depends("sale_order_line_ids.product_uom_qty") def _compute_open_packagin_qty(self): for product in self: + open_packaging_qty = product.product_packaging_qty - ( + sum(product.sale_order_line_ids.mapped("product_uom_qty")) + % product.product_packaging_qty + % product.product_packaging_qty + ) product.open_packaging_qty = ( - sum(product.sale_order_line_ids.mapped("product_uom_qty")) % product.product_packaging_qty + 0 if open_packaging_qty == product.product_packaging_qty else open_packaging_qty ) @api.model_create_multi diff --git a/nfu_sale_order_packaging/views/sale_order_batch_product_views.xml b/nfu_sale_order_packaging/views/sale_order_batch_product_views.xml index 3542a6d..564d876 100644 --- a/nfu_sale_order_packaging/views/sale_order_batch_product_views.xml +++ b/nfu_sale_order_packaging/views/sale_order_batch_product_views.xml @@ -8,6 +8,13 @@ + + + + diff --git a/nfu_sale_order_packaging/views/sale_order_batch_views.xml b/nfu_sale_order_packaging/views/sale_order_batch_views.xml index 6b32222..aa7516b 100644 --- a/nfu_sale_order_packaging/views/sale_order_batch_views.xml +++ b/nfu_sale_order_packaging/views/sale_order_batch_views.xml @@ -12,6 +12,15 @@ + + + + + (open_packaging_qty != 0) + diff --git a/sale_order_batch/models/sale_order_batch_product.py b/sale_order_batch/models/sale_order_batch_product.py index 52d02ac..cc2b387 100644 --- a/sale_order_batch/models/sale_order_batch_product.py +++ b/sale_order_batch/models/sale_order_batch_product.py @@ -22,7 +22,9 @@ class SaleOrderBatchProduct(models.Model): product_template_id = fields.Many2one( "product.template", related="product_id.product_tmpl_id", string="Product Template" ) - sale_order_line_ids = fields.Many2many("sale.order.line", compute="_compute_sale_order_line_ids", store=True) + sale_order_line_ids = fields.Many2many( + "sale.order.line", compute="_compute_sale_order_line_ids", store=True, readonly=False + ) product_uom_category_id = fields.Many2one(related="product_id.uom_id.category_id", depends=["product_id"]) product_uom_qty = fields.Float(compute="_compute_uom_qty") product_uom = fields.Many2one(related="product_id.uom_id") diff --git a/sale_order_batch/views/sale_order_batch_product_views.xml b/sale_order_batch/views/sale_order_batch_product_views.xml index 9b406ef..90a273e 100644 --- a/sale_order_batch/views/sale_order_batch_product_views.xml +++ b/sale_order_batch/views/sale_order_batch_product_views.xml @@ -23,11 +23,9 @@ - + - -