push

3 files changed, 23 insertions, 5 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 62545984..d6b170d2 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -2,6 +2,7 @@ from odoo import models, api, fields, _
 from odoo.exceptions import UserError
 from datetime import datetime
 import logging
+from terbilang import Terbilang
 
 _logger = logging.getLogger(__name__)
 
@@ -151,8 +152,7 @@ class CustomerCommision(models.Model):
     notification = fields.Char(string='Notification')
     commision_lines = fields.One2many('customer.commision.line', 'customer_commision_id', string='Lines', auto_join=True)
     status = fields.Selection([
-        ('draft', 'Menunggu Approval Manager Sales'),
-        ('pengajuan1', 'Menunggu Approval Sales'),
+        ('pengajuan1', 'Menunggu Approval Manager Sales'),
         ('pengajuan2', 'Menunggu Approval Marketing'),
         ('pengajuan3', 'Menunggu Approval Pimpinan'),
         ('pengajuan4', 'Menunggu Approval Accounting'),
@@ -161,8 +161,7 @@ class CustomerCommision(models.Model):
         ('reject', 'Rejected'),
     ], string='Status', copy=False, readonly=True, tracking=3, index=True, track_visibility='onchange',default='draft')
     last_status = fields.Selection([
-        ('draft', 'Menunggu Approval Manager Sales'),
-        ('pengajuan1', 'Menunggu Approval Sales'),
+        ('pengajuan1', 'Menunggu Approval Manager Sales'),
         ('pengajuan2', 'Menunggu Approval Marketing'),
         ('pengajuan3', 'Menunggu Approval Pimpinan'),
         ('pengajuan4', 'Menunggu Approval Accounting'),
@@ -172,6 +171,7 @@ class CustomerCommision(models.Model):
     ], string='Status')
     commision_percent = fields.Float(string='Commision %', tracking=3)
     commision_amt = fields.Float(string='Commision Amount', tracking=3)
+    commision_amt_text = fields.Char(string='Commision Amount Text', compute='compute_delivery_amt_text')
     total_dpp = fields.Float(string='Total DPP', compute='_compute_total_dpp')
     commision_type = fields.Selection([
         ('fee', 'Fee'),
@@ -194,13 +194,27 @@ class CustomerCommision(models.Model):
     grouped_so_number = fields.Char(string='Group SO Number', compute='_compute_grouped_numbers')
     grouped_invoice_number = fields.Char(string='Group Invoice Number', compute='_compute_grouped_numbers')
 
+    def compute_delivery_amt_text(self):
+        tb = Terbilang()
+
+        for record in self:
+            res = ''
+            
+            try:
+                if record.commision_amt > 0:
+                    tb.parse(int(record.commision_amt))
+                    res = tb.getresult().title()
+                record.commision_amt_text = res + ' Rupiah'
+            except:
+                record.commision_amt_text = res
+
     def _compute_grouped_numbers(self):
         for rec in self:
             so_numbers = set()
             invoice_numbers = set()
             
             for line in rec.commision_lines:
-                if line.invoice_id:
+                if line.invoice_id: 
                     if line.invoice_id.sale_id:
                         so_numbers.add(line.invoice_id.sale_id.name)
                     invoice_numbers.add(line.invoice_id.name)
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index ab8109c7..fe8557c3 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1011,6 +1011,8 @@ class StockPicking(models.Model):
         if not self.env.user.is_logistic_approver and self.env.context.get('active_model') == 'stock.picking':
             if self.origin and 'Return of' in self.origin:
                 raise UserError("Button ini hanya untuk Logistik")
+            
+            
 
         res = super(StockPicking, self).action_cancel()
         return res
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 7cdf3117..1d3f48fc 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -79,8 +79,10 @@
                                 <field name="description"/>
                                 <field name="commision_percent"/>
                                 <field name="commision_amt"/>
+                                <field name="commision_amt_text"/>
                                 <field name="grouped_so_number" readonly="1"/>
                                 <field name="grouped_invoice_number" readonly="1"/>
+                                <field name="approved_by" readonly="1"/>
                             </group>
                             <group>
                                 <div>