Merge branch 'production' into iman/pengajuan-tempo

# Conflicts:
#	indoteknik_custom/__manifest__.py
#	indoteknik_custom/models/res_partner.py
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 6 insertions, 5 deletions

diff --git a/indoteknik_custom/models/promotion/sale_order.py b/indoteknik_custom/models/promotion/sale_order.py
index be820c6f..1c31d060 100644
--- a/indoteknik_custom/models/promotion/sale_order.py
+++ b/indoteknik_custom/models/promotion/sale_order.py
@@ -10,11 +10,12 @@ class SaleOrder(models.Model):
         for promotion in promotions:
             program_line = self.env['promotion.program.line'].browse(promotion['program_line_id'])
             for free_product in program_line.free_product_ids:
-                self.env['sale.order.line'].create({
-                    'order_id': self.id,
-                    'name': "Free Product " + free_product.product_id.display_name,
-                    'display_type': 'line_note'
-                })
+                if free_product.product_id.merchandise_ok:
+                    self.env['sale.order.line'].create({
+                        'order_id': self.id,
+                        'name': f"Free Product {free_product.product_id.display_name} Quantity ({free_product.qty})",
+                        'display_type': 'line_note'
+                    })
 
     def apply_promotion_program(self):
         userdata = {