(andri) hapus yang tidak dibutuhkan

3 files changed, 50 insertions, 94 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'
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 86313ea5..c01271d3 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -193,10 +193,8 @@ access_refund_sale_order_line,access.refund.sale.order.line,model_refund_sale_or
 access_advance_payment_request,access.advance.payment.request,model_advance_payment_request,,1,1,1,1
 access_reimburse_line,access.reimburse.line,model_reimburse_line,,1,1,1,1
 access_advance_payment_settlement,access.advance.payment.settlement,model_advance_payment_settlement,,1,1,1,1
-access_advance_payment_settlement_line,access.advance.payment.settlement.line,model_advance_payment_settlement_line,,1,1,1,1
 access_advance_payment_usage_line,access.advance.payment.usage.line,model_advance_payment_usage_line,,1,1,1,1
 access_advance_payment_create_bill,access.advance.payment.create.bill,model_advance_payment_create_bill,,1,1,1,1
-access_advance_payment_request_reject,access.advance.payment.request.reject,model_advance_payment_request_reject,,1,1,1,1
 access_create_reimburse_cab_wizard_user,create.reimburse.cab.wizard user,model_create_reimburse_cab_wizard,,1,1,1,1
 access_purchasing_job_seen,purchasing.job.seen,model_purchasing_job_seen,,1,1,1,1
 
diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml
index 6b14e631..ba565ce7 100644
--- a/indoteknik_custom/views/advance_payment_request.xml
+++ b/indoteknik_custom/views/advance_payment_request.xml
@@ -11,15 +11,6 @@
                         string="Realisasi"
                         class="btn-primary"
                         attrs="{'invisible': ['|', ('status', '!=', 'approved'), ('has_settlement', '=', True)]}"/>
-                    <button name="action_draft"
-                            string="Reset to Draft"
-                            attrs="{'invisible': [('status', '!=', 'reject')]}"
-                            type="object"/>                    
-                    <!-- <button name="action_reject"
-                        type="object"
-                        string="Reject"
-                        class="btn-danger"
-                        attrs="{'invisible': [('status', 'in', ['approved','reject','draft'])]}"/> -->
                     <button name="action_approval_check"
                         type="object"
                         string="Checking/Approval"
@@ -105,7 +96,6 @@
                                 decoration-success="status_pay_down_payment == 'payment'"
                                 decoration-danger="status_pay_down_payment == 'pending'"
                                 widget="badge" invisible = "1"/>
-                            <field name="reason_reject" attrs="{'invisible': [('status', '!=', 'reject')], 'readonly': True}"/>
                         </group>
                         <group string="Bukti Transfer">
                             <field name="upload_attachment_date" readonly="1"/>
@@ -248,28 +238,6 @@
         <field name="target">new</field>
     </record>
 
-    <record id="view_advance_payment_request_reject_form" model="ir.ui.view">
-        <field name="name">advance.payment.request.reject.form</field>
-        <field name="model">advance.payment.request.reject</field>
-        <field name="arch" type="xml">
-            <form string="Alasan Penolakan APR">
-                <group>
-                    <field name="reason_reject"/>
-                </group>
-                <footer>
-                    <button name="confirm_reject" type="object" string="Tolak" class="btn-danger"/>
-                    <button string="Batal" class="btn-secondary" special="cancel"/>
-                </footer>
-            </form>
-        </field>
-    </record>
-
-    <record id="action_advance_payment_request_reject" model="ir.actions.act_window">
-        <field name="name">Tolak Pengajuan APR</field>
-        <field name="res_model">advance.payment.request.reject</field>
-        <field name="view_mode">form</field>
-        <field name="target">new</field>
-    </record>
 
     <record id="view_form_create_reimburse_cab_wizard" model="ir.ui.view">
         <field name="name">create.reimburse.cab.wizard.form</field>