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

refactor: posting datetime for SABB

Browse Source
This commit is contained in:
Rohit Waghchaure
2025-09-24 16:41:59 +05:30
parent 1f91dcb1bd
commit 99b7a9d15c
19 changed files with 195 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
erpnext/stock/serial_batch_bundle.py
View File

@@ -4,7 +4,7 @@ import frappe
from frappe import _, bold
from frappe.model.naming import make_autoname
from frappe.query_builder.functions import CombineDatetime, Sum, Timestamp
from frappe.utils import add_days, cint, cstr, flt, get_link_to_form, now, nowtime, today
from frappe.utils import add_days, cint, cstr, flt, get_link_to_form, getdate, now, nowtime, today
from pypika import Order
from pypika.terms import ExistsCriterion
@@ -100,8 +100,7 @@ class SerialBatchBundle:
{
"item_code": self.item_code,
"warehouse": self.warehouse,
"posting_date": self.sle.posting_date,
"posting_time": self.sle.posting_time,
"posting_datetime": self.sle.posting_datetime,
"voucher_type": self.sle.voucher_type,
"voucher_no": self.sle.voucher_no,
"voucher_detail_no": self.sle.voucher_detail_no,
@@ -463,7 +462,7 @@ class SerialBatchBundle:
if status == "Delivered":
warranty_period = frappe.get_cached_value("Item", sle.item_code, "warranty_period")
if warranty_period:
warranty_expiry_date = add_days(sle.posting_date, cint(warranty_period))
warranty_expiry_date = add_days(getdate(sle.posting_datetime), cint(warranty_period))
query = query.set(sn_table.warranty_expiry_date, warranty_expiry_date)
query = query.set(sn_table.warranty_period, warranty_period)
else:
@@ -488,7 +487,7 @@ class SerialBatchBundle:
sle_doctype.voucher_no,
sle_doctype.is_cancelled,
sle_doctype.item_code,
sle_doctype.posting_date,
sle_doctype.posting_datetime,
sle_doctype.company,
)
.where(
@@ -644,7 +643,7 @@ class SerialNoValuation(DeprecatedSerialNoValuation):
& (bundle.item_code == self.sle.item_code)
& (bundle_child.warehouse == self.sle.warehouse)
)
.orderby(Timestamp(bundle.posting_date, bundle.posting_time), order=Order.desc)
.orderby(bundle.posting_datetime, order=Order.desc)
.limit(1)
)
@@ -652,13 +651,8 @@ class SerialNoValuation(DeprecatedSerialNoValuation):
if self.sle.voucher_no:
query = query.where(bundle.voucher_no != self.sle.voucher_no)
if self.sle.posting_date:
if self.sle.posting_time is None:
self.sle.posting_time = nowtime()
timestamp_condition = CombineDatetime(
bundle.posting_date, bundle.posting_time
) <= CombineDatetime(self.sle.posting_date, self.sle.posting_time)
if self.sle.posting_datetime:
timestamp_condition = bundle.posting_datetime <= self.sle.posting_datetime
query = query.where(timestamp_condition)
@@ -754,19 +748,13 @@ class BatchNoValuation(DeprecatedBatchNoValuation):
child = frappe.qb.DocType("Serial and Batch Entry")
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.posting_datetime:
timestamp_condition = parent.posting_datetime < self.sle.posting_datetime
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)
timestamp_condition |= (parent.posting_datetime == self.sle.posting_datetime) & (
parent.creation < self.sle.creation
)
query = (
frappe.qb.from_(parent)
@@ -989,9 +977,9 @@ class SerialBatchCreation:
self.__dict__.update(item_details)
def set_other_details(self):
if not self.get("posting_date"):
self.posting_date = today()
self.__dict__["posting_date"] = self.posting_date
if not self.get("posting_datetime"):
self.posting_datetime = now()
self.__dict__["posting_datetime"] = self.posting_datetime
if not self.get("actual_qty"):
qty = self.get("qty") or self.get("total_qty")
@@ -1016,8 +1004,7 @@ class SerialBatchCreation:
new_package.docstatus = 0
new_package.warehouse = self.warehouse
new_package.voucher_no = ""
new_package.posting_date = self.posting_date if hasattr(self, "posting_date") else today()
new_package.posting_time = self.posting_time if hasattr(self, "posting_time") else nowtime()
new_package.posting_datetime = self.posting_datetime if hasattr(self, "posting_datetime") else now()
new_package.type_of_transaction = self.type_of_transaction
new_package.returned_against = self.get("returned_against")
@@ -1144,9 +1131,8 @@ class SerialBatchCreation:
elif self.has_serial_no and not self.get("serial_nos"):
self.serial_nos = get_serial_nos_for_outward(kwargs)
elif not self.has_serial_no and self.has_batch_no and not self.get("batches"):
if self.get("posting_date"):
kwargs["posting_date"] = self.get("posting_date")
kwargs["posting_time"] = self.get("posting_time")
if self.get("posting_datetime"):
kwargs["posting_datetime"] = self.get("posting_datetime")
self.batches = get_available_batches(kwargs)