From 7a5c30fe9b5e3833ffeba46cead6ba42a69c0add 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) (cherry picked from commit 079b86044efce7bf04c94900cdde6b1119c53fb2) # Conflicts: # erpnext/stock/deprecated_serial_batch.py --- erpnext/stock/deprecated_serial_batch.py | 9 ++++++++- erpnext/stock/serial_batch_bundle.py | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index d10833b6d46..b2c3e75b5a0 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -3,8 +3,12 @@ from collections import defaultdict import frappe from frappe.query_builder.functions import CombineDatetime, Sum +<<<<<<< HEAD from frappe.utils import flt from frappe.utils.deprecations import deprecated +======= +from frappe.utils import flt, nowtime +>>>>>>> 079b86044e (fix: posting_time issue (#44870)) from pypika import Order @@ -112,7 +116,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 732a14c2fb5..c450bf1a086 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -643,7 +643,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 ) From 90aadcdcbc04734b3b47de70d263e541b874f4e2 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 24 Dec 2024 10:16:53 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/stock/deprecated_serial_batch.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py index b2c3e75b5a0..b3f4c2dead4 100644 --- a/erpnext/stock/deprecated_serial_batch.py +++ b/erpnext/stock/deprecated_serial_batch.py @@ -3,12 +3,8 @@ from collections import defaultdict import frappe from frappe.query_builder.functions import CombineDatetime, Sum -<<<<<<< HEAD -from frappe.utils import flt -from frappe.utils.deprecations import deprecated -======= from frappe.utils import flt, nowtime ->>>>>>> 079b86044e (fix: posting_time issue (#44870)) +from frappe.utils.deprecations import deprecated from pypika import Order