diff options
| author | Indoteknik . <it@fixcomart.co.id> | 2025-08-18 13:39:21 +0700 |
|---|---|---|
| committer | Indoteknik . <it@fixcomart.co.id> | 2025-08-18 13:39:21 +0700 |
| commit | 56521e04d3ea44d9f0115ef327b48e2c97f92fcc (patch) | |
| tree | c58696bc9c2ea72493d32623fbcbc2c6a1b38944 | |
| parent | 82920977dbae0534980c965360849702958d51e4 (diff) | |
(andri) fix
| -rw-r--r-- | indoteknik_custom/models/down_payment.py | 8 | ||||
| -rw-r--r-- | indoteknik_custom/views/down_payment.xml | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/down_payment_realization.xml | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/indoteknik_custom/models/down_payment.py b/indoteknik_custom/models/down_payment.py index 9c200cca..1152fcbf 100644 --- a/indoteknik_custom/models/down_payment.py +++ b/indoteknik_custom/models/down_payment.py @@ -745,9 +745,9 @@ class RealizationDownPayment(models.Model): is_cab_visible = fields.Boolean(string='Is Journal Uang Muka Visible', compute='_compute_is_cab_visible') def action_toggle_check_attachment(self): - # ap_user_ids = [23, 9468] - # if self.env.user.id not in ap_user_ids: - # raise UserError('Hanya User AP yang dapat menggunakan tombol ini.') + ap_user_ids = [23, 9468] + if self.env.user.id not in ap_user_ids: + raise UserError('Hanya User AP yang dapat menggunakan tombol ini.') for rec in self: if not rec.penggunaan_line_ids: @@ -862,7 +862,7 @@ class RealizationDownPayment(models.Model): account_uang_muka = 403 # Tanggal pakai create_date atau hari ini - account_date = self.date_done_not_realized + account_date = self.date_done_not_realized or fields.Date.today() ref_label = f"Realisasi {self.pum_id.number} Biaya {self.pum_id.detail_note} ({cab_move.name})" diff --git a/indoteknik_custom/views/down_payment.xml b/indoteknik_custom/views/down_payment.xml index 8fd8fc76..020ed110 100644 --- a/indoteknik_custom/views/down_payment.xml +++ b/indoteknik_custom/views/down_payment.xml @@ -34,7 +34,7 @@ type="object" string="AP Only" class="btn-info" - attrs="{'invisible': [('status', '=', 'reject')]}"/> + attrs="{'invisible': ['|', ('status', '=', 'reject'), ('is_cab_visible', '=', True)]}"/> <field name="status" widget="statusbar" statusbar_visible="draft,pengajuan1,pengajuan2,pengajuan3,approved" statusbar_colors='{"reject":"red"}' diff --git a/indoteknik_custom/views/down_payment_realization.xml b/indoteknik_custom/views/down_payment_realization.xml index b24727e6..292d8683 100644 --- a/indoteknik_custom/views/down_payment_realization.xml +++ b/indoteknik_custom/views/down_payment_realization.xml @@ -8,14 +8,18 @@ <button name="action_validation" type="object" string="Validasi" - class="btn-primary"/> - <button name="action_approval_check" - type="object" - string="Checking/Approval" - attrs="{}"/> + class="btn-info" + attrs="{'invisible': [('done_status', '=', 'done_realized')]}"/> <button name="action_cab" type="object" + class="btn-info" + attrs="{'invisible': [('is_cab_visible', '=', True)]}" string="AP Only"/> + <button name="action_approval_check" + type="object" + string="Checking/Approval" + class="btn-success" + attrs="{'invisible': [('status', '=', 'approved')]}"/> <field name="status" widget="statusbar" statusbar_visible="pengajuan1,pengajuan2,pengajuan3,approved" statusbar_colors='{"reject":"red"}' @@ -47,13 +51,13 @@ <field name="title" required="1"/> <field name="goals" required="1"/> <field name="related" required="1"/> + <field name="note_approval" required="1"/> + <field name="lot_of_attachment"/> <field name="approved_by" readonly="1"/> <field name="done_status" decoration-success="done_status == 'done_realized'" decoration-danger="done_status == 'remaining'" widget="badge" readonly="1"/> - <field name="note_approval" required="1"/> - <field name="lot_of_attachment"/> </group> <group attrs="{'invisible': [('lot_of_attachment', '!=', 'one_for_all_line')]}"> <field name="attachment_type" attrs="{'readonly': [('status', '=', 'approved')]}"/> |