CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-24 05:32:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: posting_time issue (#44870)

Browse Source 
(cherry picked from commit 079b86044e)

# Conflicts:
#	erpnext/stock/deprecated_serial_batch.py
This commit is contained in:
rohitwaghchaure
2024-12-24 09:06:37 +05:30
committed by Mergify
parent f0671d45de
commit 7a5c30fe9b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/deprecated_serial_batch.py
View File

@@ -3,8 +3,12 @@ from collections import defaultdict
import frappe import frappe
from frappe.query_builder.functions import CombineDatetime, Sum from frappe.query_builder.functions import CombineDatetime, Sum
<<<<<<< HEAD
from frappe.utils import flt from frappe.utils import flt
from frappe.utils.deprecations import deprecated from frappe.utils.deprecations import deprecated
=======
from frappe.utils import flt, nowtime
>>>>>>> 079b86044e (fix: posting_time issue (#44870))
from pypika import Order from pypika import Order
@@ -112,7 +116,10 @@ class DeprecatedBatchNoValuation:
sle = frappe.qb.DocType("Stock Ledger Entry") sle = frappe.qb.DocType("Stock Ledger Entry")
timestamp_condition = None 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) posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time)
if not self.sle.creation: if not self.sle.creation:
posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1) posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1)

5
erpnext/stock/serial_batch_bundle.py
View File

@@ -643,7 +643,10 @@ 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_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( timestamp_condition = CombineDatetime(parent.posting_date, parent.posting_time) < CombineDatetime(
self.sle.posting_date, self.sle.posting_time self.sle.posting_date, self.sle.posting_time
) )