nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: posting date and time

Browse Source 
(cherry picked from commit fb6c05f186)

# Conflicts:
#	erpnext/stock/serial_batch_bundle.py
This commit is contained in:
Rohit Waghchaure
2026-05-13 13:16:00 +05:30
committed by Mergify
parent 48ed07816d
commit 4cfec16f5c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/serial_batch_bundle.py
View File

@@ -13,6 +13,7 @@ from erpnext.stock.deprecated_serial_batch import (
DeprecatedBatchNoValuation, DeprecatedBatchNoValuation,
DeprecatedSerialNoValuation, DeprecatedSerialNoValuation,
) )
from erpnext.stock.utils import get_combine_datetime
from erpnext.stock.valuation import round_off_if_near_zero from erpnext.stock.valuation import round_off_if_near_zero
CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = ( CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = (
@@ -1074,9 +1075,19 @@ class SerialBatchCreation:
self.__dict__.update(item_details) self.__dict__.update(item_details)
def set_other_details(self): def set_other_details(self):
<<<<<<< HEAD
if not self.get("posting_date"): if not self.get("posting_date"):
self.posting_date = today() self.posting_date = today()
self.__dict__["posting_date"] = self.posting_date self.__dict__["posting_date"] = self.posting_date
=======
if not self.get("posting_datetime"):
if self.get("posting_date") and self.get("posting_time"):
self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time)
if not self.get("posting_datetime"):
self.posting_datetime = now()
self.__dict__["posting_datetime"] = self.posting_datetime
>>>>>>> fb6c05f186 (fix: posting date and time)
if not self.get("actual_qty"): if not self.get("actual_qty"):
qty = self.get("qty") or self.get("total_qty") qty = self.get("qty") or self.get("total_qty")