Merge branch 'production' into feature/calculate_selling_price

# Conflicts:
#	indoteknik_custom/views/website_user_cart.xml

1 files changed, 8 insertions, 0 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 5badacba..0b0a679f 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -501,6 +501,10 @@ class SaleOrder(models.Model):
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
             if order.payment_term_id != partner.property_payment_term_id:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
+            if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.npwp != partner.npwp:
+                raise UserError("NPWP berbeda pada Master Data Customer")
+            if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.sppkp != partner.sppkp:
+                raise UserError("SPPKP berbeda pada Master Data Customer")
             if not order.client_order_ref and order.create_date > datetime(2024, 6, 27):
                 raise UserError("Customer Reference kosong, di isi dengan NO PO jika PO tidak ada mohon ditulis Tanpa PO")
             
@@ -518,6 +522,10 @@ class SaleOrder(models.Model):
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
             if order.payment_term_id != partner.property_payment_term_id:
                 raise UserError("Payment Term berbeda pada Master Data Customer")
+            if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.npwp != partner.npwp:
+                raise UserError("NPWP berbeda pada Master Data Customer")
+            if (partner.customer_type == 'pkp' or order.customer_type == 'pkp') and order.sppkp != partner.sppkp:
+                raise UserError("SPPKP berbeda pada Master Data Customer")
             if not order.client_order_ref and order.create_date > datetime(2024, 6, 27):
                 raise UserError("Customer Reference kosong, di isi dengan NO PO jika PO tidak ada mohon ditulis Tanpa PO")