From 191674fade65d63c54807e30b569fc308688df9a Mon Sep 17 00:00:00 2001 From: "Indoteknik ." Date: Thu, 7 Aug 2025 16:22:02 +0700 Subject: (andri) rev approval --- indoteknik_custom/models/sale_order.py | 35 +++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 94cfdc39..6dc1b4a2 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -2159,7 +2159,9 @@ 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(): + raise UserError("Anda hanya dapat mengonfirmasi SO dari anggota tim Anda sendiri.") if order._requires_approval_margin_leader(): order.approval_status = 'pengajuan2' return self._create_approval_notification('Pimpinan') @@ -2490,10 +2492,37 @@ class SaleOrder(models.Model): def _requires_approval_margin_leader(self): 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 + # 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 + def _requires_approval_margin_manager(self): + margin = self.total_percent_margin + user = self.env.user + user_id = user.id + + if margin <= 15 or margin > 24: # Di luar range margin manager approval + return False + if (user.is_leader or (margin >= 17 and user.is_sales_manager) or (margin >= 18 and user_id in [11, 9, 375])): + return False + + return True # Butuh approval manager + + def _is_request_to_own_team_leader(self): + approver_id = self.env.user.id + salesperson_id = self.user_id.id + team_map = { + 11: [10406], # Eko : Firman + 9: [11314, 6609], # Ade : Boy, Mario + 375: [9928, 10], # Putra : Aro, Putri + } + + for lead_id, members in team_map.items(): + if salesperson_id in members: + return approver_id == lead_id + + return True + def _create_approval_notification(self, approval_role): title = 'Warning' message = f'SO butuh approval {approval_role}' -- cgit v1.2.3 From cad72ba8d36cff00190143a655c18765e93851fe Mon Sep 17 00:00:00 2001 From: "Indoteknik ." Date: Thu, 7 Aug 2025 16:34:25 +0700 Subject: (andri) use salesteam --- indoteknik_custom/models/sale_order.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 6dc1b4a2..a2817ea6 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -2509,17 +2509,15 @@ class SaleOrder(models.Model): return True # Butuh approval manager def _is_request_to_own_team_leader(self): - approver_id = self.env.user.id + if not self.team_id or not self.team_id.user_id: + return True + salesperson_id = self.user_id.id - team_map = { - 11: [10406], # Eko : Firman - 9: [11314, 6609], # Ade : Boy, Mario - 375: [9928, 10], # Putra : Aro, Putri - } + approver_id = self.env.user.id + team_leader_id = self.team_id.user_id.id - for lead_id, members in team_map.items(): - if salesperson_id in members: - return approver_id == lead_id + if salesperson_id != approver_id and approver_id != team_leader_id: + return False return True -- cgit v1.2.3 From 678f0a55a4e340ed8fb448a528cb738e10ed84bd Mon Sep 17 00:00:00 2001 From: "Indoteknik ." Date: Fri, 8 Aug 2025 14:37:10 +0700 Subject: (andri) fix --- indoteknik_custom/models/sale_order.py | 53 ++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index a2817ea6..5e3f8965 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -2161,7 +2161,10 @@ class SaleOrder(models.Model): # 'Terdapat invoice yang telah melewati batas waktu, mohon perbarui pada dokumen Due Extension') if not order._is_request_to_own_team_leader(): - raise UserError("Anda hanya dapat mengonfirmasi SO dari anggota tim Anda sendiri.") + 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') @@ -2171,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 = 'pengajuan1' + return self._create_approval_notification('Team Sales') raise UserError("Bisa langsung Confirm") @@ -2387,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 = 'pengajuan1' + return self._create_approval_notification('Team Sales') order.approval_status = 'approved' order._set_sppkp_npwp_contact() @@ -2492,34 +2509,34 @@ class SaleOrder(models.Model): def _requires_approval_margin_leader(self): 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 - def _requires_approval_margin_manager(self): - margin = self.total_percent_margin - user = self.env.user - user_id = user.id + 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 + ) - if margin <= 15 or margin > 24: # Di luar range margin manager approval - return False - if (user.is_leader or (margin >= 17 and user.is_sales_manager) or (margin >= 18 and user_id in [11, 9, 375])): - return False - - return True # Butuh approval manager 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 = self.env.user.id + approver_id = user.id team_leader_id = self.team_id.user_id.id - if salesperson_id != approver_id and approver_id != team_leader_id: - return False + return salesperson_id == approver_id or approver_id == team_leader_id - return True def _create_approval_notification(self, approval_role): title = 'Warning' -- cgit v1.2.3 From 9951cd96e968f0e3b934dd97838f4825e6d27c6b Mon Sep 17 00:00:00 2001 From: "Indoteknik ." Date: Fri, 8 Aug 2025 14:44:07 +0700 Subject: (andri) fix --- indoteknik_custom/models/sale_order.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 5e3f8965..5eb90d83 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -2178,7 +2178,7 @@ class SaleOrder(models.Model): self.check_product_bom() self.check_credit_limit() self.check_limit_so_to_invoice() - order.approval_status = 'pengajuan1' + order.approval_status = 'approved' return self._create_approval_notification('Team Sales') raise UserError("Bisa langsung Confirm") @@ -2408,7 +2408,7 @@ class SaleOrder(models.Model): order.approval_status = 'pengajuan1' return self._create_approval_notification('Sales Manager') elif order._requires_approval_team_sales(): - order.approval_status = 'pengajuan1' + order.approval_status = 'approved' return self._create_approval_notification('Team Sales') order.approval_status = 'approved' -- cgit v1.2.3