<iman> CR customer commision jasper

3 files changed, 106 insertions, 10 deletions

diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index 6920154a..67cc5a62 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -1,4 +1,4 @@
-from odoo import models, api, fields
+from odoo import models, api, fields, _
 from odoo.exceptions import UserError
 from datetime import datetime
 import logging
@@ -121,6 +121,21 @@ class CustomerRebate(models.Model):
             sum_dpp += invoice.price_subtotal
         return sum_dpp
 
+class RejectReasonCommision(models.TransientModel):
+    _name = 'reject.reason.commision'
+    _description = 'Wizard for Reject Reason Customer Commision'
+
+    request_id = fields.Many2one('customer.commision', string='Request')
+    reason_reject = fields.Text(string='Reason for Rejection', required=True, tracking=True)
+
+    def confirm_reject(self):
+        commision = self.request_id
+        if commision:
+            commision.last_status = commision.status
+            commision.write({'reason_reject': self.reason_reject})
+            commision.status = 'reject'
+        return {'type': 'ir.actions.act_window_close'}
+
 
 class CustomerCommision(models.Model):
     _name = 'customer.commision'
@@ -136,10 +151,23 @@ 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 Marketing'),
+        ('pengajuan2', 'Menunggu Approval Pimpinan'),
+        ('pengajuan3', 'Menunggu Approval Accounting'),
+        ('pengajuan4', 'Menunggu Approval Finnence'),
+        ('approved', 'Approved'),
+        ('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 Marketing'),
         ('pengajuan2', 'Menunggu Approval Pimpinan'),
-        ('approved', 'Approved')
-    ], string='Status', copy=False, readonly=True, tracking=3)
+        ('pengajuan3', 'Menunggu Approval Accounting'),
+        ('pengajuan4', 'Menunggu Approval Finnence'),
+        ('approved', 'Approved'),
+        ('reject', 'Rejected'),
+    ], string='Status')
     commision_percent = fields.Float(string='Commision %', tracking=3)
     commision_amt = fields.Float(string='Commision Amount', tracking=3)
     total_dpp = fields.Float(string='Total DPP', compute='_compute_total_dpp')
@@ -148,15 +176,18 @@ class CustomerCommision(models.Model):
         ('cashback', 'Cashback'),
         ('rebate', 'Rebate'),
     ], string='Commision Type', required=True)
-    bank_name = fields.Char(string='Bank', tracking=3)
-    account_name = fields.Char(string='Account Name', tracking=3)
-    bank_account = fields.Char(string='Account No', tracking=3)
+    bank_name = fields.Char(string='Bank', tracking=3, required=True)
+    account_name = fields.Char(string='Account Name', tracking=3, required=True)
+    bank_account = fields.Char(string='Account No', tracking=3, required=True)
     note_transfer = fields.Char(string='Keterangan')
     brand_ids = fields.Many2many('x_manufactures', string='Brands')
     payment_status = fields.Selection([
         ('pending', 'Pending'),
         ('payment', 'Payment'),
     ], string='Payment Status', copy=False, readonly=True, tracking=3, default='pending')
+    note_finnance = fields.Text('Notes Finnance')
+    reason_reject = fields.Char(string='Reason Reaject', tracking=True, track_visibility='onchange')
+
 
     # add status for type of commision, fee, rebate / cashback
     # include child or not?
@@ -220,11 +251,15 @@ class CustomerCommision(models.Model):
         return result
 
     def action_confirm_customer_commision(self):#add 2 step approval
-        if not self.status:
+        if not self.status or self.status == 'draft':
             self.status = 'pengajuan1'
         elif self.status == 'pengajuan1' and self.env.user.id == 19:
             self.status = 'pengajuan2'
         elif self.status == 'pengajuan2' and self.env.user.is_leader:
+            self.status = 'pengajuan3'
+        elif self.status == 'pengajuan3' and self.env.user.id == 1272:
+            self.status = 'pengajuan4'
+        elif self.status == 'pengajuan4' and self.env.user.id == 23:
             for line in self.commision_lines:
                 line.invoice_id.is_customer_commision = True
             self.status = 'approved'
@@ -232,6 +267,21 @@ class CustomerCommision(models.Model):
             raise UserError('Harus di approved oleh yang bersangkutan')
         return
 
+    def action_reject(self):#add 2 step approval
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Reject Reason'),
+            'res_model': 'reject.reason.commision',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {'default_request_id': self.id},
+        }
+
+    def button_draft(self):
+        for commision in self:
+            commision.status = commision.last_status if commision.last_status else 'draft'
+
+
     def action_confirm_customer_payment(self):
         if self.status != 'approved':
             raise UserError('Commision harus di approve terlebih dahulu sebelum di konfirmasi pembayarannya')
