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

merge

1 files changed, 67 insertions, 22 deletions

diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index c22e84ab..4c3ca52e 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -62,7 +62,8 @@ class RefundSaleOrder(models.Model):
         ('uang', 'Refund Lebih Bayar'),
         ('retur_half', 'Refund Retur Sebagian'),
         ('retur', 'Refund Retur Full'),
-        ('salah_transfer', 'Salah Transfer')
+        ('salah_transfer', 'Salah Transfer'),
+        ('berita_acara', 'Kebutuhan Berita Acara')
     ], string='Refund Type', required=True)
 
     tukar_guling_ids = fields.One2many(
@@ -242,7 +243,7 @@ class RefundSaleOrder(models.Model):
                                 )
 
                 invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
                 )
                 if invoices:
                     vals['invoice_ids'] = [(6, 0, invoices.ids)]
@@ -251,7 +252,7 @@ class RefundSaleOrder(models.Model):
         invoice_ids_data = vals.get('invoice_ids', [])
         invoice_ids = invoice_ids_data[0][2] if invoice_ids_data and invoice_ids_data[0][0] == 6 else []
         invoices = self.env['account.move'].browse(invoice_ids)
-        if invoice_ids and refund_type and refund_type not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half']:
+        if invoice_ids and refund_type and refund_type not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'berita_acara']:
             raise UserError("Refund type Hanya Bisa Lebih Bayar, Barang Kosong Sebagian, atau Retur jika ada invoice")
         
         if not invoice_ids and refund_type and refund_type in ['uang', 'barang_kosong_sebagian', 'retur_half']:
@@ -296,6 +297,7 @@ class RefundSaleOrder(models.Model):
             ])
             piutangbca = self.env['account.move']
             piutangmdr = self.env['account.move']
+            cabinvoice = self.env['account.move']
 
             for inv_name in invoices.mapped('name'):
                 piutangbca |= self.env['account.move'].search([
@@ -308,6 +310,11 @@ class RefundSaleOrder(models.Model):
                     ('journal_id', '=', 7),
                     ('state', '=', 'posted'),
                 ])
+                cabinvoice |= self.env['account.move'].search([
+                    ('ref', 'ilike', inv_name),
+                    ('journal_id', '=', 11),
+                    ('state', '=', 'posted'),
+                ])
             
             misc = self.env['account.move']
             if invoices:
@@ -378,6 +385,7 @@ class RefundSaleOrder(models.Model):
             has_moves3 = bool(moves3)
             has_piutangmdr = bool(piutangmdr)
             has_piutangbca = bool(piutangbca)
+            has_cabinvoice = bool(cabinvoice)
             has_misc = bool(misc)
             has_ongkir = bool(moves_ongkir)
             ssos = self.env['sale.order'].browse(so_ids)
@@ -385,7 +393,7 @@ class RefundSaleOrder(models.Model):
     
             sisa_uang_masuk = 0.0
 
-            has_journal = has_moves or has_moves2 or has_moves3 or has_piutangbca or has_piutangmdr or has_misc
+            has_journal = has_moves or has_moves2 or has_moves3 or has_piutangbca or has_piutangmdr or has_misc or has_cabinvoice
 
             if has_moves:
                 sisa_uang_masuk += sum(moves.mapped('amount_total_signed'))
@@ -397,6 +405,8 @@ class RefundSaleOrder(models.Model):
                 sisa_uang_masuk += sum(moves3.mapped('amount_total_signed'))
             if has_piutangbca:
                 sisa_uang_masuk += sum(piutangbca.mapped('amount_total_signed'))
+            if has_cabinvoice:
+                sisa_uang_masuk += sum(cabinvoice.mapped('amount_total_signed'))
             if has_piutangmdr:
                 sisa_uang_masuk += sum(piutangmdr.mapped('amount_total_signed'))
             if has_misc:
