(andri) fix merge

1 files changed, 1 insertions, 1 deletions

diff --git a/indoteknik_custom/models/tukar_guling.py b/indoteknik_custom/models/tukar_guling.py
index d2e00781..6e839bf0 100644
--- a/indoteknik_custom/models/tukar_guling.py
+++ b/indoteknik_custom/models/tukar_guling.py
@@ -134,7 +134,7 @@ class TukarGuling(models.Model):
         if not self.val_inv_opt and self.is_has_invoice == True:
             raise UserError("Kalau sudah ada invoice Return Invoice Option harus diisi!")
         for rec in self:
-            if rec.val_inv_opt == 'cancel_invoice' and self.is_has_invoice == True:
+            if rec.val_inv_opt == 'cancel_invoice' and self.is_has_invoice == True and rec.invoice_id.state != 'cancel':
                 raise UserError("Tidak bisa mengubah Return karena sudah ada invoice dan belum di cancel.")
             elif rec.val_inv_opt == 'tanpa_cancel' and self.is_has_invoice == True:
                 continue