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

chore: fixed test case

Browse Source 
(cherry picked from commit c740f77a6f)

# Conflicts:
#	erpnext/stock/serial_batch_bundle.py
This commit is contained in:
rohitwaghchaure
2026-05-13 14:05:55 +05:30
committed by Mergify
parent 4cfec16f5c
commit 6f0251b3eb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/serial_batch_bundle.py
View File

@@ -13,7 +13,6 @@ 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 = (
@@ -1075,11 +1074,15 @@ class SerialBatchCreation:
self.__dict__.update(item_details) self.__dict__.update(item_details)
def set_other_details(self): def set_other_details(self):
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< 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
======= =======
=======
from erpnext.stock.utils import get_combine_datetime
>>>>>>> c740f77a6f (chore: fixed test case)
if not self.get("posting_datetime"): if not self.get("posting_datetime"):
if self.get("posting_date") and self.get("posting_time"): if self.get("posting_date") and self.get("posting_time"):
self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time)