Merge branch 'odoo-backup' of bitbucket.org:altafixco/indoteknik-addons into odoo-backup

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2 files changed, 8 insertions, 14 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index 8e283c45..25f45f6f 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -672,6 +672,13 @@ class PurchaseOrder(models.Model):
         for order in self:
             order.has_active_invoice = any(invoice.state != 'cancel' for invoice in order.invoice_ids)
 
+    # def _compute_has_active_invoice(self):
+    #     for order in self:
+    #         related_invoices = order.invoice_ids.filtered(
+    #             lambda inv: inv.purchase_order_id.id == order.id and inv.move_type == 'in_invoice' and inv.state != 'cancel'
+    #         )
+    #         order.has_active_invoice = bool(related_invoices)
+
     def add_product_to_pricelist(self):
         i = 0
         for line in self.order_line:
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 52947128..236df16f 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -165,26 +165,13 @@ class ResPartner(models.Model):
                                        "this feature", tracking=3)
     telegram_id = fields.Char(string="Telegram")
     avg_aging= fields.Float(string='Average Aging')
-    payment_difficulty = fields.Selection([('bermasalah', 'Bermasalah'),('sulit', 'Sulit'),('agak_sulit', 'Agak Sulit'),('normal', 'Normal')], string='Payment Difficulty', compute="_compute_payment_difficulty", inverse = "_inverse_payment_difficulty", tracking=3)
+    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
-    @api.depends('parent_id.payment_difficulty')
-    def _compute_payment_difficulty(self):
-        for partner in self:
-            if partner.parent_id:
-                partner.payment_difficulty = partner.parent_id.payment_difficulty
-
-    # tidak terpakai
-    def _inverse_payment_difficulty(self):
-        for partner in self:
-            if not partner.parent_id:
-                partner.child_ids.write({
-                    'payment_difficulty': partner.payment_difficulty
-                })
 
     @api.model
     def _default_payment_term(self):