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

2 files changed, 2 insertions, 15 deletions

diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index f98a37be..5b9e1acb 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -970,7 +970,7 @@ class PurchaseOrder(models.Model):
         #     )
 
         if not self.from_apo:
-            if not self.matches_so and not self.env.user.is_purchasing_manager and not self.env.user.is_leader:
+            if (not self.matches_so or not self.sale_order_id) and not self.env.user.is_purchasing_manager and not self.env.user.is_leader and not self.manufacturing_id:
                 raise UserError("Tidak ada link dengan SO, harus di confirm oleh Purchasing Manager")
             
         send_email = False
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):