From 7e0e9e58621736ee3605e02eef46e7452f0c646e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20G=C3=B6ttsch?= <ng@ife.de>
Date: Tue, 23 Jul 2024 21:25:28 +0200
Subject: [PATCH] [fix] string cosmetics and formating

---
 nfu_sale_order_packaging/models/sale_order_batch_product.py  | 4 +---
 .../views/sale_order_batch_product_views.xml                 | 2 +-
 sale_order_batch/models/sale_order_batch_product.py          | 4 ++--
 sale_order_batch/views/sale_order_batch_product_views.xml    | 5 +++--
 4 files changed, 7 insertions(+), 8 deletions(-)

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 c3f5535..f2c3cb8 100644
--- a/nfu_sale_order_packaging/models/sale_order_batch_product.py
+++ b/nfu_sale_order_packaging/models/sale_order_batch_product.py
@@ -10,9 +10,7 @@ class SaleOrderBatchProduct(models.Model):
     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
+                sum(product.sale_order_line_ids.mapped("product_uom_qty")) % product.product_packaging_qty
             )
             product.open_packaging_qty = (
                 0 if open_packaging_qty == product.product_packaging_qty else open_packaging_qty
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 564d876..0906e95 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
@@ -5,7 +5,7 @@
                 <field name="model">sale.order.batch.product</field>
                 <field name="inherit_id" ref="sale_order_batch.view_order_batch_product_form"/>
                 <field name="arch" type="xml">
-                    <xpath expr="//field[@name='batch_id']" position="after">
+                    <xpath expr="//group[@name='product_info']" position="inside">
                         <field name="open_packaging_qty" decoration-warning="(open_packaging_qty != 0)"/>
                     </xpath>
                     <xpath
diff --git a/sale_order_batch/models/sale_order_batch_product.py b/sale_order_batch/models/sale_order_batch_product.py
index cc2b387..a259a84 100644
--- a/sale_order_batch/models/sale_order_batch_product.py
+++ b/sale_order_batch/models/sale_order_batch_product.py
@@ -26,7 +26,7 @@ class SaleOrderBatchProduct(models.Model):
         "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_qty = fields.Float(compute="_compute_uom_qty", string="Quantity")
     product_uom = fields.Many2one(related="product_id.uom_id")
     product_packaging_id = fields.Many2one("product.packaging")
     product_packaging_qty = fields.Float(compute="_compute_product_packaging_qty")
@@ -38,7 +38,7 @@ class SaleOrderBatchProduct(models.Model):
                 lambda o: o.product_id == product.product_id
             )
 
-    @api.depends("batch_id.sale_order_line_ids")
+    @api.depends("sale_order_line_ids.product_uom_qty")
     def _compute_uom_qty(self):
         for product in self:
             product.product_uom_qty = sum(product.sale_order_line_ids.mapped("product_uom_qty"))
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 90a273e..a1661e6 100644
--- a/sale_order_batch/views/sale_order_batch_product_views.xml
+++ b/sale_order_batch/views/sale_order_batch_product_views.xml
@@ -12,10 +12,11 @@
                         <field name="product_id"/>
                     </h1>
                     <group>
-                        <group>
+                        <group name="product_info">
                             <field name="batch_id"/>
+                            <field name="product_uom_qty"/>
                         </group>
-                        <group>
+                        <group name="packaging_info">
                             <field name="product_packaging_id"/>
                             <field name="product_packaging_qty"/>
                         </group>