diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2026-01-15 07:44:32 +0000 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2026-01-15 07:44:32 +0000 |
| commit | fe5b09c1aa98723a3e0a3cf8174d6bc688c21bae (patch) | |
| tree | 217c14e2c29f0562cc7e40451b204fb2311e3a03 | |
| parent | 346127148c6d73ff27de5e3727b43a29ca8b119f (diff) | |
| parent | d2bc81ff4939c6968d4eb06567ec4114133f1140 (diff) | |
Merged in pum-v4 (pull request #478)
Pum v4
| -rw-r--r-- | indoteknik_custom/models/advance_payment_request.py | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/advance_payment_request.xml | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py index d0805598..ed0b0809 100644 --- a/indoteknik_custom/models/advance_payment_request.py +++ b/indoteknik_custom/models/advance_payment_request.py @@ -62,6 +62,7 @@ class AdvancePaymentRequest(models.Model): status_pay_down_payment = fields.Selection([ ('pending', 'Pending'), ('payment', 'Payment'), + ('cancel','Cancel') ], string='Status Pembayaran', default='pending', tracking=3) name_approval_departement = fields.Char(string='Approval Departement') @@ -853,6 +854,7 @@ class AdvancePaymentCancelWizard(models.TransientModel): raise UserError("Tidak bisa melakukan cancel karena Jurnal (Move ID) sudah terbentuk.") request.write({'status': 'cancel'}) + request.write({'status_pay_down_payment': 'cancel'}) request.message_post( body=f"Pengajuan telah <b>DIBATALKAN</b> oleh {self.env.user.name}.<br/>" diff --git a/indoteknik_custom/views/advance_payment_request.xml b/indoteknik_custom/views/advance_payment_request.xml index b1d20406..8bbe6f82 100644 --- a/indoteknik_custom/views/advance_payment_request.xml +++ b/indoteknik_custom/views/advance_payment_request.xml @@ -56,7 +56,8 @@ </header> <sheet> <widget name="web_ribbon" title="Payment" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'payment'), ('status', '=', 'draft')]}"/> - <widget name="web_ribbon" title="Pending" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/> + <widget name="web_ribbon" title="Pending" bg_color="bg-warning" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'pending'), ('status', '=', 'draft')]}"/> + <widget name="web_ribbon" title="Cancel" bg_color="bg-danger" attrs="{'invisible': ['|', ('status_pay_down_payment', '!=', 'cancel'), ('status', '=', 'draft')]}"/> <div class="oe_button_box" name="button_box" style="right: 150px;"> <field name="has_settlement" invisible="1"/> <button name="action_realisasi_pum" @@ -113,9 +114,10 @@ <field name="approved_by" readonly="1"/> <field name="create_date" readonly="1"/> <field name="status_pay_down_payment" - readonly="1" + readonly="1" decoration-success="status_pay_down_payment == 'payment'" - decoration-danger="status_pay_down_payment == 'pending'" + decoration-warning="status_pay_down_payment == 'pending'" + decoration-danger="status_pay_down_payment == 'cancel'" widget="badge" invisible = "1"/> </group> <group string="Bukti Transfer"> @@ -212,7 +214,8 @@ <field name="status_pay_down_payment" readonly="1" decoration-success="status_pay_down_payment == 'payment'" - decoration-danger="status_pay_down_payment == 'pending'" + decoration-warning="status_pay_down_payment == 'pending'" + decoration-danger="status_pay_down_payment == 'cancel'" widget="badge"/> <field name="days_remaining" readonly="1" widget="badge" optional="hide"/> <field name="estimated_return_date" widget="badge" optional="hide"/> |