From abc3f828b228fd4bd51443f309a051b38ccd4e1f Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 13 May 2026 18:50:09 +0530 Subject: [PATCH] chore: fix linter issue (cherry picked from commit 3c993377aaa7fb9cf3349565553515d1d7e0b735) # Conflicts: # erpnext/stock/serial_batch_bundle.py --- erpnext/stock/serial_batch_bundle.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py index 2ac9bc7e2ad..a106315fa91 100644 --- a/erpnext/stock/serial_batch_bundle.py +++ b/erpnext/stock/serial_batch_bundle.py @@ -1082,7 +1082,11 @@ class SerialBatchCreation: ======= ======= from erpnext.stock.utils import get_combine_datetime +<<<<<<< HEAD >>>>>>> c740f77a6f (chore: fixed test case) +======= + +>>>>>>> 3c993377aa (chore: fix linter issue) 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)