Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

1 files changed, 14 insertions, 11 deletions

diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 3aaae12d..4a7203a1 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -1813,10 +1813,10 @@ class SaleOrder(models.Model):
     #             rec.commitment_date = rec.expected_ready_to_ship
 
                 
-    @api.onchange('expected_ready_to_ship') #Hangle Onchange form Expected Ready to Ship
+    @api.onchange('expected_ready_to_ship')
     def _onchange_expected_ready_ship_date(self):
         self._validate_expected_ready_ship_date()
-
+    
     def _set_etrts_date(self):
         for order in self:
             if order.state in ('done', 'cancel', 'sale'):
@@ -1984,10 +1984,10 @@ class SaleOrder(models.Model):
         #     raise UserError('Kelurahan Real Delivery Address harus diisi')
 
     def generate_payment_link_midtrans_sales_order(self):
-        # midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions'  # dev - sandbox
-        # midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6'  # dev - sandbox
-        midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'          # production
-        midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6' # production
+        midtrans_url = 'https://app.sandbox.midtrans.com/snap/v1/transactions'  # dev - sandbox
+        midtrans_auth = 'Basic U0ItTWlkLXNlcnZlci1uLVY3ZDJjMlpCMFNWRUQyOU95Q1dWWXA6'  # dev - sandbox
+        # midtrans_url = 'https://app.midtrans.com/snap/v1/transactions'          # production
+        # midtrans_auth = 'Basic TWlkLXNlcnZlci1SbGMxZ2gzWGpSVW5scl9JblZzTV9OTnU6' # production
 
         so_number = self.name
         so_number = so_number.replace('/', '-')
@@ -2000,8 +2000,8 @@ class SaleOrder(models.Model):
         }
 
         # ==== ENV ====
-        # check_url = f'https://api.sandbox.midtrans.com/v2/{so_number}/status'  # dev - sandbox
-        check_url = f'https://api.midtrans.com/v2/{so_number}/status'        # production
+        check_url = f'https://api.sandbox.midtrans.com/v2/{so_number}/status'  # dev - sandbox
+        # check_url = f'https://api.midtrans.com/v2/{so_number}/status'        # production
         # =============================================
 
         check_response = requests.get(check_url, headers=headers)
@@ -2241,7 +2241,7 @@ class SaleOrder(models.Model):
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
             if not partner.active_limit and term_days > 0:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
-            if order.payment_term_id != partner.property_payment_term_id:
+            if order.payment_term_id != partner.property_payment_term_id and not order.partner_id.id == 29179:
                 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")
@@ -2324,7 +2324,7 @@ class SaleOrder(models.Model):
                 raise UserError("Payment Term pada Master Data Customer harus diisi")
             if not partner.active_limit and term_days > 0:
                 raise UserError("Credit Limit pada Master Data Customer harus diisi")
-            if order.payment_term_id != partner.property_payment_term_id:
+            if order.payment_term_id != partner.property_payment_term_id and not order.partner_id.id == 29179:
                 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")
@@ -3328,12 +3328,15 @@ class SaleOrder(models.Model):
             for order in self:
                 partner = order.partner_id.parent_id or order.partner_id
                 customer_payment_term = partner.property_payment_term_id
-                if vals['payment_term_id'] != customer_payment_term.id:
+                if vals['payment_term_id'] != customer_payment_term.id and not order.partner_id.id == 29179:
                     raise UserError(
                         f"Payment Term berbeda pada Master Data Customer. "
                         f"Harap ganti ke '{customer_payment_term.name}' "
                         f"sesuai dengan payment term yang terdaftar pada customer."
                     )
+                
+                if order.partner_id.id == 29179 and vals['payment_term_id'] not in [25,28]:
+                    raise UserError(_("Pilih payment term 60 hari atau 30 hari."))
 
 
         res = super(SaleOrder, self).write(vals)