@@ -337,6 +387,7 @@ class CustomerCommisionLine(models.Model):
     total = fields.Float(string='Total')
     total_percent_margin = fields.Float('Total Margin', related='invoice_id.sale_id.total_percent_margin')
     product_id = fields.Many2one('product.product', string='Product')
+    sale_order_id = fields.Many2one('sale.order', string='Sale Order', related='invoice_id.sale_id')
 
 class AccountMove(models.Model):
     _inherit = 'account.move'
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 75b3bf48..bedb032a 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -165,3 +165,4 @@ access_barcoding_product_line,access.barcoding.product.line,model_barcoding_prod
 access_account_payment_register,access.account.payment.register,model_account_payment_register,,1,1,1,1
 access_stock_inventory,access.stock.inventory,model_stock_inventory,,1,1,1,1
 access_cancel_reason_order,cancel.reason.order,model_cancel_reason_order,,1,1,1,0
+access_reject_reason_commision,reject.reason.commision,model_reject_reason_commision,,1,1,1,0
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 51172b1c..dddefed4 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -11,7 +11,7 @@
                 <field name="partner_ids" widget="many2many_tags"/>
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
-                <field name="status" readonly="1"/>
+                <field name="status" readonly="1" decoration-success="status == 'approved'" widget="badge" optional="show"/>
                 <field name="payment_status" readonly="1"
                     decoration-success="payment_status == 'payment'"
                     decoration-danger="payment_status == 'pending'"
@@ -28,6 +28,7 @@
             <tree editable="top" create="false">
                 <field name="partner_id" readonly="1"/>
                 <field name="invoice_id" readonly="1"/>
+                <field name="sale_order_id" readonly="1"/>
                 <field name="state" readonly="1"/>
                 <field name="product_id" readonly="1" optional="hide"/>
                 <field name="dpp" readonly="1"/>
@@ -43,14 +44,28 @@
         <field name="model">customer.commision</field>
         <field name="arch" type="xml">
             <form>
+<!--                    attrs="{'invisible': [('status', 'in', ['draft','pengajuan1','pengajuan2','pengajuan3','pengajuan4'])]}"-->
                 <header>
-                    <button name="action_confirm_customer_commision" 
+                    <button name="action_confirm_customer_commision"
                     string="Confirm" type="object"
+                    attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
                     options="{}"/>
+                    <button name="action_reject"
+                        string="Reject"
+                        attrs="{'invisible': [('status', 'in', ['approved','reject'])]}"
+                        type="object"
+                        class="oe_highlight"/>
+                <button name="button_draft"
+                        string="Reset to Draft"
+                        attrs="{'invisible': [('status', '!=', 'reject')]}"
+                        type="object"/>
                     <button name="action_confirm_customer_payment"
                         string="Konfirmasi Pembayaran" type="object"
                         options="{}"
                         attrs="{'invisible': [('payment_status', '==', 'payment')], 'readonly': [('payment_status', '=', 'payment')]}"/>
+                    <field name="status" widget="statusbar"
+                       statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,pengajuan4,approved"
+                    statusbar_colors='{"reject":"red"}'/>
                 </header>
                 <sheet string="Customer Commision">
                         <div class="oe_button_box" name="button_box"/>
@@ -75,7 +90,7 @@
                                 <field name="commision_type"/>
                                 <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
-                                <field name="status" readonly="1"/>
+<!--                                <field name="status" readonly="1"/>-->
                                 <field name="payment_status" readonly="1" />
                                 <field name="total_dpp"/>
                             </group>
@@ -92,6 +107,11 @@
                                     <field name="note_transfer"/>
                                 </group>
                             </page>
+                            <page string="Finance Notes">
+                                <group>
+                                    <field name="note_finnance"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
@@ -102,6 +122,30 @@
         </field>
     </record>
 
+        <!-- Wizard for Reject Reason -->
+    <record id="view_reject_reason_wizard_form" model="ir.ui.view">
+        <field name="name">reject.reason.commision.form</field>
+        <field name="model">reject.reason.commision</field>
+        <field name="arch" type="xml">
+            <form string="Reject Reason">
+                <group>
+                    <field name="reason_reject" widget="text"/>
+                </group>
+                <footer>
+                    <button string="Confirm" type="object" name="confirm_reject" class="btn-primary"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_reject_reason_wizard" model="ir.actions.act_window">
+        <field name="name">Reject Reason</field>
+        <field name="res_model">reject.reason.commision</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
     <record id="view_customer_commision_filter" model="ir.ui.view">
         <field name="name">customer.commision.list.select</field>
         <field name="model">customer.commision</field>