nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-27 16:57:00 +05:30
committed by GitHub
parent 85bf9366b0
commit 2d7fde024d
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
erpnext/stock/serial_batch_bundle.py
View File

@@ -748,24 +748,6 @@ class BatchNoValuation(DeprecatedBatchNoValuation):
parent = frappe.qb.DocType("Serial and Batch Bundle") parent = frappe.qb.DocType("Serial and Batch Bundle")
child = frappe.qb.DocType("Serial and Batch Entry") child = frappe.qb.DocType("Serial and Batch Entry")
<<<<<<< HEAD
timestamp_condition = ""
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
)
if self.sle.creation:
timestamp_condition |= (
CombineDatetime(parent.posting_date, parent.posting_time)
== CombineDatetime(self.sle.posting_date, self.sle.posting_time)
) & (parent.creation < self.sle.creation)
=======
>>>>>>> 9c21567309 (fix: optimized the slow query to get the batchwise available qty)
query = ( query = (
frappe.qb.from_(parent) frappe.qb.from_(parent)
.inner_join(child) .inner_join(child)
@@ -805,13 +787,20 @@ class BatchNoValuation(DeprecatedBatchNoValuation):
child = frappe.qb.DocType("Serial and Batch Entry") child = frappe.qb.DocType("Serial and Batch Entry")
timestamp_condition = "" timestamp_condition = ""
if self.sle.posting_datetime: if self.sle.posting_date:
timestamp_condition = parent.posting_datetime < self.sle.posting_datetime 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
)
if self.sle.creation: if self.sle.creation:
timestamp_condition |= (parent.posting_datetime == self.sle.posting_datetime) & ( timestamp_condition |= (
parent.creation < self.sle.creation CombineDatetime(parent.posting_date, parent.posting_time)
) == CombineDatetime(self.sle.posting_date, self.sle.posting_time)
) & (parent.creation < self.sle.creation)
query = ( query = (
frappe.qb.from_(parent) frappe.qb.from_(parent)