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

chore: fix conflicts

Browse Source 
Removed posting_datetime and type_of_transaction from the query.
This commit is contained in:
rohitwaghchaure
2025-12-08 19:05:51 +05:30
committed by GitHub
parent cfbd71693b
commit 8074d396d0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -2655,13 +2655,8 @@ def get_ledgers_from_serial_batch_bundle(**kwargs) -> list[frappe._dict]:
serial_batch_table.incoming_rate, serial_batch_table.incoming_rate,
bundle_table.voucher_detail_no, bundle_table.voucher_detail_no,
bundle_table.voucher_no, bundle_table.voucher_no,
<<<<<<< HEAD
bundle_table.posting_date, bundle_table.posting_date,
bundle_table.posting_time, bundle_table.posting_time,
=======
bundle_table.posting_datetime,
bundle_table.type_of_transaction,
>>>>>>> 95e6c72539 (fix: inward same serial / batches in disassembly which were used)
) )
.where( .where(
(bundle_table.docstatus == 1) (bundle_table.docstatus == 1)