Merge branch 'odoo-backup' into pum-v2

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 10 insertions, 6 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 148a3fd0..ef1a5cf4 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -1,6 +1,6 @@
 from odoo import models, fields, api
 from odoo.exceptions import UserError, ValidationError
-from datetime import datetime
+from datetime import datetime, timedelta
 from odoo.http import request
 import re
 import requests
@@ -181,10 +181,8 @@ class ResPartner(models.Model):
     payment_difficulty = fields.Selection([('bermasalah', 'Bermasalah'),('sulit', 'Sulit'),('agak_sulit', 'Agak Sulit'),('normal', 'Normal')], string='Payment Difficulty', tracking=3)
     payment_history_url = fields.Text(string='Payment History URL')
 
-    # no compute
-    # payment_diff = fields.Selection([('bermasalah', 'Bermasalah'),('sulit', 'Sulit'),('agak_sulit', 'Agak Sulit'),('normal', 'Normal')], string='Payment Difficulty', tracking=3)
-    
-    # tidak terpakai
+    is_cbd_locked = fields.Boolean("Locked to CBD?", default=False, tracking=True, help="Jika dicentang, maka partner ini terkunci pada payment term CBD karena memiliki invoice yang sudah jatuh tempo lebih dari 30 hari.")
+
 
     @api.model
     def _default_payment_term(self):
@@ -193,9 +191,15 @@ class ResPartner(models.Model):
     property_payment_term_id = fields.Many2one(
         'account.payment.term',
         string='Payment Terms',
-        default=_default_payment_term
+        default=_default_payment_term, tracking=3
+    )
+
+    previous_payment_term_id = fields.Many2one(
+        'account.payment.term',
+        string='Previous Payment Term'
     )
 
+
     @api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
                  "kecamatan_id")
     def _alamat_lengkap_text(self):