remove required npwp sppkp nib and fix purchase report

2 files changed, 30 insertions, 81 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 76d4d7e7..c767dd04 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -234,9 +234,9 @@ class SaleOrder(models.Model):
     customer_type = fields.Selection([
         ('pkp', 'PKP'),
         ('nonpkp', 'Non PKP')
-    ], required=True, compute='_compute_partner_field')
-    sppkp = fields.Char(string="SPPKP", required=True, tracking=True, compute='_compute_partner_field')
-    npwp = fields.Char(string="NPWP", required=True, tracking=True, compute='_compute_partner_field')
+    ], related="partner_id.customer_type", string="Customer Type", readonly=True)
+    sppkp = fields.Char(string="SPPKP", related="partner_id.sppkp")
+    npwp = fields.Char(string="NPWP", related="partner_id.npwp")
     purchase_total = fields.Monetary(string='Purchase Total', compute='_compute_purchase_total')
     voucher_id = fields.Many2one(comodel_name='voucher', string='Voucher', copy=False)
     applied_voucher_id = fields.Many2one(comodel_name='voucher', string='Applied Voucher', copy=False)
@@ -2049,22 +2049,22 @@ class SaleOrder(models.Model):
     #         return [('id', 'not in', order_ids)]
     #     return ['&', ('order_line.invoice_lines.move_id.move_type', 'in', ('out_invoice', 'out_refund')), ('order_line.invoice_lines.move_id', operator, value)]
 
-    @api.depends('partner_id')
-    def _compute_partner_field(self):
-        for order in self:
-            partner = order.partner_id.parent_id or order.partner_id
-            order.npwp = partner.npwp
-            order.sppkp = partner.sppkp
-            order.customer_type = partner.customer_type
+    # @api.depends('partner_id')
+    # def _compute_partner_field(self):
+    #     for order in self:
+    #         partner = order.partner_id.parent_id or order.partner_id
+    #         order.npwp = partner.npwp
+    #         order.sppkp = partner.sppkp
+    #         order.customer_type = partner.customer_type
 
     @api.onchange('partner_id')
     def onchange_partner_contact(self):
         parent_id = self.partner_id.parent_id
         parent_id = parent_id if parent_id else self.partner_id
 
-        self.npwp = parent_id.npwp
-        self.sppkp = parent_id.sppkp
-        self.customer_type = parent_id.customer_type
+        # self.npwp = parent_id.npwp
+        # self.sppkp = parent_id.sppkp
+        # self.customer_type = parent_id.customer_type
         self.email = parent_id.email
         self.pareto_status = parent_id.pareto_status
         self.user_id = parent_id.user_id
@@ -2141,9 +2141,15 @@ class SaleOrder(models.Model):
         if self.state not in ['draft', 'sent']:
             raise UserError("Status harus draft atau sent")
 
-        self._validate_npwp()
-
     def _validate_npwp(self):
+        if not self.npwp:
+            raise UserError("NPWP partner kosong, silahkan isi terlebih dahulu npwp nya di contact partner")
+        
+        if not self.customer_type:
+            raise UserError("Customer Type partner kosong, silahkan isi terlebih dahulu Customer Type nya di contact partner")
+        
+        if not self.sppkp:
+            raise UserError("SPPKP partner kosong, silahkan isi terlebih dahulu SPPKP nya di contact partner")
         num_digits = sum(c.isdigit() for c in self.npwp)
 
         if num_digits < 10:
@@ -2157,6 +2163,7 @@ class SaleOrder(models.Model):
 
         self._validate_order()
         for order in self:
+            order._validate_npwp()
             order._validate_uniform_taxes()
             order.order_line.validate_line()
 
@@ -2211,9 +2218,8 @@ class SaleOrder(models.Model):
         if self.validate_different_vendor() and not self.vendor_approval:
             return self._create_notification_action('Notification', 'Terdapat Vendor yang berbeda dengan MD Vendor')
         self.check_due()
-
-        self._validate_order()
         for order in self:
+            order._validate_npwp()
             order._validate_delivery_amt()
             order._validate_uniform_taxes()
             order.order_line.validate_line()
@@ -2480,6 +2486,7 @@ class SaleOrder(models.Model):
             order.check_data_real_delivery_address()
             order.sale_order_check_approve()
             order._validate_order()
