From 60a18247e1a0b60acaefd135c344a70521e452d3 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 8 Dec 2025 19:09:52 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/doctype/stock_entry/stock_entry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index f5d030e754a..942a9f8133c 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -279,7 +279,8 @@ class StockEntry(StockController): { "item_code": row.item_code, "warehouse": warehouse, - "posting_datetime": get_combine_datetime(self.posting_date, self.posting_time), + "posting_date": self.posting_date, + "posting_time": self.posting_time, "voucher_type": self.doctype, "voucher_no": self.name, "voucher_detail_no": row.name,