diff options
| -rw-r--r-- | indoteknik_custom/models/advance_payment_request.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py index 06fb7917..140e48bb 100644 --- a/indoteknik_custom/models/advance_payment_request.py +++ b/indoteknik_custom/models/advance_payment_request.py @@ -630,11 +630,13 @@ class AdvancePaymentRequest(models.Model): } - @api.depends('date_back_to_office', 'status', 'apr_perjalanan', 'create_date') + @api.depends('date_back_to_office', 'status', 'apr_perjalanan', 'create_date', 'settlement_ids.status') def _compute_days_remaining(self): today = date.today() for rec in self: - if rec.status in ['approved'] and rec.days_remaining: + # if rec.status in ['approved'] and rec.days_remaining: + is_settlement_approved = any(s.status == 'approved' for s in rec.settlement_ids) + if is_settlement_approved: continue if rec.apr_perjalanan: @@ -652,7 +654,7 @@ class AdvancePaymentRequest(models.Model): base_date = rec.create_date.date() if rec.create_date else today due_date = base_date + timedelta(days=7) rec.estimated_return_date = due_date - rec.days_remaining = (due_date - base_date).days + rec.days_remaining = (due_date - today).days @api.onchange('date_back_to_office') def _onchange_date_back_to_office(self): |