Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into pum-v2

1 files changed, 8 insertions, 8 deletions

diff --git a/indoteknik_custom/models/mrp_production.py b/indoteknik_custom/models/mrp_production.py
index 91da0597..b39995b5 100644
--- a/indoteknik_custom/models/mrp_production.py
+++ b/indoteknik_custom/models/mrp_production.py
@@ -263,7 +263,7 @@ class CheckBomProduct(models.Model):
                     "The product '%s' tidak ada di operations. "
                 ) % record.product_id.display_name)
 
-            total_qty_in_moves = sum(moves.mapped('product_uom_qty'))
+            total_qty_in_moves = sum(moves.mapped('quantity_done'))
 
             # Find existing lines for the same product, excluding the current line
             existing_lines = record.production_id.check_bom_product_lines.filtered(
@@ -273,15 +273,15 @@ class CheckBomProduct(models.Model):
             if existing_lines:
                 total_quantity = sum(existing_lines.mapped('quantity'))
 
-                if total_quantity > total_qty_in_moves:
+                if total_quantity != total_qty_in_moves:
                     raise UserError((
-                        "Quantity Product '%s' kurang dari quantity demand."
+                        "Quantity Product '%s' harus sama dengan quantity consumed."
                     ) % (record.product_id.display_name))
             else:
                 # Check if the quantity exceeds the allowed total
-                if record.quantity > total_qty_in_moves:
+                if record.quantity != total_qty_in_moves:
                     raise UserError((
-                        "Quantity Product '%s' kurang dari quantity demand."
+                        "Quantity Product '%s' harus sama dengan quantity consumed."
                     ) % (record.product_id.display_name))
 
                 # Set the quantity to the entered value
@@ -446,7 +446,7 @@ class CheckBomProduct(models.Model):
                     "The product '%s' tidak ada di operations. "
                 ) % record.product_id.display_name)
 
-            total_qty_in_moves = sum(moves.mapped('product_uom_qty'))
+            total_qty_in_moves = sum(moves.mapped('quantity_done'))
 
             # Find existing lines for the same product, excluding the current line
             existing_lines = record.production_id.check_bom_product_lines.filtered(
@@ -462,13 +462,13 @@ class CheckBomProduct(models.Model):
 
                 if total_quantity > total_qty_in_moves:
                     raise UserError((
-                        "Quantity Product '%s' sudah melebihi quantity demand."
+                        "Quantity Product '%s' sudah melebihi quantity consumed."
                     ) % (record.product_id.display_name))
             else:
                 # Check if the quantity exceeds the allowed total
                 if record.quantity == total_qty_in_moves:
                     raise UserError((
-                        "Quantity Product '%s' sudah melebihi quantity demand."
+                        "Quantity Product '%s' sudah melebihi quantity consumed."
                     ) % (record.product_id.display_name))
 
                 # Set the quantity to the entered value