mergify[bot]
|
c77f7f4ff0
|
test(Payment Entry): account type is set (backport #47071) (#47073)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2025-04-14 19:26:11 +02:00 |
|
mergify[bot]
|
8e02a9bc28
|
fix(Payment Entry): set account type if missing (backport #47069) (#47070)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(Payment Entry): set account type if missing (#47069)
|
2025-04-14 18:54:12 +02:00 |
|
rohitwaghchaure
|
640012429e
|
Merge pull request #47063 from frappe/mergify/bp/version-15-hotfix/pr-47058
fix: consider negative stock qty in stock reconciliation (backport #47058)
|
2025-04-14 20:30:25 +05:30 |
|
Rohit Waghchaure
|
603f737c99
|
fix: consider negative stock qty in stock reco
(cherry picked from commit 15272d0e56)
|
2025-04-14 12:39:35 +00:00 |
|
ruthra kumar
|
4fd99ed763
|
Merge pull request #46773 from frappe/mergify/bp/version-15-hotfix/pr-46683
fix: Set complete contact details for `Employee` in PE (backport #46683)
|
2025-04-14 17:30:51 +05:30 |
|
ruthra kumar
|
77bbaef5a6
|
Merge pull request #47055 from frappe/mergify/bp/version-15-hotfix/pr-47049
Revert "fix: remove against_voucher and against_voucher_type column from General Ledger Report" (backport #47049)
|
2025-04-14 13:52:05 +05:30 |
|
ruthra kumar
|
6bfb3c6905
|
chore: resolve conflict
|
2025-04-14 13:26:32 +05:30 |
|
ruthra kumar
|
da65f44a47
|
fix: revert #46900 - against_voucher filter in general ledger
(cherry picked from commit adb331ef71)
# Conflicts:
# erpnext/accounts/report/general_ledger/general_ledger.py
|
2025-04-14 07:50:28 +00:00 |
|
Deepesh Garg
|
f1254e51e5
|
Merge pull request #47044 from frappe/mergify/bp/version-15-hotfix/pr-47043
fix: Group GLs by account for TB generation (backport #47043)
|
2025-04-13 19:31:29 +05:30 |
|
Deepesh Garg
|
416d9bce2c
|
fix: Group GLs by account for TB generation
(cherry picked from commit f894c6d275)
|
2025-04-13 13:57:23 +00:00 |
|
ruthra kumar
|
f5fd255e82
|
Merge pull request #47033 from frappe/mergify/bp/version-15-hotfix/pr-47012
fix: correct doctype in item_wise_purchase register (backport #47012)
|
2025-04-12 07:29:14 +05:30 |
|
ljain112
|
b2fb4fba51
|
fix: correct doctype in item_wise_purchase register
(cherry picked from commit b8b8dce733)
|
2025-04-12 01:42:25 +00:00 |
|
rohitwaghchaure
|
1b8a317de9
|
Merge pull request #47027 from frappe/mergify/bp/version-15-hotfix/pr-47026
fix: batchwise valuation for MA item (backport #47026)
|
2025-04-11 22:56:25 +05:30 |
|
Rohit Waghchaure
|
debfcdc61f
|
fix: batchwise valuation for MA item
(cherry picked from commit 504b8c0a68)
|
2025-04-11 16:27:52 +00:00 |
|
rohitwaghchaure
|
706092061b
|
Merge pull request #47021 from frappe/mergify/bp/version-15-hotfix/pr-47020
fix: removed display depends on (backport #47020)
|
2025-04-11 19:53:43 +05:30 |
|
rohitwaghchaure
|
c6c8aa02eb
|
Merge pull request #47023 from frappe/mergify/bp/version-15-hotfix/pr-47022
fix: condition for use_batchwise_valuation (backport #47022)
|
2025-04-11 19:53:22 +05:30 |
|
Rohit Waghchaure
|
0ff7465e27
|
fix: condition for use_batchwise_valuation
(cherry picked from commit cc171d9706)
|
2025-04-11 14:06:08 +00:00 |
|
Rohit Waghchaure
|
00b25537f4
|
fix: removed display depends on
(cherry picked from commit e0bf45e03b)
|
2025-04-11 13:46:39 +00:00 |
|
rohitwaghchaure
|
6dee592ba7
|
Merge pull request #47004 from frappe/mergify/bp/version-15-hotfix/pr-47002
feat: Allow to Make Quality Inspection after Purchase / Delivery (backport #47002)
|
2025-04-11 17:26:53 +05:30 |
|
rohitwaghchaure
|
8233aadd50
|
Merge pull request #47017 from frappe/mergify/bp/version-15-hotfix/pr-47015
fix: allow to use batch-wise valuation for moving average items (backport #47015)
|
2025-04-11 17:25:29 +05:30 |
|
Rohit Waghchaure
|
e479975f54
|
fix: allow to use batchwise valuation for moving average items
(cherry picked from commit 65ba79bb85)
|
2025-04-11 11:38:32 +00:00 |
|
rohitwaghchaure
|
5e1d3f77bb
|
chore: fix conflicts
|
2025-04-11 15:35:36 +05:30 |
|
rohitwaghchaure
|
00ac8597b0
|
chore: fix conflicts
|
2025-04-11 15:34:45 +05:30 |
|
rohitwaghchaure
|
4163b18ec3
|
Merge pull request #47005 from frappe/mergify/bp/version-15-hotfix/pr-46997
fix: update the modified date in for SLEs and GLs after rename (backport #46997)
|
2025-04-11 14:43:02 +05:30 |
|
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 |
|
Rohit Waghchaure
|
2e6ba91589
|
feat: Allow to Make Quality Inspection after Purchase / Delivery
(cherry picked from commit 8eaa2afeb7)
# Conflicts:
# erpnext/stock/doctype/stock_settings/stock_settings.json
|
2025-04-10 12:10:47 +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 |
|