From fca5c08671169703d935161fc4bb0c5c05548a62 Mon Sep 17 00:00:00 2001 From: Miqdad Date: Tue, 23 Sep 2025 08:32:19 +0700 Subject: fix validation error when creating SO in midnight --- indoteknik_custom/models/sale_order.py | 88 +++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 22 deletions(-) diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 39830ffc..02ceb62b 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -1700,57 +1700,101 @@ class SaleOrder(models.Model): # .format(eta_minimum.strftime('%d-%m-%Y'), eta_minimum.strftime('%d-%m-%Y')) # ) + # def _validate_expected_ready_ship_date(self): + # """ + # Pastikan expected_ready_to_ship tidak lebih awal dari SLA minimum. + # Dipanggil setiap onchange / simpan SO. + # """ + # for rec in self: + # # ───────────────────────────────────────────────────── + # # 1. Hanya validasi kalau field sudah terisi + # # (quotation baru / belum ada tanggal → abaikan) + # # ───────────────────────────────────────────────────── + # if not rec.expected_ready_to_ship: + # continue + # + # current_date = datetime.now() + # + # # ───────────────────────────────────────────────────── + # # 2. Hitung SLA berdasarkan product lines (jika ada) + # # ───────────────────────────────────────────────────── + # products = rec.order_line + # if products: + # sla_data = rec.calculate_sla_by_vendor(products) + # max_sla_time = sla_data.get('slatime', 1) + # else: + # # belum ada item → gunakan default 1 hari + # max_sla_time = 1 + # + # # offset hari libur / weekend + # offset, is3pm = rec.get_days_until_next_business_day(current_date) + # min_days = max_sla_time + offset - 1 + # eta_minimum = current_date + timedelta(days=min_days) + # + # # ───────────────────────────────────────────────────── + # # 3. Validasi - raise error bila terlalu cepat + # # ───────────────────────────────────────────────────── + # if rec.expected_ready_to_ship.date() < eta_minimum.date(): + # # set otomatis ke tanggal minimum supaya user tidak perlu + # # menekan Save dua kali + # rec.expected_ready_to_ship = eta_minimum + # + # raise ValidationError( + # _("Tanggal 'Expected Ready to Ship' tidak boleh " + # "lebih kecil dari %(tgl)s. Mohon pilih minimal %(tgl)s.") + # % {'tgl': eta_minimum.strftime('%d-%m-%Y')} + # ) + # else: + # # sinkronkan ke field commitment_date + # rec.commitment_date = rec.expected_ready_to_ship + def _validate_expected_ready_ship_date(self): """ Pastikan expected_ready_to_ship tidak lebih awal dari SLA minimum. Dipanggil setiap onchange / simpan SO. """ for rec in self: - # ───────────────────────────────────────────────────── - # 1. Hanya validasi kalau field sudah terisi - # (quotation baru / belum ada tanggal → abaikan) - # ───────────────────────────────────────────────────── if not rec.expected_ready_to_ship: continue - current_date = datetime.now() + # ADDED: gunakan "sekarang" lokal user, bukan datetime.now() server + current_date = fields.Datetime.context_timestamp(rec, fields.Datetime.now()) - # ───────────────────────────────────────────────────── - # 2. Hitung SLA berdasarkan product lines (jika ada) - # ───────────────────────────────────────────────────── + # Hitung SLA products = rec.order_line if products: sla_data = rec.calculate_sla_by_vendor(products) max_sla_time = sla_data.get('slatime', 1) else: - # belum ada item → gunakan default 1 hari max_sla_time = 1 - # offset hari libur / weekend + # offset hari libur/weekend offset, is3pm = rec.get_days_until_next_business_day(current_date) min_days = max_sla_time + offset - 1 eta_minimum = current_date + timedelta(days=min_days) - # ───────────────────────────────────────────────────── - # 3. Validasi - raise error bila terlalu cepat - # ───────────────────────────────────────────────────── - if rec.expected_ready_to_ship.date() < eta_minimum.date(): - # set otomatis ke tanggal minimum supaya user tidak perlu - # menekan Save dua kali - rec.expected_ready_to_ship = eta_minimum + if rec._fields['expected_ready_to_ship'].type == 'date': + exp_date_local = rec.expected_ready_to_ship + else: + exp_date_local = fields.Datetime.context_timestamp( + rec, rec.expected_ready_to_ship + ).date() + + if exp_date_local < eta_minimum.date(): + # (opsional) auto-set ke minimum → konversi balik ke UTC naive bila field Datetime + if rec._fields['expected_ready_to_ship'].type == 'date': + rec.expected_ready_to_ship = eta_minimum.date() + else: + rec.expected_ready_to_ship = eta_minimum.astimezone(pytz.UTC).replace(tzinfo=None) raise ValidationError( _("Tanggal 'Expected Ready to Ship' tidak boleh " - "lebih kecil dari %(tgl)s. Mohon pilih minimal %(tgl)s.") + "lebih kecil dari %(tgl)s. Mohon pilih minimal %(tgl)s.") % {'tgl': eta_minimum.strftime('%d-%m-%Y')} ) else: - # sinkronkan ke field commitment_date rec.commitment_date = rec.expected_ready_to_ship - - - @api.onchange('expected_ready_to_ship') #Hangle Onchange form Expected Ready to Ship def _onchange_expected_ready_ship_date(self): self._validate_expected_ready_ship_date() -- cgit v1.2.3 From 6d50b35724592c4f8c302204adcfbc0f5db3727f Mon Sep 17 00:00:00 2001 From: HafidBuroiroh Date: Tue, 23 Sep 2025 11:30:45 +0700 Subject: pull odoo backup --- indoteknik_custom/models/refund_sale_order.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py index b8350829..d89954cc 100644 --- a/indoteknik_custom/models/refund_sale_order.py +++ b/indoteknik_custom/models/refund_sale_order.py @@ -859,19 +859,19 @@ class RefundSaleOrder(models.Model): if not rec.status or rec.status == 'draft': rec.status = 'pengajuan1' - elif rec.status == 'pengajuan1' and self.env.user.id == 19: + elif rec.status == 'pengajuan1': rec.status = 'pengajuan2' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_sales = now rec.position_sales = 'Sales Manager' - elif rec.status == 'pengajuan2' and self.env.user.id == 688: + elif rec.status == 'pengajuan2': rec.status = 'pengajuan3' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_ar = now rec.position_ar = 'AR' - elif rec.status == 'pengajuan3' and self.env.user.id == 7: + elif rec.status == 'pengajuan3': rec.status = 'refund' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_pimpinan = now @@ -902,6 +902,14 @@ class RefundSaleOrder(models.Model): for rec in self: if not is_fat: raise UserError("Hanya Finance yang dapat mengkonfirmasi pembayaran refund.") + is_journal = self.env['account.move'].search([ + ('refund_id', '=', rec.id), + ('state', '=', 'posted') + ]) + if not is_journal: + raise UserError("Journal Payment Refund belum dibuat, buat Journal Payment Refund sebelum confirm refund.") + if is_journal and rec.amount_refund != sum(is_journal.mapped('amount_total_signed')): + raise UserError("Total Refund dengan Total Journal Harus Sama.") if rec.status_payment == 'pending': rec.status_payment = 'done' rec.refund_date = fields.Date.context_today(self) -- cgit v1.2.3 From 5abefd1181a148c4caf9b5dd2082ee3b3e884751 Mon Sep 17 00:00:00 2001 From: HafidBuroiroh Date: Tue, 23 Sep 2025 15:49:18 +0700 Subject: validate confirm journal refund --- indoteknik_custom/models/refund_sale_order.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py index d4702210..eab25452 100644 --- a/indoteknik_custom/models/refund_sale_order.py +++ b/indoteknik_custom/models/refund_sale_order.py @@ -859,19 +859,19 @@ class RefundSaleOrder(models.Model): if not rec.status or rec.status == 'draft': rec.status = 'pengajuan1' - elif rec.status == 'pengajuan1': + elif rec.status == 'pengajuan1' and self.env.user.id == 19: rec.status = 'pengajuan2' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_sales = now rec.position_sales = 'Sales Manager' - elif rec.status == 'pengajuan2': + elif rec.status == 'pengajuan2' and self.env.user.id == 688: rec.status = 'pengajuan3' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_ar = now rec.position_ar = 'AR' - elif rec.status == 'pengajuan3': + elif rec.status == 'pengajuan3' and self.env.user.id == 7: rec.status = 'refund' rec.approved_by = f"{rec.approved_by}, {user_name}" if rec.approved_by else user_name rec.date_approved_pimpinan = now -- cgit v1.2.3