Merge branch 'odoo-production' into feature/integrasi_biteship

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 12 insertions, 2 deletions

diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index 42678847..d62f19ae 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -62,6 +62,11 @@ class AccountMove(models.Model):
     so_delivery_amt = fields.Char(string="SO Delivery Amount", compute='compute_so_shipping_paid_by')
     flag_delivery_amt = fields.Boolean(string="Flag Delivery Amount", compute='compute_flag_delivery_amt')
     nomor_kwitansi = fields.Char(string="Nomor Kwitansi")
+    other_subtotal = fields.Float(string="Other Subtotal", compute='compute_other_subtotal')
+
+    def compute_other_subtotal(self):
+        for rec in self:
+            rec.other_subtotal = rec.amount_untaxed * (11 / 12)
 
     @api.model
     def generate_attachment(self, record):
@@ -253,6 +258,11 @@ class AccountMove(models.Model):
                 line.date_maturity = entry.date
 
         return res
+    def button_draft(self):
+        res = super(AccountMove, self).button_draft()
+        if not self.env.user.is_accounting:
+            raise UserError("Hanya Finence yang bisa ubah data")
+        return res
     
     def _compute_invoice_day_to_due(self):
         for invoice in self:
@@ -334,7 +344,7 @@ class AccountMove(models.Model):
         invalid_invoices = self - invoices
         if invalid_invoices:
             invalid_ids = ", ".join(str(inv.id) for inv in invalid_invoices)
-            raise UserError(_(
+            raise UserError((
                 "Faktur dengan ID berikut tidak valid untuk diekspor: {}.\n"
                 "Pastikan faktur dalam status 'posted', belum diekspor, dan merupakan 'out_invoice'.".format(invalid_ids)
             ))
@@ -343,7 +353,7 @@ class AccountMove(models.Model):
     
     def export_faktur_to_xml(self):
         
-        valid_invoices = self.validate_faktur_for_export()
+        valid_invoices = self
         
         # Panggil model coretax.faktur untuk menghasilkan XML
         coretax_faktur = self.env['coretax.faktur'].create({})