chore: fix conflicts

This commit is contained in:
rohitwaghchaure
2025-12-08 19:09:52 +05:30
committed by GitHub
parent 7cc0436083
commit 60a18247e1

View File

@@ -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,