diff options
| -rw-r--r-- | indoteknik_custom/models/advance_payment_request.py | 4 | ||||
| -rw-r--r-- | indoteknik_custom/models/commission_internal.py | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py index 42097923..ec23de63 100644 --- a/indoteknik_custom/models/advance_payment_request.py +++ b/indoteknik_custom/models/advance_payment_request.py @@ -505,7 +505,7 @@ class AdvancePaymentRequest(models.Model): for rec in self: if not rec.attachment_file_image and not rec.attachment_file_pdf: raise UserError( - f'Tidak bisa konfirmasi pembayaran PUM {rec.name or ""} ' + f'Tidak bisa konfirmasi pembayaran {rec.number or ""} ' f'karena belum ada bukti attachment (PDF/Image).' ) @@ -1421,7 +1421,7 @@ class AdvancePaymentCreateBill(models.TransientModel): apr_id = fields.Many2one('advance.payment.request', string='Advance Payment Request', required=True) account_id = fields.Many2one( 'account.account', string='Bank Intransit', required=True, - domain="[('id', 'in', [573, 389, 392])]" # ID Bank Intransit + domain="[('id', 'in', [573, 389, 392, 683, 380])]" # ID Bank Intransit ) nominal = fields.Float(string='Nominal', related='apr_id.nominal') diff --git a/indoteknik_custom/models/commission_internal.py b/indoteknik_custom/models/commission_internal.py index 66d32706..cd6da380 100644 --- a/indoteknik_custom/models/commission_internal.py +++ b/indoteknik_custom/models/commission_internal.py @@ -194,8 +194,8 @@ class CommissionInternal(models.Model): list_invoice.append(key) if key[:5] == 'SO/20': list_so.append(key) - invoices = self.env['account.move'].search([('state', '=', 'posted'), ('name', 'in', list_invoice)]) - orders = self.env['sale.order'].search([('state', 'in', ['done', 'sale']), ('name', 'in', list_so)]) + invoices = self.env['account.move'].search([('name', 'in', list_invoice)]) + orders = self.env['sale.order'].search([('name', 'in', list_so)]) invoice_data = invoices.mapped(lambda r: { 'res_name': 'account.move', 'res_id': r.id, @@ -216,6 +216,7 @@ class CommissionInternal(models.Model): 'helper1': line.helper1, 'commission_internal_id': line.commission_internal_id.id, 'commission_internal_line_id': line.id, + 'helper2': r.state, }) sale_data = orders.mapped(lambda r: { 'res_name': 'sale.order', @@ -237,6 +238,7 @@ class CommissionInternal(models.Model): 'helper1': line.helper1, 'commission_internal_id': line.commission_internal_id.id, 'commission_internal_line_id': line.id, + 'helper2': r.state, }) invoices_and_sales = invoice_data + sale_data sum_amount_total = sum(item['amount_total'] for item in invoices_and_sales) @@ -266,7 +268,8 @@ class CommissionInternal(models.Model): 'nomor_uang_masuk': data['nomor_uang_masuk'], 'uang_masuk': data['uang_masuk'], 'linenetamt_prorate': net_amount_prorate, - 'helper1': data['helper1'] + 'helper1': data['helper1'], + 'helper2': data['helper2'] }]) print(1) |