From 50397e798b8fb1089c27dc2ddb0ad2bc6f81965d Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 24 Dec 2024 09:06:37 +0530 Subject: [PATCH 1/2] fix: posting_time issue (#44870) --- erpnext/stock/deprecated_serial_batch.py | 8 +++++--- erpnext/stock/serial_batch_bundle.py | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index 08ac3eea91..d974e94a65 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -3,8 +3,7 @@ from collections import defaultdict import frappe from frappe.query_builder.functions import CombineDatetime, Sum -from frappe.utils import flt -from frappe.utils.deprecations import deprecated +from frappe.utils import flt, nowtime from pypika import Order @@ -110,7 +109,10 @@ class DeprecatedBatchNoValuation: sle = frappe.qb.DocType("Stock Ledger Entry") timestamp_condition = None - if self.sle.posting_date and self.sle.posting_time: + if self.sle.posting_date: + if self.sle.posting_time is None: + self.sle.posting_time = nowtime() + posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time) if not self.sle.creation: posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1) diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index f829419355..11e45c9922 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -657,7 +657,10 @@ class BatchNoValuation(DeprecatedBatchNoValuation): child = frappe.qb.DocType("Serial and Batch Entry") timestamp_condition = "" - if self.sle.posting_date and self.sle.posting_time: + if self.sle.posting_date: + if self.sle.posting_time is None: + self.sle.posting_time = nowtime() + timestamp_condition = CombineDatetime(parent.posting_date, parent.posting_time) < CombineDatetime( self.sle.posting_date, self.sle.posting_time ) -- GitLab From f16242a2c29ea2ae0cfe4810bad5252bbde9b5cb Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 27 Dec 2024 06:47:12 +0000 Subject: [PATCH 2/2] fix: missing deprecated import --- erpnext/stock/deprecated_serial_batch.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index d974e94a65..7d08639c26 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -4,6 +4,7 @@ from collections import defaultdict import frappe from frappe.query_builder.functions import CombineDatetime, Sum from frappe.utils import flt, nowtime +from frappe.utils.deprecations import deprecated from pypika import Order -- GitLab