Merge branch 'production' into feature/generate_url

1 files changed, 19 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index c1c2c267..22130ac3 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -136,6 +136,12 @@ class SaleOrder(models.Model):
         domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]", tracking=True)
     
     total_weight = fields.Float(string='Total Weight', compute='_compute_total_weight')
+    pareto_status = fields.Selection([
+        ('PR', 'Pareto Repeating'),
+        ('PPR', 'Potensi Pareto Repeating'),
+        ('PNR', 'Pareto Non Repeating'),
+        ('NP', 'Non Pareto')
+    ])
 
     def _compute_total_weight(self):
         total_weight = 0
@@ -642,6 +648,7 @@ class SaleOrder(models.Model):
         self.sppkp = parent_id.sppkp
         self.customer_type = parent_id.customer_type
         self.email = parent_id.email
+        self.pareto_status = parent_id.pareto_status
     
     @api.onchange('partner_id')
     def onchange_partner_id(self):
@@ -1024,11 +1031,20 @@ class SaleOrder(models.Model):
     def _set_sppkp_npwp_contact(self): 
         partner = self.partner_id.parent_id or self.partner_id
 
-        if not partner.sppkp or not partner.npwp or not partner.email or partner.customer_type:
-            partner.customer_type = self.customer_type
-            partner.npwp = self.npwp
+        if not partner.sppkp:
             partner.sppkp = self.sppkp
+        if not partner.npwp:
+            partner.npwp = self.npwp
+        if not partner.email:
             partner.email = self.email
+        if not partner.customer_type:
+            partner.customer_type = self.customer_type
+
+        # if not partner.sppkp or not partner.npwp or not partner.email or partner.customer_type:
+        #     partner.customer_type = self.customer_type
+        #     partner.npwp = self.npwp
+        #     partner.sppkp = self.sppkp
+        #     partner.email = self.email
     
     def _compute_total_margin(self):
         for order in self: