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

2 files changed, 16 insertions, 1 deletions

diff --git a/indoteknik_custom/models/account_move_due_extension.py b/indoteknik_custom/models/account_move_due_extension.py
index d354e3e3..40059bd9 100644
--- a/indoteknik_custom/models/account_move_due_extension.py
+++ b/indoteknik_custom/models/account_move_due_extension.py
@@ -14,6 +14,16 @@ class DueExtension(models.Model):
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True, tracking=True)
     partner_id = fields.Many2one('res.partner', string="Customer", readonly=True)
     order_id = fields.Many2one('sale.order', string="SO", readonly=True)
+    amount_total = fields.Monetary(
+        string="Amount Total SO",
+        compute="_compute_amount_total",
+        readonly=True
+    )
+    currency_id = fields.Many2one(
+        'res.currency',
+        related="order_id.currency_id",
+        readonly=True
+    )
     invoice_id = fields.Many2one('account.move', related='due_line.invoice_id', string='Invoice', readonly=False)
     due_line = fields.One2many('due.extension.line', 'due_id', string='Due Extension Lines', auto_join=True)
     old_due = fields.Date(string="Old Due")
@@ -34,6 +44,11 @@ class DueExtension(models.Model):
     approve_by = fields.Many2one('res.users', string="Approve By", readonly=True)
     date_approve = fields.Datetime(string="Date Approve", readonly=True)
     
+    @api.depends('order_id')
+    def _compute_amount_total(self):
+        for rec in self:
+            rec.amount_total = rec.order_id.amount_total if rec.order_id else 0.0
+
     def _compute_counter(self):
         for due in self:
             due.counter = due.partner_id.counter
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 1dba200a..148a3fd0 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -283,7 +283,7 @@ class ResPartner(models.Model):
                     ('email', '=', record.email)
                 ], limit=1)
 
-                if existing_partner:
+                if existing_partner and not record.parent_id:
                     raise ValidationError(f"Nama '{record.name}' dengan email '{record.email}' sudah digunakan oleh partner lain!")
 
     @api.constrains('npwp')