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

1 files changed, 3 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index b5f69fa2..b4582f00 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1218,10 +1218,10 @@ class SaleOrder(models.Model):
         for order in self:
             for line in order.order_line:
                 if 'bom-it' in line.name.lower() or 'bom' in line.product_id.default_code.lower() if line.product_id.default_code else False:
-                    search_bom = self.env['mrp.production'].search([('product_id', '=', line.product_id.id)],
-                                                                   order='name desc')
+                    search_bom = self.env['mrp.production'].search([('product_id', '=', line.product_id.id), ('sale_order', '=', order.id), ('state', '!=', 'cancel')],
+                    order='name desc')
                     if search_bom:
-                        confirmed_bom = search_bom.filtered(lambda x: x.state == 'confirmed')
+                        confirmed_bom = search_bom.filtered(lambda x: x.state == 'confirmed' or x.state == 'done') 
                         if not confirmed_bom:
                             raise UserError(
                                 "Product BOM belum dikonfirmasi di Manufacturing Orders. Silakan hubungi MD.")