ravibharathi656
|
f231b1e32f
|
fix(asset): handle None in depreciation value
|
2025-08-26 13:33:26 +05:30 |
|
ruthra kumar
|
64c5af202c
|
Merge pull request #49315 from frappe/mergify/bp/version-15-hotfix/pr-48875
fix: incorrect pending qty when creating sales invoice from sales order (backport #48875)
|
2025-08-26 13:12:58 +05:30 |
|
ruthra kumar
|
9cd15939c9
|
Merge pull request #49293 from frappe/mergify/bp/version-15-hotfix/pr-49265
feat: show title in link field for Project DocType (backport #49265)
|
2025-08-26 11:35:12 +05:30 |
|
Hussain Nagaria
|
c52f2c75f6
|
feat: show title in link field for Project DocType (#49265)
(cherry picked from commit a5f200636a)
# Conflicts:
# erpnext/projects/doctype/project/project.json
|
2025-08-26 11:18:39 +05:30 |
|
ruthra kumar
|
6983573243
|
chore: resolve conflict
|
2025-08-26 11:06:55 +05:30 |
|
ravibharathi656
|
1380ee21b6
|
chore: remove update_stock
(cherry picked from commit 368dbe3bbf)
|
2025-08-25 19:39:14 +00:00 |
|
ravibharathi656
|
b403b6c7b4
|
test: add pending quantity check for invoice creation
(cherry picked from commit e5d4b4f0f0)
# Conflicts:
# erpnext/selling/doctype/sales_order/test_sales_order.py
|
2025-08-25 19:39:14 +00:00 |
|
ravibharathi656
|
54030eb721
|
fix: incorrect pending qty when creating sales invoice from sales order
(cherry picked from commit a5138f4899)
|
2025-08-25 19:39:14 +00:00 |
|
Sagar Vora
|
5a7161eeb3
|
Merge pull request #49313 from frappe/mergify/bp/version-15-hotfix/pr-49312
fix: multiple fixes to warehouse barcode scanning logic (backport #49312)
|
2025-08-25 19:11:59 +00:00 |
|
Sagar Vora
|
0767c2e0f6
|
fix: correct logic for warehouse field label
(cherry picked from commit 72a38929e5)
|
2025-08-25 19:08:38 +00:00 |
|
Sagar Vora
|
fbbd5a3af5
|
fix: match warehouse only when last_scanned_warehouse field exists
(cherry picked from commit 4005e4412d)
|
2025-08-25 19:08:37 +00:00 |
|
rohitwaghchaure
|
04c2fca4e2
|
Merge pull request #49303 from frappe/mergify/bp/version-15-hotfix/pr-49301
fix: set valid serial no naming series format (backport #49301)
|
2025-08-25 17:51:15 +05:30 |
|
Kavin
|
bec385a667
|
fix: set valid serial no naming series format
(cherry picked from commit 46b85c7857)
|
2025-08-25 11:53:12 +00:00 |
|
Raffael Meyer
|
ba840d22e5
|
fix(Supplier): add make_method for Pricing Rule (#49282)
|
2025-08-22 19:18:42 +02:00 |
|
mergify[bot]
|
655af24183
|
feat: add make methods for Bank Account (backport #49000) (#49275)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-08-22 19:04:42 +02:00 |
|
mergify[bot]
|
c375ac3939
|
Merge pull request #49272 from frappe/mergify/bp/version-15-hotfix/pr-49050
fix: ensure variant conversion factor is returned before the template's (backport #49050)
|
2025-08-22 15:11:26 +05:30 |
|
rohitwaghchaure
|
e4f3836b31
|
Merge pull request #49270 from frappe/mergify/bp/version-15-hotfix/pr-49269
fix: Serial Nos popup only appears 1 time (backport #49269)
|
2025-08-21 23:38:01 +05:30 |
|
rohitwaghchaure
|
be01c4fafe
|
chore: fix conflicts
|
2025-08-21 23:34:38 +05:30 |
|
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 |
|