Rohit Waghchaure
|
196812017e
|
fix: Serial Nos popup only appears 1 time
(cherry picked from commit 5503d4b05b)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
|
2025-08-21 17:59:24 +00:00 |
|
Mihir Kandoi
|
c2d07eb2b2
|
Merge pull request #49263 from frappe/mergify/bp/version-15-hotfix/pr-49182
|
2025-08-21 18:11:02 +05:30 |
|
ravibharathi656
|
db4fc8545d
|
fix: handle all searchfields in items
(cherry picked from commit ad559c3491)
|
2025-08-21 10:56:31 +00:00 |
|
Mihir Kandoi
|
b7307b4a56
|
Merge pull request #49251 from frappe/mergify/bp/version-15-hotfix/pr-49250
|
2025-08-20 18:04:08 +05:30 |
|
Mihir Kandoi
|
edaff5d699
|
fix: child item picker picking all items when creating PI from PR
(cherry picked from commit 738c1e0d0a)
|
2025-08-20 12:18:59 +00:00 |
|
Mihir Kandoi
|
dec7680d73
|
Merge pull request #49247 from frappe/mergify/bp/version-15-hotfix/pr-49183
Fix/mr status from wo (backport #49183)
|
2025-08-20 15:28:26 +05:30 |
|
Kavin
|
1c7a18866f
|
Merge pull request #49183 from aerele/fix/mr-status-from-wo
Fix/mr status from wo
(cherry picked from commit 67e57018bc)
|
2025-08-20 09:43:11 +00:00 |
|
rohitwaghchaure
|
696fbbb0e2
|
Merge pull request #49230 from frappe/mergify/bp/version-15-hotfix/pr-49228
fix: company issue in setup wizard (backport #49228)
|
2025-08-19 16:42:29 +05:30 |
|
rohitwaghchaure
|
dffa3baea6
|
Merge pull request #49229 from frappe/mergify/bp/version-15-hotfix/pr-49223
fix(stock): don't override t_warehouse if no rules found (backport #49223)
|
2025-08-19 16:27:14 +05:30 |
|
Rohit Waghchaure
|
cea4b50bbc
|
fix: company issue in setup wizard
(cherry picked from commit 1fb0d1460a)
|
2025-08-19 10:52:49 +00:00 |
|
Kavin
|
da3d8fbbc5
|
fix(stock): don't override t_warehouse if no rules found
(cherry picked from commit 66f217c8e6)
|
2025-08-19 10:39:47 +00:00 |
|
ruthra kumar
|
dac8dc6b8a
|
Merge pull request #49224 from frappe/mergify/bp/version-15-hotfix/pr-49102
fix(quotation): update currency on duplicate (backport #49102)
|
2025-08-19 14:10:21 +05:30 |
|
ravibharathi656
|
419f717542
|
fix(quotation): update currency on duplicate
(cherry picked from commit 430a06d056)
|
2025-08-19 08:35:09 +00:00 |
|
Khushi Rawat
|
80d9181b29
|
Merge pull request #49215 from frappe/mergify/bp/version-15-hotfix/pr-49141
refactor: consider asset value adjustments in report (backport #49141)
|
2025-08-19 13:06:54 +05:30 |
|
ruthra kumar
|
b6c992ffeb
|
fix: handle mode of payment filter (backport #49185) (#49221)
Merge pull request #49185 from aerele/mop-sales-register
fix: handle mode of payment filter
(cherry picked from commit d656e02441)
Co-authored-by: Logesh Periyasamy <logeshperiyasamy24@gmail.com>
|
2025-08-19 12:26:25 +05:30 |
|
Logesh Periyasamy
|
cfb7558465
|
Merge pull request #49185 from aerele/mop-sales-register
fix: handle mode of payment filter
(cherry picked from commit d656e02441)
|
2025-08-19 06:33:41 +00:00 |
|
ruthra kumar
|
2cfdb2d2cd
|
Merge pull request #49218 from frappe/mergify/bp/version-15-hotfix/pr-49055
fix: fetch fieldname in accounting dimension filter (backport #49055)
|
2025-08-19 11:24:52 +05:30 |
|
Diptanil Saha
|
529a84154b
|
Merge pull request #49219 from frappe/mergify/bp/version-15-hotfix/pr-49192
fix: improve queries with query builder and input sanitization (backport #49192)
|
2025-08-19 11:16:02 +05:30 |
|
ruthra kumar
|
4af814dc3b
|
chore: resolve conflicts
|
2025-08-19 11:06:23 +05:30 |
|
diptanilsaha
|
dc953f70d1
|
fix: handle empty loyalty point details
(cherry picked from commit 1231ca17c9)
|
2025-08-19 05:25:19 +00:00 |
|
diptanilsaha
|
0a2a7fa6aa
|
fix: use query builder instead of raw SQL in get_timesheet_detail_rate
(cherry picked from commit e563ed0c75)
|
2025-08-19 05:25:19 +00:00 |
|
diptanilsaha
|
4ac386a84e
|
fix: use query builder instead of raw SQL in get_rfq_containing_supplier
(cherry picked from commit 7f2a52ff71)
|
2025-08-19 05:25:18 +00:00 |
|
diptanilsaha
|
92391a69cf
|
fix: use query builder instead of raw SQL in unset_existing_data
(cherry picked from commit 7fa4ed6139)
|
2025-08-19 05:25:18 +00:00 |
|
diptanilsaha
|
69389bb355
|
fix: sanitize column name for inventory_dimensions in get_stock_balance
(cherry picked from commit eb22794f14)
|
2025-08-19 05:25:18 +00:00 |
|
diptanilsaha
|
4a0d7fd205
|
fix: use query builder instead of raw SQL in get_blanket_orders
(cherry picked from commit 1db135262d)
|
2025-08-19 05:25:18 +00:00 |
|
diptanilsaha
|
c9f79b3ba9
|
fix: formatted string for disabled filter in get_income_account
(cherry picked from commit 6320f7290f)
|
2025-08-19 05:25:17 +00:00 |
|
diptanilsaha
|
9d0fe060c8
|
fix: use query builder instead of raw SQL in get_material_requests_based_on_supplier
(cherry picked from commit de919568b4)
|
2025-08-19 05:25:17 +00:00 |
|
diptanilsaha
|
a3c5b0a510
|
fix: use query builder instead of raw SQL in get_loyalty_details
(cherry picked from commit 8696ba2f5d)
|
2025-08-19 05:25:17 +00:00 |
|
l0gesh29
|
0cd45a0022
|
fix: handle default dimension for all company
(cherry picked from commit 77021fff74)
|
2025-08-19 05:19:01 +00:00 |
|
l0gesh29
|
e50d6c6b62
|
fix: handle default accounting dimension
(cherry picked from commit 16e440f9a7)
|
2025-08-19 05:19:01 +00:00 |
|
l0gesh29
|
a853010537
|
fix: add patch
(cherry picked from commit 3cf765d985)
# Conflicts:
# erpnext/patches.txt
|
2025-08-19 05:19:00 +00:00 |
|
l0gesh29
|
d494d8c299
|
fix: fetch fieldname in accounting dimension filter
(cherry picked from commit 42f9d27d79)
|
2025-08-19 05:18:59 +00:00 |
|
l0gesh29
|
ac4a5bfe6d
|
fix: add fieldname in accounting dimension filter
(cherry picked from commit ac2acc535d)
# Conflicts:
# erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
|
2025-08-19 05:18:59 +00:00 |
|
khushi8112
|
089007f88a
|
fix: add value adjustment amount in report for group by category filter
(cherry picked from commit cd2bab7c5f)
|
2025-08-18 21:28:42 +00:00 |
|
khushi8112
|
89ad9f1bb4
|
fix: add value adjustment amount in asset value
(cherry picked from commit f8050f4278)
|
2025-08-18 21:28:42 +00:00 |
|
Diptanil Saha
|
d14391fb6f
|
Merge pull request #49210 from diptanilsaha/skip_gt_default_mop
fix: apply grand total to default payment mode in Sales and POS invoices
|
2025-08-18 17:27:02 +05:30 |
|
mergify[bot]
|
9a12c73e22
|
fix: update dunning status based on credit notes (backport #49066) (#49208)
Co-authored-by: Karm Soni <karmdsoni8159@gmail.com>
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
|
2025-08-18 11:51:24 +00:00 |
|
diptanilsaha
|
605f513ce3
|
fix: apply grand total to default payment mode in Sales and POS invoices
|
2025-08-18 17:04:38 +05:30 |
|
Diptanil Saha
|
fb34991980
|
Merge pull request #49207 from frappe/mergify/bp/version-15-hotfix/pr-49169
fix(asset): prevent translation function shadowing in make_journal_entry (backport #49169)
|
2025-08-18 15:16:37 +05:30 |
|
l0gesh29
|
1af8ab2a3b
|
fix(asset): prevent translation function shadowing in make_journal_entry
(cherry picked from commit 5e82de1b71)
|
2025-08-18 09:26:40 +00:00 |
|
mergify[bot]
|
07ff97f647
|
fix: ignore links in Dunning patch (backport #49201) (#49204)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: ignore links in Dunning patch (#49201)
|
2025-08-17 18:52:55 +00:00 |
|
Mihir Kandoi
|
b49f85b877
|
Merge pull request #49197 from mihir-kandoi/version-15-hotfix
|
2025-08-17 14:27:00 +05:30 |
|
Mihir Kandoi
|
e8490196ba
|
Revert "fix: use checkout@v2 instead of v4"
This reverts commit c9d69d9629.
|
2025-08-17 13:01:58 +05:30 |
|
rohitwaghchaure
|
bc1c57a18a
|
Merge pull request #49195 from frappe/mergify/bp/version-15-hotfix/pr-49193
fix: additional cost not consider in valuation rate for Stock Entry transfer (backport #49193)
|
2025-08-17 11:15:19 +05:30 |
|
rohitwaghchaure
|
016948804d
|
chore: fix test case
|
2025-08-17 10:55:54 +05:30 |
|
rohitwaghchaure
|
41e7463412
|
chore: fix conflicts
|
2025-08-17 10:54:46 +05:30 |
|
Rohit Waghchaure
|
e4398d3761
|
fix: additional cost not consider in valuation rate for Stock Entry transfer
(cherry picked from commit bbc772abe7)
# Conflicts:
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
|
2025-08-17 05:22:52 +00:00 |
|
Mihir Kandoi
|
6030eb2992
|
fix: wrap inter-company order button labels in __() for translation (backport #49178) (#49179)
fix: wrap inter-company order button labels in __() for translation (#49178)
* Updated purchase_order.js
* Update sales_order.js
(cherry picked from commit 078b8439d9)
Co-authored-by: divyalekha99 <32547248+divyalekha99@users.noreply.github.com>
|
2025-08-14 20:33:32 +05:30 |
|
divyalekha99
|
db486356db
|
fix: wrap inter-company order button labels in __() for translation (#49178)
* Updated purchase_order.js
* Update sales_order.js
(cherry picked from commit 078b8439d9)
|
2025-08-14 15:00:01 +00:00 |
|
Diptanil Saha
|
464f504b61
|
Merge pull request #49177 from frappe/mergify/bp/version-15-hotfix/pr-49108
fix(pos): include Product Bundle components in reserved qty to preven… (backport #49108)
|
2025-08-14 19:09:42 +05:30 |
|