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

chore: fix linter issue

Browse Source 
(cherry picked from commit 3c993377aa)

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

4
erpnext/stock/serial_batch_bundle.py
View File

@@ -1082,7 +1082,11 @@ class SerialBatchCreation:
======= =======
======= =======
from erpnext.stock.utils import get_combine_datetime from erpnext.stock.utils import get_combine_datetime
<<<<<<< HEAD
>>>>>>> c740f77a6f (chore: fixed test case) >>>>>>> c740f77a6f (chore: fixed test case)
=======
>>>>>>> 3c993377aa (chore: fix linter issue)
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)