diff options
| author | FIN-IT_AndriFP <it@fixcomart.co.id> | 2025-10-02 14:04:56 +0700 |
|---|---|---|
| committer | FIN-IT_AndriFP <it@fixcomart.co.id> | 2025-10-02 14:04:56 +0700 |
| commit | 7d89516ce05d0ea67733c04436cc2de544189efe (patch) | |
| tree | 2521fbf09f4695253fd7db1ff7613b7f003f20ea /indoteknik_api/models | |
| parent | 10da5e27e658030f171f694d6696f93e4a472447 (diff) | |
| parent | 875b20796c7fa64abebe430b2707df597e29836b (diff) | |
Merge branch 'pum-v2' of https://bitbucket.org/altafixco/indoteknik-addons into pum-v2
Diffstat (limited to 'indoteknik_api/models')
| -rw-r--r-- | indoteknik_api/models/res_users.py | 9 | ||||
| -rw-r--r-- | indoteknik_api/models/sale_order.py | 2 |
2 files changed, 8 insertions, 3 deletions
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, 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 |