From abb95335ee639c1d5b6d3eb0e7f65f452c77706c Mon Sep 17 00:00:00 2001
From: it-fixcomart <it@fixcomart.co.id>
Date: Tue, 16 Sep 2025 09:27:19 +0700
Subject: <hafid> fix status website

---
 indoteknik_api/models/sale_order.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indoteknik_api/models')

diff --git a/indoteknik_api/models/sale_order.py b/indoteknik_api/models/sale_order.py
index c59dead9..23be358a 100644
--- a/indoteknik_api/models/sale_order.py
+++ b/indoteknik_api/models/sale_order.py
@@ -75,7 +75,7 @@ class SaleOrder(models.Model):
         if sale_order.state == 'sale':
             bu_pickings = [
                 p for p in sale_order.picking_ids
-                if p.picking_type_id and p.picking_type_id.id == 29
+                if p.picking_type_id and p.picking_type_id.id == 29 and p.state != 'cancel'
             ]
 
             # Hitung status masing-masing picking
-- 
cgit v1.2.3


From 40339a02ec72951ae8bc9922ce6ab01d5aad6ba9 Mon Sep 17 00:00:00 2001
From: FIN-IT_AndriFP <it@fixcomart.co.id>
Date: Wed, 24 Sep 2025 14:48:11 +0700
Subject: (andri) fix API response

---
 indoteknik_api/models/res_users.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'indoteknik_api/models')

diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py
index 015b9e0e..c4e19bf3 100644
--- a/indoteknik_api/models/res_users.py
+++ b/indoteknik_api/models/res_users.py
@@ -14,6 +14,11 @@ class ResUsers(models.Model):
             'manager': 2,
             'director': 3
         }
+        payment_term = (
+            main_partner.previous_payment_term_id
+            if main_partner.is_cbd_locked
+            else main_partner.property_payment_term_id
+        )
         partner_tempo = False
         is_tempo_request = request.env['user.pengajuan.tempo.request'].search([('user_company_id', '=', main_partner.id)], limit=1)
         tempo_progres = (
@@ -21,8 +26,8 @@ class ResUsers(models.Model):
             'rejected' if is_tempo_request.state_tempo == 'reject' else
             'approve' if is_tempo_request.state_tempo == 'approval_director' else ''
         )
-        if main_partner:
-            partner_tempo = True if 'tempo' in main_partner.get_check_payment_term().lower() else False
+        if payment_term:
+            partner_tempo = True if 'tempo' in payment_term.name.lower() else False
         
         data = {
             'id': res_user.id,
-- 
cgit v1.2.3