From 327835caeb892b66813383456d83156c37b666e1 Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Mon, 22 Sep 2025 15:39:32 +0700 Subject: (andri) add previous pt --- indoteknik_api/controllers/api_v1/partner.py | 11 +++++++++-- indoteknik_custom/models/res_partner.py | 6 ++++++ indoteknik_custom/views/res_partner.xml | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py index b1d8d5f3..8d67800c 100644 --- a/indoteknik_api/controllers/api_v1/partner.py +++ b/indoteknik_api/controllers/api_v1/partner.py @@ -295,7 +295,14 @@ class Partner(controller.Controller): partner = partner.parent_id or partner - if any(line.days == 0 for line in partner.property_payment_term_id.line_ids): + payment_term = ( + partner.previous_payment_term_id + if partner.is_cbd_locked + else partner.property_payment_term_id + ) + + # if any(line.days == 0 for line in partner.property_payment_term_id.line_ids): + if any(line.days == 0 for line in payment_term.line_ids): return self.response(code=402, description='Partner not tempo') domain_result_tempo = [('partner_id', '=', partner.id), ('payment_state', '=', 'not_paid'), ('state', '=', 'posted')] @@ -315,7 +322,7 @@ class Partner(controller.Controller): data = { 'name': partner.name, - 'payment_term': partner.property_payment_term_id.name, + 'payment_term': payment_term.name, 'amount_due': result_tempo, 'amount_due_total': result_tempo_total, 'amount_jatuh_tempo_total': result_jatuh_tempo_total, diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py index 36570e8f..8aaee47e 100644 --- a/indoteknik_custom/models/res_partner.py +++ b/indoteknik_custom/models/res_partner.py @@ -194,6 +194,12 @@ class ResPartner(models.Model): default=_default_payment_term, tracking=3 ) + previous_payment_term_id = fields.Many2one( + 'account.payment.term', + string='Previous Payment Term', + readonly=True + ) + @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id", "kecamatan_id") diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml index c32151d8..a7770f1e 100644 --- a/indoteknik_custom/views/res_partner.xml +++ b/indoteknik_custom/views/res_partner.xml @@ -21,6 +21,7 @@ + -- cgit v1.2.3 From 21f46424f4d879b8c703d8da7a6f8b3c20193ced Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Mon, 22 Sep 2025 17:23:21 +0700 Subject: (andri) fix reminder mail --- indoteknik_custom/models/account_move.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index 96f791c5..d1485f1f 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -334,11 +334,13 @@ class AccountMove(models.Model): tempo_link = 'https://indoteknik.com/my/tempo' # tempo_link = 'http://localhost:2100/my/tempo' + payment_term = partner.previous_payment_term_id if partner.is_cbd_locked else partner.property_payment_term_id + limit_info_html = f"""

Informasi Tambahan:

  • Kredit Limit Anda: {formatLang(self.env, blocking_limit, currency_obj=currency)}
    • -
  • Status Detail Tempo: {partner.property_payment_term_id.name or 'Review'}
    • +
  • Status Detail Tempo: {partner.payment_term.name or 'Review'}
  • Sisa Kredit Limit: {formatLang(self.env, blocking_limit - outstanding_amount, currency_obj=currency)}
    • -- cgit v1.2.3 From d373212e2da13ef478b70c6d354807ee62484464 Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Mon, 22 Sep 2025 17:25:34 +0700 Subject: (andri) fix --- indoteknik_custom/models/account_move.py | 1 - 1 file changed, 1 deletion(-) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index d1485f1f..edcfbdd5 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -333,7 +333,6 @@ class AccountMove(models.Model): currency = invs[0].currency_id if invs else partner.company_id.currency_id tempo_link = 'https://indoteknik.com/my/tempo' # tempo_link = 'http://localhost:2100/my/tempo' - payment_term = partner.previous_payment_term_id if partner.is_cbd_locked else partner.property_payment_term_id limit_info_html = f""" -- cgit v1.2.3 From ec0277a049ea2048785dba61711a24e9a4eb3363 Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Mon, 22 Sep 2025 17:38:15 +0700 Subject: fix --- indoteknik_custom/models/account_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index edcfbdd5..60f0da74 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -339,7 +339,7 @@ class AccountMove(models.Model):

    Informasi Tambahan:

    • Kredit Limit Anda: {formatLang(self.env, blocking_limit, currency_obj=currency)}
      • -
    • Status Detail Tempo: {partner.payment_term.name or 'Review'}
      • +
    • Status Detail Tempo: {payment_term.name or 'Review'}
    • Sisa Kredit Limit: {formatLang(self.env, blocking_limit - outstanding_amount, currency_obj=currency)}
      • -- cgit v1.2.3 From 68594ca366d77396d9d2c8e707043fcb28a303f7 Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Mon, 22 Sep 2025 17:38:45 +0700 Subject: fix --- indoteknik_custom/models/account_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index 60f0da74..c7feac9e 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -339,7 +339,7 @@ class AccountMove(models.Model):

      Informasi Tambahan:

      • Kredit Limit Anda: {formatLang(self.env, blocking_limit, currency_obj=currency)}
        • -
      • Status Detail Tempo: {payment_term.name or 'Review'}
        • +
      • Status Detail Tempo: {payment_term.name or ''}
      • Sisa Kredit Limit: {formatLang(self.env, blocking_limit - outstanding_amount, currency_obj=currency)}
        • -- cgit v1.2.3