(andri) fix merge

1 files changed, 20 insertions, 2 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 18811b85..68180235 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -6,6 +6,7 @@ import logging
 from pytz import timezone, utc
 import io
 import base64
+from odoo.tools import lazy_property
 try:
     from odoo.tools.misc import xlsxwriter
 except ImportError:
@@ -115,6 +116,20 @@ class PurchaseOrder(models.Model):
         compute='_compute_complete_bu_in_count'
     )
 
+    show_description = fields.Boolean(
+        string='Show Description',
+        default=True
+    )
+    
+    @api.onchange('show_description')
+    def onchange_show_description(self):
+        if self.show_description == True:
+            for line in self.order_line:
+                line.show_description = True
+        else:
+            for line in self.order_line:
+                line.show_description = False
+
     def _compute_complete_bu_in_count(self):
         for order in self:
             if order.state not in ['done', 'cancel']:
@@ -137,7 +152,7 @@ class PurchaseOrder(models.Model):
     def _compute_date_planned(self):
         """ date_planned = the earliest date_planned across all order lines. """
         for order in self:
-            order.date_planned = False
+            order.date_planned = order.date_planned
 
     @api.constrains('date_planned')
     def constrains_date_planned(self):
@@ -1066,8 +1081,11 @@ class PurchaseOrder(models.Model):
         #         sticky=True
         #     )
 
+        has_bom = self.product_bom_id.id
+        has_manufacturing = self.manufacturing_id.id
+
         if not self.from_apo:
-            if not self.matches_so and not self.env.user.is_purchasing_manager and not self.env.user.is_leader:
+            if not self.matches_so and not self.env.user.is_purchasing_manager and not self.env.user.is_leader and not has_bom and not has_manufacturing:
                 raise UserError("Tidak ada link dengan SO, harus di confirm oleh Purchasing Manager")
             
         send_email = False