(andri) hapus yang tidak dibutuhkan

1 files changed, 50 insertions, 60 deletions

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index 77e78850..f2c0b58e 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -55,17 +55,8 @@ class AdvancePaymentRequest(models.Model):
         ('pengajuan2', 'Menunggu Approval AP'),
         ('pengajuan3', 'Menunggu Approval Pimpinan'),
         ('approved', 'Approved'),
-        ('reject', 'Rejected')
     ], string='Status', default='draft', tracking=3, index=True, track_visibility='onchange')
 
-    last_status = fields.Selection([
-        ('draft', 'Draft'),
-        ('pengajuan1', 'Menunggu Approval Departement'),
-        ('pengajuan2', 'Menunggu Approval AP'),
-        ('pengajuan3', 'Menunggu Approval Pimpinan'),
-        ('approved', 'Approved'),
-        ('reject', 'Rejected')
-    ], string='Status')
 
     status_pay_down_payment = fields.Selection([
         ('pending', 'Pending'),
@@ -111,7 +102,6 @@ class AdvancePaymentRequest(models.Model):
     move_id = fields.Many2one('account.move', string='Journal Entries', domain=[('move_type', '=', 'entry')])
     is_cab_visible = fields.Boolean(string='Is Journal Uang Muka Visible', compute='_compute_is_cab_visible')
 
-    reason_reject = fields.Text(string='Alasan Penolakan')
 
     currency_id = fields.Many2one(
         'res.currency', string='Currency',
@@ -568,42 +558,42 @@ class AdvancePaymentRequest(models.Model):
             # rec.message_post(body=f"Approval oleh {self.env.user.name} pada tahap <b>{rec.status}</b>.")
 
 
-    def action_reject(self):
-        return {
-            'type': 'ir.actions.act_window',
-            'name': 'Alasan Penolakan',
-            'res_model': 'advance.payment.request.reject',
-            'view_mode': 'form',
-            'target': 'new',
-            'context': {'default_request_id': self.id},
-        }
+    # def action_reject(self):
+    #     return {
+    #         'type': 'ir.actions.act_window',
+    #         'name': 'Alasan Penolakan',
+    #         'res_model': 'advance.payment.request.reject',
+    #         'view_mode': 'form',
+    #         'target': 'new',
+    #         'context': {'default_request_id': self.id},
+    #     }
         
-    def action_draft(self):
-        for record in self:
-            # Pastikan hanya yang statusnya 'reject' yang bisa di-reset
-            if record.status != 'reject':
-                raise UserError("Hanya data dengan status 'Reject' yang bisa dikembalikan ke Draft atau status sebelumnya.")
-
-            # Jika ada last_status, gunakan itu; jika tidak, fallback ke 'draft'
-            new_status = 'pengajuan1'
-
-            # Reset field-field approval & alasan reject
-            record.write({
-                'status': new_status,
-                'reason_reject': False,
-                'last_status': False,
-                'name_approval_departement': False,
-                'name_approval_ap': False,
-                'name_approval_pimpinan': False,
-                'date_approved_department': False,
-                'date_approved_ap': False,
-                'date_approved_pimpinan': False,
-                'position_department': False,
-                'position_ap': False,
-                'position_pimpinan': False,
-            })
-
-            record.message_post(body=f"Status dikembalikan ke <b>{new_status.capitalize()}</b> oleh {self.env.user.name}.")
+    # def action_draft(self):
+    #     for record in self:
+    #         # Pastikan hanya yang statusnya 'reject' yang bisa di-reset
+    #         if record.status != 'reject':
+    #             raise UserError("Hanya data dengan status 'Reject' yang bisa dikembalikan ke Draft atau status sebelumnya.")
+
+    #         # Jika ada last_status, gunakan itu; jika tidak, fallback ke 'draft'
+    #         new_status = 'pengajuan1'
+
+    #         # Reset field-field approval & alasan reject
+    #         record.write({
+    #             'status': new_status,
+    #             'reason_reject': False,
+    #             'last_status': False,
+    #             'name_approval_departement': False,
+    #             'name_approval_ap': False,
+    #             'name_approval_pimpinan': False,
+    #             'date_approved_department': False,
+    #             'date_approved_ap': False,
+    #             'date_approved_pimpinan': False,
+    #             'position_department': False,
+    #             'position_ap': False,
+    #             'position_pimpinan': False,
+    #         })
+
+    #         record.message_post(body=f"Status dikembalikan ke <b>{new_status.capitalize()}</b> oleh {self.env.user.name}.")
 
 
     def action_ap_only(self):
@@ -1270,21 +1260,21 @@ class AdvancePaymentSettlement(models.Model):
         self._check_remaining_value()
         return res
 
-class AdvancePaymentRequestReject(models.TransientModel):
-    _name = 'advance.payment.request.reject'
-    _description = 'Wizard for Reject Reason APR'
-
-    request_id = fields.Many2one('advance.payment.request', string='Pengajuan PUM')
-    reason_reject = fields.Text(string='Alasan Penolakan', required=True)
-
-    def confirm_reject(self):
-        if self.request_id:
-            self.request_id.write({
-                'status': 'reject',
-                'last_status': self.request_id.status,
-                'reason_reject': self.reason_reject,
-            })
-        return {'type': 'ir.actions.act_window_close'}
+# class AdvancePaymentRequestReject(models.TransientModel):
+#     _name = 'advance.payment.request.reject'
+#     _description = 'Wizard for Reject Reason APR'
+
+#     request_id = fields.Many2one('advance.payment.request', string='Pengajuan PUM')
+#     reason_reject = fields.Text(string='Alasan Penolakan', required=True)
+
+#     def confirm_reject(self):
+#         if self.request_id:
+#             self.request_id.write({
+#                 'status': 'reject',
+#                 'last_status': self.request_id.status,
+#                 'reason_reject': self.reason_reject,
+#             })
+#         return {'type': 'ir.actions.act_window_close'}
 
 class AdvancePaymentCreateBill(models.TransientModel):
     _name = 'advance.payment.create.bill'