@@ -425,13 +435,17 @@ class RefundSaleOrder(models.Model):
         total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed')) if invoice_ids else 0.0
         vals['total_invoice'] = total_invoice
         amount_refund = vals.get('amount_refund', 0.0)
-        can_refund = sisa_uang_masuk - total_invoice
-
-        if amount_refund > can_refund or can_refund == 0.0:
-            raise ValidationError(
-                _("Maksimal refund yang bisa dilakukan adalah sebesar %s. "
-                "Silakan sesuaikan jumlah refund.") % (can_refund)
-            )
+        can_refund = 0.0
+        if refund_type == 'berita_acara':
+            can_refund = sisa_uang_masuk
+        else:
+            can_refund = sisa_uang_masuk - total_invoice
+        if refund_type != 'berita_acara':
+            if amount_refund > can_refund or can_refund == 0.0:
+                raise ValidationError(
+                    _("Maksimal refund yang bisa dilakukan adalah sebesar %s. "
+                    "Silakan sesuaikan jumlah refund.") % (can_refund)
+                )
 
         if amount_refund <= 0.00:
             raise ValidationError('Total Refund harus lebih dari 0 jika ingin mengajukan refund')
@@ -483,7 +497,7 @@ class RefundSaleOrder(models.Model):
 
 
                 valid_invoices = sale_orders.mapped('invoice_ids').filtered(
-                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                    lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
                 )
                 vals['invoice_ids'] = [(6, 0, valid_invoices.ids)]
                 vals['ongkir'] = sum(so.delivery_amt or 0.0 for so in sale_orders)
@@ -526,7 +540,7 @@ class RefundSaleOrder(models.Model):
             else:
                 invoice_ids = rec.invoice_ids.ids
 
-            if invoice_ids and vals.get('refund_type', rec.refund_type) not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'retur']:
+            if invoice_ids and vals.get('refund_type', rec.refund_type) not in ['uang', 'barang_kosong_sebagian', 'barang_kosong', 'retur_half', 'retur', 'berita_acara']:
                 raise UserError("Refund type Hanya Bisa Lebih Bayar, Barang Kosong Sebagian, atau Retur jika ada invoice")
             
             if not invoice_ids and vals.get('refund_type', rec.refund_type) in ['uang', 'barang_kosong_sebagian', 'retur_half']:
@@ -539,10 +553,28 @@ class RefundSaleOrder(models.Model):
             if any(field in vals for field in ['uang_masuk', 'invoice_ids', 'ongkir', 'sale_order_ids', 'amount_refund']):
                 total_invoice = sum(self.env['account.move'].browse(invoice_ids).mapped('amount_total_signed'))
                 vals['total_invoice'] = total_invoice
-                uang_masuk = rec.uang_masuk
-                can_refund = uang_masuk - total_invoice
-
+                uang_masuk = vals.get('uang_masuk', rec.uang_masuk)
                 amount_refund = vals.get('amount_refund', rec.amount_refund)
