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

5 files changed, 63 insertions, 13 deletions

diff --git a/indoteknik_custom/models/approval_payment_term.py b/indoteknik_custom/models/approval_payment_term.py
index 6c857b45..4cf9a4c8 100644
--- a/indoteknik_custom/models/approval_payment_term.py
+++ b/indoteknik_custom/models/approval_payment_term.py
@@ -39,6 +39,7 @@ class ApprovalPaymentTerm(models.Model):
         ('rejected', 'Rejected')], 
         default='waiting_approval_sales_manager', tracking=True)
     reason_reject = fields.Selection([('reason1', 'Reason 1'), ('reason2', 'Reason 2'), ('reason3', 'Reason 3')], string='Reason Reject', tracking=True)
+    reject_reason = fields.Text('Reject Reason', tracking=True)
     sale_order_ids = fields.Many2many(
         'sale.order',
         string='Sale Orders',
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 94cfdc39..5eb90d83 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -2159,7 +2159,12 @@ class SaleOrder(models.Model):
             # if order.validate_partner_invoice_due():
             #     return self._create_notification_action('Notification',
             #                                             'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
-
+            
+            if not order._is_request_to_own_team_leader():
+                return self._create_notification_action(
+                    'Peringatan', 
+                    'Hanya bisa konfirmasi SO tim Anda.'
+                )
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
                 return self._create_approval_notification('Pimpinan')
@@ -2169,6 +2174,12 @@ class SaleOrder(models.Model):
                 self.check_limit_so_to_invoice()
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Sales Manager')
+            elif order._requires_approval_team_sales():
+                self.check_product_bom()
+                self.check_credit_limit()
+                self.check_limit_so_to_invoice()
+                order.approval_status = 'approved'
+                return self._create_approval_notification('Team Sales')
 
             raise UserError("Bisa langsung Confirm")
 
@@ -2385,12 +2396,20 @@ class SaleOrder(models.Model):
                     return self._create_notification_action('Notification',
                                                             'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension')
 
+            if not order._is_request_to_own_team_leader():
+                return self._create_notification_action(
+                    'Warning', 
+                    'Hanya bisa konfirmasi SO tim Anda.'
+                )
             if order._requires_approval_margin_leader():
                 order.approval_status = 'pengajuan2'
                 return self._create_approval_notification('Pimpinan')
             elif order._requires_approval_margin_manager():
                 order.approval_status = 'pengajuan1'
                 return self._create_approval_notification('Sales Manager')
+            elif order._requires_approval_team_sales():
+                order.approval_status = 'approved'
+                return self._create_approval_notification('Team Sales')
 
             order.approval_status = 'approved'
             order._set_sppkp_npwp_contact()
@@ -2491,8 +2510,33 @@ class SaleOrder(models.Model):
         return self.total_percent_margin <= 15 and not self.env.user.is_leader
 
     def _requires_approval_margin_manager(self):
-        return 15 < self.total_percent_margin <= 24 and not self.env.user.is_sales_manager and not self.env.user.id == 375 and not self.env.user.is_leader
-        # return self.total_percent_margin >= 15 and not self.env.user.is_leader and not self.env.user.is_sales_manager
+        return 15 < self.total_percent_margin < 18 and not self.env.user.is_sales_manager and not self.env.user.id == 375 and not self.env.user.is_leader
+    
+    def _requires_approval_team_sales(self):
+        return (
+            18 <= self.total_percent_margin <= 24
+            and self.env.user.id not in [11, 9, 375]  # Eko, Ade, Putra
+            and not self.env.user.is_sales_manager
+            and not self.env.user.is_leader
+        )
+
+
+    def _is_request_to_own_team_leader(self):
+        user = self.env.user
+
+        # Pengecualian Pak Akbar & Darren
+        if user.is_leader or user.is_sales_manager:
+            return True
+
+        if not self.team_id or not self.team_id.user_id:
+            return True
+
+        salesperson_id = self.user_id.id
+        approver_id = user.id
+        team_leader_id = self.team_id.user_id.id
+
+        return salesperson_id == approver_id or approver_id == team_leader_id
+
 
     def _create_approval_notification(self, approval_role):
         title = 'Warning'
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index f2f5f52a..46bb6cee 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1059,17 +1059,21 @@ class StockPicking(models.Model):
             return
         self.sale_id.date_doc_kirim = self.date_doc_kirim
 
+    from odoo import fields
+
     def action_assign(self):
-        res = super(StockPicking, self).action_assign()
-        for move in self:
-            # if not move.sale_id.hold_outgoing and move.location_id.id != 57 and move.location_dest_id.id != 60:
-            # TODO cant skip hold outgoing cause of not singleton method
-            current_time = datetime.datetime.utcnow()
-            move.real_shipping_id = move.sale_id.real_shipping_id
-            move.date_availability = current_time
-        # self.check_state_reserve()
+        pickings_to_assign = self.filtered(lambda p: not (p.sale_id and p.sale_id.hold_outgoing))
+
+        res = super(StockPicking, pickings_to_assign).action_assign()
+
+        current_time = datetime.datetime.utcnow()
+        for picking in pickings_to_assign:
+            picking.real_shipping_id = picking.sale_id.real_shipping_id
+            picking.date_availability = current_time
+
         return res
 
+
     def ask_approval(self):
         if self.env.user.is_accounting:
             raise UserError("Bisa langsung Validate")
diff --git a/indoteknik_custom/models/tukar_guling_po.py b/indoteknik_custom/models/tukar_guling_po.py
index cbbfb348..0badc117 100644
--- a/indoteknik_custom/models/tukar_guling_po.py
+++ b/indoteknik_custom/models/tukar_guling_po.py
@@ -497,7 +497,7 @@ class TukarGulingPO(models.Model):
 
         user = self.env.user
         if not (
-                user.has_group('indoteknik_custom.group_role_sales') or
+                user.has_group('indoteknik_custom.group_role_purchasing') or
                 user.has_group('indoteknik_custom.group_role_fat') or
                 user.has_group('indoteknik_custom.group_role_logistic')
         ):
diff --git a/indoteknik_custom/views/approval_payment_term.xml b/indoteknik_custom/views/approval_payment_term.xml
index cc9db914..f7c24737 100644
--- a/indoteknik_custom/views/approval_payment_term.xml
+++ b/indoteknik_custom/views/approval_payment_term.xml
@@ -59,7 +59,8 @@
                         </group>
                         <group>
                             <field name="reason"/>
-                            <field name="reason_reject" attrs="{'invisible': [('state', '!=', 'rejected')]}"/>
+                            <field name="reason_reject" invisible="1"/>
+                            <field name="reject_reason" attrs="{'invisible': [('state', '!=', 'rejected')]}"/>
                             <field name="approve_date" readonly="1"/>
                             <field name="approve_sales_manager" readonly="1"/>
                             <field name="approve_finance" readonly="1"/>