+            order._validate_npwp()
             order.order_line.validate_line()
 
             main_parent = order.partner_id.get_main_parent()
@@ -2665,23 +2672,17 @@ class SaleOrder(models.Model):
     def _set_sppkp_npwp_contact(self):
         partner = self.partner_id.parent_id or self.partner_id
 
-        if not partner.sppkp:
-            partner.sppkp = self.sppkp
-        if not partner.npwp:
-            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.customer_type:
+        #     partner.customer_type = self.customer_type
         if not partner.user_id:
             partner.user_id = self.user_id.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
-        #     partner.sppkp = self.sppkp
-        #     partner.email = self.email
-
     def _compute_total_margin(self):
         for order in self:
             total_margin = sum(line.item_margin for line in order.order_line if line.product_id)
@@ -3123,52 +3124,6 @@ class SaleOrder(models.Model):
         # order._update_partner_details()
         return order
 
-    # def write(self, vals):
-    # Call the super method to handle the write operation
-    # res = super(SaleOrder, self).write(vals)
-    # self._compute_etrts_date()
-    # Check if the update is coming from a save operation
-    # if any(field in vals for field in ['sppkp', 'npwp', 'email', 'customer_type']):
-    #     self._update_partner_details()
-
-    # return res
-
-    def _update_partner_details(self):
-        for order in self:
-            partner = order.partner_id.parent_id or order.partner_id
-            if partner:
-                # Update partner details
-                partner.sppkp = order.sppkp
-                partner.npwp = order.npwp
-                partner.email = order.email
-                partner.customer_type = order.customer_type
-
-                # Save changes to the partner record
-                partner.write({
-                    'sppkp': partner.sppkp,
-                    'npwp': partner.npwp,
-                    'email': partner.email,
-                    'customer_type': partner.customer_type,
-                })
-
-    # def write(self, vals):
-    #     for order in self:
-    #         if order.state in ['sale', 'cancel']:
-    #             if 'order_line' in vals:
-    #                 new_lines = vals.get('order_line', [])
-    #                 for command in new_lines:
-    #                     if command[0] == 0:  # A new line is being added
-    #                         raise UserError(
-    #                             "SO tidak dapat ditambahkan produk baru karena SO sudah menjadi sale order.")
-    #
-    #     res = super(SaleOrder, self).write(vals)
-    #     # self._check_total_margin_excl_third_party()
-    #     if any(fields in vals for fields in ['delivery_amt', 'carrier_id', 'shipping_cost_covered']):
-    #         self._validate_delivery_amt()
-    #     if any(field in vals for field in ["order_line", "client_order_ref"]):
-    #         self._calculate_etrts_date()
-    #     return res
-    
     # @api.depends('commitment_date')
     def _compute_ready_to_ship_status_detail(self):
         def is_empty(val):
diff --git a/indoteknik_custom/models/sale_order_line.py b/indoteknik_custom/models/sale_order_line.py
index 47a24264..1f2ea1fb 100644
--- a/indoteknik_custom/models/sale_order_line.py
+++ b/indoteknik_custom/models/sale_order_line.py
@@ -71,23 +71,17 @@ class SaleOrderLine(models.Model):
 
             if order_qty > 0:
                 for move in line.move_ids:
-                    # --- CASE 1: Move belum selesai ---
                     if move.state not in ('done', 'cancel'):
                         reserved_qty += move.reserved_availability or 0.0
                         continue
 
-                    # --- CASE 2: Move sudah done ---
                     if move.location_dest_id.usage == 'customer':
-                        # Barang dikirim ke customer
                         delivered_qty += move.quantity_done or 0.0
                     elif move.location_id.usage == 'customer':
-                        # Barang balik dari customer (retur)
                         delivered_qty -= move.quantity_done or 0.0
 
-                # Clamp supaya delivered gak minus
                 delivered_qty = max(delivered_qty, 0)
 
-            # Hitung persen
             line.reserved_percent = min((reserved_qty / order_qty) * 100, 100) if order_qty else 0
             line.delivered_percent = min((delivered_qty / order_qty) * 100, 100) if order_qty else 0
             line.unreserved_percent = max(100 - line.reserved_percent - line.delivered_percent, 0)