+                can_refund = 0.0
+                total_refunded = 0.0
+
+                if refund_type == 'berita_acara':
+                    can_refund = uang_masuk
+                    remaining = uang_masuk - amount_refund
+                else:
+                    can_refund = uang_masuk - total_invoice
+
+                    existing_refunds = self.search([
+                        ('sale_order_ids', 'in', so_ids),
+                        ('id', '!=', rec.id)
+                    ])
+                    total_refunded = sum(existing_refunds.mapped('amount_refund'))
+
+                    if existing_refunds:
+                        remaining = uang_masuk - total_refunded
+                    else:
+                        remaining = uang_masuk - amount_refund
+
 
                 if amount_refund > can_refund:
                     raise ValidationError(
@@ -592,7 +624,7 @@ class RefundSaleOrder(models.Model):
         for rec in self:
             move_links = []
 
-            invoice_ids = rec.sale_order_ids.mapped('invoice_ids')
+            invoice_ids = rec.sale_order_ids.mapped('invoice_ids').filtered(lambda m: m.state == 'posted')
 
             moves = self.env['account.move'].search([
                 ('sale_id', 'in', rec.sale_order_ids.ids),
@@ -602,6 +634,7 @@ class RefundSaleOrder(models.Model):
 
             piutangbca = self.env['account.move']
             piutangmdr = self.env['account.move']
+            cabinvoice = self.env['account.move']
 
             for inv_name in invoice_ids.mapped('name'):
                 piutangbca |= self.env['account.move'].search([
@@ -614,6 +647,11 @@ class RefundSaleOrder(models.Model):
                     ('journal_id', '=', 7),
                     ('state', '=', 'posted'),
                 ])
+                cabinvoice |= self.env['account.move'].search([
+                    ('ref', 'ilike', inv_name),
+                    ('journal_id', '=', 11),
+                    ('state', '=', 'posted'),
+                ])
 
             moves2 = self.env['account.move']
             if rec.sale_order_ids:
@@ -659,15 +697,13 @@ class RefundSaleOrder(models.Model):
                         ('line_ids.account_id', '=', 450),
                         ('line_ids.account_id', '=', 668),
                 ]
-
-            if so_names:
                 domain += ['|'] * (len(so_names) - 1)
                 for name in so_names:
                     domain.append(('ref', 'ilike', name))
 
-            moves_ongkir = self.env['account.move'].search(domain)
+                moves_ongkir = self.env['account.move'].search(domain)
 
-            all_moves = moves | piutangbca | piutangmdr | misc | moves2 | moves_ongkir
+            all_moves = moves | piutangbca | piutangmdr | misc | moves2 | moves_ongkir | cabinvoice
 
             for move in all_moves:
                 url = f"/web#id={move.id}&model=account.move&view_type=form"
@@ -695,7 +731,7 @@ class RefundSaleOrder(models.Model):
         for so in self.sale_order_ids:
             self.ongkir += so.delivery_amt or 0.0
             valid_invoices = so.invoice_ids.filtered(
-                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state != 'cancel'
+                lambda inv: inv.move_type in ['out_invoice', 'out_refund'] and inv.state == 'posted'
             )
             all_invoices |= valid_invoices
             total_invoice += sum(valid_invoices.mapped('amount_total_signed'))
@@ -713,6 +749,7 @@ class RefundSaleOrder(models.Model):
 
         piutangbca = self.env['account.move']
         piutangmdr = self.env['account.move']
+        cabinvoice = self.env['account.move']
 
         for inv_name in all_invoices.mapped('name'):
             piutangbca |= self.env['account.move'].search([
@@ -725,6 +762,11 @@ class RefundSaleOrder(models.Model):
                 ('journal_id', '=', 7),
                 ('state', '=', 'posted'),
             ])
+            cabinvoice |= self.env['account.move'].search([
+                ('ref', 'ilike', inv_name),
+                ('journal_id', '=', 11),
+                ('state', '=', 'posted'),
+            ])
 
         misc = self.env['account.move']
         if all_invoices:
@@ -799,6 +841,7 @@ class RefundSaleOrder(models.Model):
         has_moves3 = bool(moves3)
         has_piutangmdr = bool(piutangmdr)
         has_piutangbca = bool(piutangbca)
+        has_cabinvoice = bool(cabinvoice)
         has_misc = bool(misc)
         has_ongkir = bool(moves_ongkir)
         ssos = self.env['sale.order'].browse(so_ids)
@@ -812,6 +855,8 @@ class RefundSaleOrder(models.Model):
            sisa_uang_masuk += sum(moves.mapped('amount_total_signed'))
         if has_moves2:
            sisa_uang_masuk += sum(moves2.mapped('amount_total_signed'))
+        if has_cabinvoice:
+           sisa_uang_masuk += sum(cabinvoice.mapped('amount_total_signed'))
         if has_moves3:
            sisa_uang_masuk += sum(moves3.mapped('amount_total_signed'))
         if has_piutangbca: