From 6f0251b3eb91b7a508415169047a9dda8b262e21 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 13 May 2026 14:05:55 +0530 Subject: [PATCH] chore: fixed test case (cherry picked from commit c740f77a6fe7f53c89034f1b2b35c82c67310d96) # Conflicts: # erpnext/stock/serial_batch_bundle.py --- erpnext/stock/serial_batch_bundle.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index 343750261b4..2ac9bc7e2ad 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -13,7 +13,6 @@ from erpnext.stock.deprecated_serial_batch import ( DeprecatedBatchNoValuation, DeprecatedSerialNoValuation, ) -from erpnext.stock.utils import get_combine_datetime from erpnext.stock.valuation import round_off_if_near_zero CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = ( @@ -1075,11 +1074,15 @@ class SerialBatchCreation: self.__dict__.update(item_details) def set_other_details(self): +<<<<<<< HEAD <<<<<<< HEAD if not self.get("posting_date"): self.posting_date = today() 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 self.get("posting_date") and self.get("posting_time"): self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time)