Rohit Waghchaure
|
21f0dcbcc3
|
fix: update the modified date in for SLEs and GLs after rename
(cherry picked from commit dc5a5ef258)
|
2025-04-10 12:10:48 +00:00 |
|
rohitwaghchaure
|
14a502c956
|
Merge pull request #46998 from frappe/mergify/bp/version-15-hotfix/pr-46831
fix: current batch qty showing zero in the stock reconciliation (backport #46831)
|
2025-04-10 15:39:34 +05:30 |
|
Rohit Waghchaure
|
24c8a06520
|
fix: current batch qty showing zero in the stock reconciliation
(cherry picked from commit a5c62f8623)
|
2025-04-10 08:30:28 +00:00 |
|
rohitwaghchaure
|
13f73b59df
|
Merge pull request #46988 from frappe/mergify/bp/version-15-hotfix/pr-46978
fix: bypass validation during reposting (backport #46978)
|
2025-04-10 12:21:36 +05:30 |
|
rohitwaghchaure
|
b4efba80a7
|
Merge pull request #46989 from frappe/mergify/bp/version-15-hotfix/pr-46965
fix: Recreate Stock Ledgers issue (backport #46965)
|
2025-04-10 12:21:00 +05:30 |
|
Rohit Waghchaure
|
b819e0a61b
|
fix: Recreate Stock Ledgers issue
(cherry picked from commit 229a4cef45)
|
2025-04-10 06:13:44 +00:00 |
|
Rohit Waghchaure
|
01aad96b10
|
fix: bypass validation during reposting
(cherry picked from commit 3697b9fd9b)
|
2025-04-10 06:13:26 +00:00 |
|
rohitwaghchaure
|
860aba47ef
|
Merge pull request #46985 from frappe/mergify/bp/version-15-hotfix/pr-46933
fix: item code not showing in the error message (backport #46933)
|
2025-04-10 11:31:59 +05:30 |
|
rohitwaghchaure
|
1b6c4b6b4b
|
Merge pull request #46947 from frappe/mergify/bp/version-15-hotfix/pr-46383
feat: available serial no report (backport #46383)
|
2025-04-10 11:29:02 +05:30 |
|
Rohit Waghchaure
|
663e2b7e6c
|
fix: item code not showing in the error message
(cherry picked from commit 86dee69c2f)
|
2025-04-10 05:35:55 +00:00 |
|
Mihir Kandoi
|
cc7756dd49
|
fix: test file for v15
|
2025-04-09 20:47:10 +05:30 |
|
Diptanil Saha
|
d79de4a434
|
Merge pull request #46969 from frappe/mergify/bp/version-15-hotfix/pr-46964
fix: added missing project field on pos profile (backport #46964)
|
2025-04-09 15:57:57 +05:30 |
|
Diptanil Saha
|
b8ef83e1ea
|
chore: resolve conflict
|
2025-04-09 15:39:15 +05:30 |
|
diptanilsaha
|
8e9ddb7a69
|
fix: added missing project field on pos profile
(cherry picked from commit 821d64241a)
# Conflicts:
# erpnext/accounts/doctype/pos_profile/pos_profile.json
|
2025-04-09 10:05:23 +00:00 |
|
Raffael Meyer
|
d43ce7f8e0
|
Merge pull request #46960 from frappe/mergify/bp/version-15-hotfix/pr-46959
fix: interaction with due date / payment terms / payment schedule (backport #46959)
|
2025-04-08 21:34:53 +02:00 |
|
barredterra
|
b5353e4ad1
|
chore: add german translation
|
2025-04-08 21:19:34 +02:00 |
|
barredterra
|
14efeb4acd
|
chore: add context
(cherry picked from commit c00f62d54a)
|
2025-04-08 19:01:35 +00:00 |
|
barredterra
|
35daf669fe
|
fix: clarify confirmation message
(cherry picked from commit 57be8a85d6)
|
2025-04-08 19:01:34 +00:00 |
|
barredterra
|
0c260baacd
|
fix: use the actual field label
(cherry picked from commit 8a4db69581)
|
2025-04-08 19:01:34 +00:00 |
|
barredterra
|
cf00d42799
|
fix: recognize trigger from child table
(cherry picked from commit c55c77f4e9)
|
2025-04-08 19:01:34 +00:00 |
|
barredterra
|
b06a86541b
|
refactor: use doc parameter instead of this.frm.doc
(cherry picked from commit 87c21a89fe)
|
2025-04-08 19:01:34 +00:00 |
|
Raffael Meyer
|
f762f7ec3e
|
Merge pull request #46957 from barredterra/update-due-date
feat: update due date in payment schedule
|
2025-04-08 20:47:13 +02:00 |
|
Raffael Meyer
|
12bd9af3aa
|
Merge pull request #46826 from frappe/mergify/bp/version-15-hotfix/pr-40050
fix: handle due date change (backport #40050)
|
2025-04-08 20:33:22 +02:00 |
|
barredterra
|
0b0a6b8cfa
|
feat: update due date in payment schedule
Partial backport of b629356b7c
|
2025-04-08 20:12:25 +02:00 |
|
barredterra
|
830290c859
|
feat: clear payment terms and schedule
|
2025-04-08 20:10:31 +02:00 |
|
barredterra
|
98b75aaa38
|
Merge remote-tracking branch 'upstream/version-15-hotfix' into mergify/bp/version-15-hotfix/pr-40050
|
2025-04-08 19:59:34 +02:00 |
|
Raffael Meyer
|
d319d89988
|
Merge pull request #46949 from frappe/mergify/bp/version-15-hotfix/pr-46913
fix: improve translatability of query report print formats (backport #46913)
|
2025-04-08 16:11:18 +02:00 |
|
barredterra
|
d94ebd0c78
|
chore: add missing german translation
|
2025-04-08 15:56:48 +02:00 |
|
barredterra
|
7896f8a855
|
fix: remove redundant letter head
|
2025-04-08 15:33:12 +02:00 |
|
barredterra
|
7cf83ffce7
|
fix: go for lower case "on" because we already have translations for that
|
2025-04-08 15:31:25 +02:00 |
|
barredterra
|
18e9a9881c
|
fix: make report's "printed on" translatable
|
2025-04-08 15:30:54 +02:00 |
|
rohitwaghchaure
|
10cf575bba
|
Merge pull request #46946 from frappe/mergify/bp/version-15-hotfix/pr-46942
fix: ignore backflush setting on subcontracting return (backport #46942)
|
2025-04-08 18:12:52 +05:30 |
|
Mihir Kandoi
|
6fedb7b9db
|
refactor: split and clean execute function to be more readable
(cherry picked from commit 036af54d54)
|
2025-04-08 12:17:05 +00:00 |
|
Mihir Kandoi
|
9af50528f1
|
perf: take query out of loop
(cherry picked from commit 26de902496)
|
2025-04-08 12:17:05 +00:00 |
|
Mihir Kandoi
|
e7b5303782
|
fix: remove get_items query.run outside of if condition
(cherry picked from commit 80c17cc005)
|
2025-04-08 12:17:05 +00:00 |
|
Mihir Kandoi
|
0ec026ec7e
|
refactor: import functions in new report instead of redundant code
(cherry picked from commit 501f07803e)
|
2025-04-08 12:17:04 +00:00 |
|
Mihir Kandoi
|
c472af87b2
|
feat: available serial no report
(cherry picked from commit 5592d8e87f)
|
2025-04-08 12:17:04 +00:00 |
|
Mihir Kandoi
|
ca56150918
|
fix: ignore backflush setting on subcontracting return
(cherry picked from commit 7479e1ec32)
|
2025-04-08 12:15:44 +00:00 |
|
ruthra kumar
|
617bebfa8f
|
Merge pull request #46945 from frappe/mergify/bp/version-15-hotfix/pr-46892
fix: use get instead of dot operator to access dict value to prevent no attribute error (backport #46892)
|
2025-04-08 17:20:45 +05:30 |
|
Mihir Kandoi
|
f2df8e531d
|
fix: use get instead of dot operator to access dict value
(cherry picked from commit 7fb75f0482)
|
2025-04-08 11:34:11 +00:00 |
|
ruthra kumar
|
c47b3c3642
|
Merge pull request #46932 from frappe/mergify/bp/version-15-hotfix/pr-46626
fix: correct payment request amount (backport #46626)
|
2025-04-08 16:56:25 +05:30 |
|
ruthra kumar
|
e271933e43
|
chore: resolve conflict
|
2025-04-08 16:33:07 +05:30 |
|
ljain112
|
23c76aa530
|
fix: correct payment request amount
(cherry picked from commit 913c60d77b)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request.py
|
2025-04-08 16:33:07 +05:30 |
|
ruthra kumar
|
bed960df36
|
Merge pull request #46939 from frappe/mergify/bp/version-15-hotfix/pr-39701
fix: check order paid amount before payment request (backport #39701)
|
2025-04-08 16:30:28 +05:30 |
|
ruthra kumar
|
36bc87270c
|
Merge pull request #46936 from frappe/mergify/bp/version-15-hotfix/pr-46631
fix: update outstanding for self (backport #46631)
|
2025-04-08 16:21:49 +05:30 |
|
ljain112
|
4d8984e4e9
|
fix: resolve conflicts
|
2025-04-08 15:54:44 +05:30 |
|
ruthra kumar
|
4eb0f39af7
|
chore: pass doctype and name
|
2025-04-08 15:15:24 +05:30 |
|
Gursheen Anand
|
b7ae17aaaf
|
fix(portal): context pay_amount for button
(cherry picked from commit 7efb5a8cb5)
# Conflicts:
# erpnext/templates/pages/order.html
|
2025-04-08 09:33:20 +00:00 |
|
Gursheen Anand
|
b0302d71b7
|
fix(portal): payment amount for orders
(cherry picked from commit c18ff5bd25)
# Conflicts:
# erpnext/templates/pages/order.py
|
2025-04-08 09:33:20 +00:00 |
|
Gursheen Anand
|
cf7252d3e7
|
fix: check payments against orders for getting request amount
(cherry picked from commit f7face43cd)
# Conflicts:
# erpnext/accounts/doctype/payment_request/payment_request.py
|
2025-04-08 09:33:19 +00:00 |
|