Rohit Waghchaure
|
a96fa55704
|
perf: process_gl_map causing performance issues in the reposting
|
2025-08-02 18:44:32 +05:30 |
|
Mihir Kandoi
|
d862a742b0
|
fix: include Sales Invoice in SABB validation for packed items
(cherry picked from commit 2ce297aff8)
|
2025-08-01 11:50:21 +00:00 |
|
mergify[bot]
|
7bb127de63
|
Merge pull request #48876 from frappe/mergify/bp/version-15-hotfix/pr-48873
fix: return conversion factor of variant and not template (backport #48873)
|
2025-07-31 07:03:15 +00:00 |
|
rohitwaghchaure
|
5c34299b1e
|
Merge pull request #48843 from frappe/mergify/bp/version-15-hotfix/pr-48743
fix(pick list): make warehouse editable (backport #48743)
|
2025-07-29 18:42:43 +05:30 |
|
ravibharathi656
|
6a5041042e
|
fix(pick list): make warehouse editable
(cherry picked from commit f5beda48dc)
|
2025-07-29 12:55:17 +00:00 |
|
Rohit Waghchaure
|
b82aea4a87
|
fix: serial no warehouse for backdated stock reco
(cherry picked from commit 1deedc766c)
|
2025-07-29 12:46:52 +00:00 |
|
ravibharathi656
|
d4fae00b80
|
fix: set letter head from company if exists
(cherry picked from commit d163da171f)
|
2025-07-29 08:23:11 +00:00 |
|
Mihir Kandoi
|
1efdff0ad1
|
fix: over billed purchase receipt status
(cherry picked from commit 15e354f76e)
|
2025-07-29 06:02:50 +00:00 |
|
Mihir Kandoi
|
92e315c4e1
|
Merge pull request #48811 from frappe/mergify/bp/version-15-hotfix/pr-48804
fix: sql error in quality inspection (backport #48804)
|
2025-07-29 11:18:46 +05:30 |
|
ravibharathi656
|
ee8eb368e7
|
fix: fetch payment term template from order
(cherry picked from commit 5ed34d6ff9)
|
2025-07-28 14:55:42 +00:00 |
|
Mihir Kandoi
|
3e92ae8bd0
|
fix: sql error in quality inspection
(cherry picked from commit 062b245e3f)
|
2025-07-28 11:24:29 +00:00 |
|
Rohit Waghchaure
|
ad75754ca6
|
fix: prevent concurrency issues
(cherry picked from commit a186b1266d)
|
2025-07-28 10:59:17 +00:00 |
|
Mihir Kandoi
|
584b442824
|
fix: status in MR (material transfer) when using transit stock entries
(cherry picked from commit baa612bc72)
|
2025-07-28 10:03:28 +00:00 |
|
Smit Vora
|
8d8d47b0d6
|
Merge pull request #48729 from frappe/mergify/bp/version-15-hotfix/pr-48382
|
2025-07-26 12:13:27 +05:30 |
|
Soni Karm
|
0cb2c41cba
|
fix: enhance warehouse filter to support list and tuple values (#48755)
|
2025-07-26 11:32:23 +05:30 |
|
Smit Vora
|
176a124f1a
|
chore: restore removed import as it's used in v15
|
2025-07-22 15:50:18 +05:30 |
|
Rohit Waghchaure
|
d378e51492
|
fix: valuation for rejected materials
(cherry picked from commit b7039cc506)
# Conflicts:
# erpnext/controllers/buying_controller.py
|
2025-07-22 04:18:22 +00:00 |
|
Karm Soni
|
9bf0d852ee
|
fix: update get_data function to use item_query
(cherry picked from commit 8a97b39028)
|
2025-07-21 14:33:53 +00:00 |
|
Karm Soni
|
fb81202830
|
refactor: revert indentation
(cherry picked from commit 063c4e9720)
|
2025-07-21 14:33:52 +00:00 |
|
Karm Soni
|
a1aee44014
|
refactor: remove unused imports in stock_balance.py
(cherry picked from commit bc46045cc7)
|
2025-07-21 14:33:52 +00:00 |
|
Karm Soni
|
b57163b7be
|
fix: warehouse filter query by chaining conditions
(cherry picked from commit 7a266113ed)
|
2025-07-21 14:33:52 +00:00 |
|
Karm Soni
|
1d52a8fb69
|
fix: handle empty warehouse condition in get_warehouse_condition function; typo;
(cherry picked from commit fca9843fc2)
|
2025-07-21 14:33:52 +00:00 |
|
Karm Soni
|
a7e8f404f7
|
fix: use the item_query for get_data
(cherry picked from commit 169caaf66f)
|
2025-07-21 14:33:51 +00:00 |
|
Karm Soni
|
fa01bdc490
|
fix: correct query filter assignment in stock ledger and balance reports
(cherry picked from commit e60c711fdc)
|
2025-07-21 14:33:51 +00:00 |
|
Karm Soni
|
62033b5c7a
|
fix(test): update tests
(cherry picked from commit 0a71ca6739)
|
2025-07-21 14:33:51 +00:00 |
|
Karm Soni
|
ecf9e6e748
|
feat: update stock ledger report to support multi-select for warehouses and items
(cherry picked from commit f2afd98725)
|
2025-07-21 14:33:50 +00:00 |
|
Karm Soni
|
72e8ce0449
|
refactor: use existing functionality
(cherry picked from commit 2882576479)
|
2025-07-21 14:33:50 +00:00 |
|
Karm Soni
|
801cda3813
|
feat: enhance apply_warehouse_filter to support multiple warehouses in filters
(cherry picked from commit 2ff1dcc391)
|
2025-07-21 14:33:50 +00:00 |
|
Karm Soni
|
2b08c5b769
|
feat: update stock balance report to support multi-select for items and warehouses
(cherry picked from commit 0d2a88bafc)
|
2025-07-21 14:33:49 +00:00 |
|
Mihir Kandoi
|
32915cf2b7
|
fix: do not consider cancelled SLEs in report
(cherry picked from commit 71578cb2ef)
|
2025-07-17 06:09:41 +00:00 |
|
rohitwaghchaure
|
01ed30ec01
|
Merge pull request #48599 from frappe/mergify/bp/version-15-hotfix/pr-48408
fix: resolve bundle item into line item if againt default supplier ch… (backport #48408)
|
2025-07-15 18:41:35 +05:30 |
|
rohitwaghchaure
|
873e0a4219
|
chore: fix conflicts
|
2025-07-15 18:05:31 +05:30 |
|
l0gesh29
|
6fddf4c5aa
|
fix: carry forward the delivered_by_supplier check to PO
(cherry picked from commit f3460ec840)
# Conflicts:
# erpnext/stock/doctype/packed_item/packed_item.json
|
2025-07-15 09:37:02 +00:00 |
|
rohitwaghchaure
|
3100099cfa
|
chore: fix conflicts
|
2025-07-15 15:04:18 +05:30 |
|
rohitwaghchaure
|
9aeb08f968
|
chore: fix conflicts
|
2025-07-15 15:03:41 +05:30 |
|
Rohit Waghchaure
|
4b6444e93b
|
fix: system was allowing credit notes with serial numbers for any customer
(cherry picked from commit e073075834)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.py
# erpnext/stock/doctype/serial_no/serial_no.json
|
2025-07-15 09:28:35 +00:00 |
|
barredterra
|
c20a5b01b4
|
fix: make labels in serial_batch_prompt translatable
(cherry picked from commit 8757800888)
|
2025-07-15 06:25:37 +00:00 |
|
Mihir Kandoi
|
16cb147d86
|
Merge pull request #48569 from frappe/mergify/bp/version-15-hotfix/pr-48542
fix: field name of price_list in material request (backport #48542)
|
2025-07-14 21:31:54 +05:30 |
|
rohitwaghchaure
|
2a8b8aa71d
|
Merge pull request #48570 from frappe/mergify/bp/version-15-hotfix/pr-48568
fix: recalculate qty issue for stock reco (backport #48568)
|
2025-07-14 18:16:48 +05:30 |
|
Mihir Kandoi
|
c39993a3ba
|
chore: resolve conflicts
|
2025-07-14 17:22:00 +05:30 |
|
Mihir Kandoi
|
e3ba4320d6
|
chore: resolve conflicts
|
2025-07-14 17:19:40 +05:30 |
|
Mihir Kandoi
|
81e244be55
|
fix: gross margin not set in project on submission of stock entry
(cherry picked from commit ec578ba231)
|
2025-07-14 11:43:16 +00:00 |
|
Mihir Kandoi
|
a195152cc8
|
fix: incorrect if condition
(cherry picked from commit 668574e4f0)
|
2025-07-14 11:38:10 +00:00 |
|
Mihir Kandoi
|
1322cc1378
|
fix: incorrect stock reco sle
(cherry picked from commit 597d5aff02)
|
2025-07-14 11:38:09 +00:00 |
|
Mihir Kandoi
|
ee6ef03e24
|
fix: field name of price_list in material request
(cherry picked from commit adb9a6bc15)
# Conflicts:
# erpnext/patches.txt
# erpnext/stock/doctype/material_request/material_request.py
# erpnext/stock/doctype/packed_item/packed_item.py
|
2025-07-14 11:14:53 +00:00 |
|
ruthra kumar
|
9287e9a2ca
|
Merge pull request #48556 from frappe/mergify/bp/version-15-hotfix/pr-48550
chore: fix flacky test and remove redundant code (backport #48550)
|
2025-07-14 11:41:36 +05:30 |
|
Sagar Vora
|
d5faae3e7c
|
Merge pull request #48081 from frappe/mergify/bp/version-15-hotfix/pr-48048
fix: use `flt` value of bin qty (backport #48048)
|
2025-07-14 05:17:07 +00:00 |
|
ljain112
|
8f6cd40c7b
|
chore: return doc if item already exists for test
(cherry picked from commit e6b9e82b2f)
|
2025-07-13 11:51:32 +00:00 |
|
ljain112
|
567f7b4d71
|
chore: fix flacky test and remove redundant code
(cherry picked from commit de8c3ba968)
# Conflicts:
# erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
|
2025-07-13 11:51:32 +00:00 |
|
Rohit Waghchaure
|
f2af2fe63b
|
fix: incorrect last sle for no batch wise valuation
(cherry picked from commit 93d3eb662f)
|
2025-07-11 05:33:01 +00:00 |
|