Merge branch 'production' of bitbucket.org:altafixco/indoteknik-addons into production

1 files changed, 12 insertions, 3 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index c1c2c267..e6382cd9 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1024,11 +1024,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: