From e5474a12a7d3b0d8c1a73d5e072078e6be745196 Mon Sep 17 00:00:00 2001 From: Azka Nathan Date: Mon, 8 Jan 2024 11:39:54 +0700 Subject: multiple-reklas --- indoteknik_custom/models/account_move.py | 1 + indoteknik_custom/models/sale_advance_payment_inv.py | 1 + indoteknik_custom/models/sale_order.py | 2 +- indoteknik_custom/models/uangmuka_penjualan.py | 3 ++- indoteknik_custom/views/account_move.xml | 7 +++++++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py index 929d2ee6..47eb90f8 100644 --- a/indoteknik_custom/models/account_move.py +++ b/indoteknik_custom/models/account_move.py @@ -35,6 +35,7 @@ class AccountMove(models.Model): ('belum_upload', 'Belum Upload FP'), ('sudah_upload', 'Sudah Upload FP'), ], 'Mark Upload Faktur', compute='_compute_mark_upload_efaktur', default='belum_upload') + sale_id = fields.Many2one('sale.order', string='Sale Order') reklas_id = fields.Many2one('account.move', string='Nomor CAB', domain="[('partner_id', '=', partner_id)]") def open_form_multi_create_reklas_penjualan(self): diff --git a/indoteknik_custom/models/sale_advance_payment_inv.py b/indoteknik_custom/models/sale_advance_payment_inv.py index dde7ed74..ebbba6b9 100644 --- a/indoteknik_custom/models/sale_advance_payment_inv.py +++ b/indoteknik_custom/models/sale_advance_payment_inv.py @@ -16,6 +16,7 @@ class SaleAdvancePaymentInv(models.TransientModel): 'invoice_user_id': order.user_id.id, 'narration': order.note, 'partner_id': parent_id, + 'sale_id': order.id, 'fiscal_position_id': (order.fiscal_position_id or order.fiscal_position_id.get_fiscal_position(order.partner_id.id)).id, 'partner_shipping_id': parent_id.id, 'currency_id': order.pricelist_id.currency_id.id, diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index cb963122..95cbf8ce 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -379,7 +379,7 @@ class SaleOrder(models.Model): def _validate_npwp(self): num_digits = sum(c.isdigit() for c in self.npwp) - if num_digits <= 10: + if num_digits < 10: raise UserError("NPWP harus memiliki minimal 10 digit") # pattern = r'^\d{10,}$' diff --git a/indoteknik_custom/models/uangmuka_penjualan.py b/indoteknik_custom/models/uangmuka_penjualan.py index 93a33b52..65f5361b 100644 --- a/indoteknik_custom/models/uangmuka_penjualan.py +++ b/indoteknik_custom/models/uangmuka_penjualan.py @@ -48,7 +48,8 @@ class UangmukaPenjualan(models.TransientModel): param_header = { 'ref': ref_label, 'date': current_time, - 'journal_id': 11 + 'journal_id': 11, + 'sale_id': order.id, } account_move = request.env['account.move'].create([param_header]) diff --git a/indoteknik_custom/views/account_move.xml b/indoteknik_custom/views/account_move.xml index 97ac5460..ddd266bb 100644 --- a/indoteknik_custom/views/account_move.xml +++ b/indoteknik_custom/views/account_move.xml @@ -17,6 +17,12 @@ + + + + + + @@ -24,6 +30,7 @@ pdf_viewer + -- cgit v1.2.3