From f505e2b3aec7ad467fc9e7ecb29a6c37a1f6e10c Mon Sep 17 00:00:00 2001 From: FIN-IT_AndriFP Date: Tue, 14 Oct 2025 19:06:08 +0700 Subject: q ' --- .../models/advance_payment_request.py | 50 +++++++++++----------- .../views/advance_payment_settlement.xml | 6 +-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py index 5c6d59c4..77e78850 100644 --- a/indoteknik_custom/models/advance_payment_request.py +++ b/indoteknik_custom/models/advance_payment_request.py @@ -441,13 +441,13 @@ class AdvancePaymentRequest(models.Model): 'default_pum_id': self.id, 'default_value_down_payment': self.nominal, 'default_name': f'Realisasi - {self.number or ""}', - 'default_pemberian_line_ids': [ - (0, 0, { - 'date': self.create_date.date() if self.create_date else fields.Date.today(), - 'description': 'Uang Muka', - 'value': self.nominal - }) - ] + # 'default_pemberian_line_ids': [ + # (0, 0, { + # 'date': self.create_date.date() if self.create_date else fields.Date.today(), + # 'description': 'Uang Muka', + # 'value': self.nominal + # }) + # ] } } @@ -741,14 +741,14 @@ class AdvancePaymentRequest(models.Model): return super(AdvancePaymentRequest, self).create(vals) -class AdvancePaymentSettlementLine(models.Model): - _name = 'advance.payment.settlement.line' - _description = 'Advance Payment Settlement Line' +# class AdvancePaymentSettlementLine(models.Model): +# _name = 'advance.payment.settlement.line' +# _description = 'Advance Payment Settlement Line' - realization_id = fields.Many2one('advance.payment.settlement', string='Realization') - date = fields.Date(string='Tanggal', default=fields.Date.today) - description = fields.Char(string='Description') - value = fields.Float(string='Nilai') +# realization_id = fields.Many2one('advance.payment.settlement', string='Realization') +# date = fields.Date(string='Tanggal', default=fields.Date.today) +# description = fields.Char(string='Description') +# value = fields.Float(string='Nilai') class AdvancePaymentUsageLine(models.Model): @@ -896,7 +896,7 @@ class ReimburseLine(models.Model): elif self.vehicle_type == 'motor': biaya_per_km = 500 # Rp 10.000 / 20 km self.price = self.distance * biaya_per_km - # self.quantity = 1 + self.quantity = self.distance else: self.price = 0 @@ -912,14 +912,14 @@ class AdvancePaymentSettlement(models.Model): goals = fields.Text(string='Tujuan', tracking=3) related = fields.Char(string='Terkait', tracking=3) - pemberian_line_ids = fields.One2many( - 'advance.payment.settlement.line', 'realization_id', string='Rincian Pemberian' - ) + # pemberian_line_ids = fields.One2many( + # 'advance.payment.settlement.line', 'realization_id', string='Rincian Pemberian' + # ) penggunaan_line_ids = fields.One2many( 'advance.payment.usage.line', 'realization_id', string='Rincian Penggunaan' ) - grand_total = fields.Float(string='Grand Total Pemberian', tracking=3, compute='_compute_grand_total') + # grand_total = fields.Float(string='Grand Total Pemberian', tracking=3, compute='_compute_grand_total') grand_total_use = fields.Float(string='Grand Total Penggunaan', tracking=3, compute='_compute_grand_total_use') value_down_payment = fields.Float(string='PUM', tracking=3) remaining_value = fields.Float(string='Sisa Uang PUM', tracking=3, compute='_compute_remaining_value') @@ -1050,20 +1050,18 @@ class AdvancePaymentSettlement(models.Model): self.attachment_file_pdf = False self.attachment_filename_pdf = False - @api.depends('pemberian_line_ids.value') - def _compute_grand_total(self): - for rec in self: - rec.grand_total = sum(line.value for line in rec.pemberian_line_ids) + # @api.depends('pemberian_line_ids.value') + # def _compute_grand_total(self): + # for rec in self: + # rec.grand_total = sum(line.value for line in rec.pemberian_line_ids) @api.depends('penggunaan_line_ids.nominal') def _compute_grand_total_use(self): for rec in self: rec.grand_total_use = sum(line.nominal for line in rec.penggunaan_line_ids) - @api.depends('grand_total', 'grand_total_use') def _compute_remaining_value(self): - for rec in self: - rec.remaining_value = rec.value_down_payment - rec.grand_total_use + return def action_validation(self): self.ensure_one() diff --git a/indoteknik_custom/views/advance_payment_settlement.xml b/indoteknik_custom/views/advance_payment_settlement.xml index d928b701..008cbc0d 100644 --- a/indoteknik_custom/views/advance_payment_settlement.xml +++ b/indoteknik_custom/views/advance_payment_settlement.xml @@ -80,7 +80,7 @@ - + @@ -153,7 +153,7 @@ - + -- cgit v1.2.3