<hafid> hold refund

2 files changed, 5 insertions, 5 deletions

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index 11bfd07f..2a55f16d 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -175,7 +175,7 @@ class RefundSaleOrder(models.Model):
             if refund_type == 'retur_half' and not invoice_ids:
                 raise ValidationError(f"SO {', '.join(so.mapped('name'))} belum memiliki invoice untuk Retur Sebagian.")
 
-        total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total')) if invoice_ids else 0.0
+        total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed')) if invoice_ids else 0.0
         uang_masuk = vals.get('uang_masuk', 0.0)
         ongkir = vals.get('ongkir', 0.0)
         pengurangan = total_invoice + ongkir
@@ -266,7 +266,7 @@ class RefundSaleOrder(models.Model):
                     raise ValidationError(f"SO {', '.join(so.mapped('name'))} belum memiliki invoice untuk retur sebagian.")
 
             if any(field in vals for field in ['uang_masuk', 'invoice_ids', 'ongkir', 'sale_order_ids']):
-                total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total'))
+                total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed'))
                 uang_masuk = vals.get('uang_masuk', rec.uang_masuk)
                 ongkir = vals.get('ongkir', rec.ongkir)
 
@@ -325,7 +325,7 @@ class RefundSaleOrder(models.Model):
                 lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
             )
             all_invoices |= valid_invoices
-            total_invoice += sum(valid_invoices.mapped('amount_total'))
+            total_invoice += sum(valid_invoices.mapped('amount_total_signed'))
 
             
         self.invoice_ids = all_invoices
@@ -464,7 +464,7 @@ class RefundSaleOrder(models.Model):
             if self.refund_type not in ['uang', 'barang_kosong']:
                 self.refund_type = False
 
-        self.total_invoice = sum(self.invoice_ids.mapped('amount_total'))
+        self.total_invoice = sum(self.invoice_ids.mapped('amount_total_signed'))
 
     def action_ask_approval(self):
         for rec in self:
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index febdaabd..c4de0d3a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -3144,7 +3144,7 @@ class SaleOrder(models.Model):
 
         invoice_ids = self.mapped('invoice_ids').filtered(lambda inv: inv.state != 'cancel')
         delivery_total = sum(self.mapped('delivery_amt'))
-        total_invoice = sum(invoice_ids.mapped('amount_total'))
+        total_invoice = sum(invoice_ids.mapped('amount_total_signed'))
 
         return {
             'type': 'ir.actions.act_window',