mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-13 01:34:10 +00:00
chore: fix conflicts
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user