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 |
|
Frappe PR Bot
|
2eb7a688cb
|
chore(release): Bumped to Version 15.57.5
## [15.57.5](https://github.com/frappe/erpnext/compare/v15.57.4...v15.57.5) (2025-04-14)
### Bug Fixes
* revert [#46900](https://github.com/frappe/erpnext/issues/46900) - against_voucher filter in general ledger ([969c354](969c3549d5))
v15.57.5
|
2025-04-14 08:24:20 +00:00 |
|
ruthra kumar
|
19a5b923b9
|
Merge pull request #47053 from frappe/mergify/bp/version-15/pr-47049
Revert "fix: remove against_voucher and against_voucher_type column from General Ledger Report" (backport #47049)
|
2025-04-14 13:52:55 +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 |
|
Mihir Kandoi
|
c58800a929
|
fix: linter
|
2025-04-14 13:33:48 +05:30 |
|
Mihir Kandoi
|
924e9b94b6
|
fix: import error
|
2025-04-14 13:28:06 +05:30 |
|
ruthra kumar
|
6bfb3c6905
|
chore: resolve conflict
|
2025-04-14 13:26:32 +05:30 |
|
ruthra kumar
|
a0908522c1
|
chore: resolve conflict
|
2025-04-14 13:21:33 +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 |
|
ruthra kumar
|
969c3549d5
|
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:49:32 +00:00 |
|
Mihir Kandoi
|
13d3b27a1f
|
fix: test cases error
(cherry picked from commit 8df18762a9)
|
2025-04-14 06:41:28 +00:00 |
|
Mihir Kandoi
|
dedb19e3e9
|
fix: test cases
(cherry picked from commit a7394329ca)
|
2025-04-14 06:41:27 +00:00 |
|
Mihir Kandoi
|
b3e852adfc
|
fix: logic and added test case
(cherry picked from commit f071255340)
|
2025-04-14 06:41:27 +00:00 |
|
Mihir Kandoi
|
73683b2754
|
fix: group sub assemblies in production plan
(cherry picked from commit f58abed935)
|
2025-04-14 06:41:27 +00:00 |
|
Frappe PR Bot
|
1da2577035
|
chore(release): Bumped to Version 15.57.4
## [15.57.4](https://github.com/frappe/erpnext/compare/v15.57.3...v15.57.4) (2025-04-13)
### Bug Fixes
* Group GLs by account for TB generation ([70fa366](70fa366216))
v15.57.4
|
2025-04-13 14:13:43 +00:00 |
|
Deepesh Garg
|
e5d0ab6bab
|
Merge pull request #47045 from frappe/mergify/bp/version-15/pr-47044
fix: Group GLs by account for TB generation
|
2025-04-13 19:42:19 +05:30 |
|
Deepesh Garg
|
70fa366216
|
fix: Group GLs by account for TB generation
(cherry picked from commit f894c6d275)
(cherry picked from commit 416d9bce2c)
|
2025-04-13 14:02:23 +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 |
|
Frappe PR Bot
|
065c9fa85f
|
chore(release): Bumped to Version 15.57.3
## [15.57.3](https://github.com/frappe/erpnext/compare/v15.57.2...v15.57.3) (2025-04-12)
### Bug Fixes
* correct doctype in item_wise_purchase register ([cd68832](cd68832aa0))
v15.57.3
|
2025-04-12 02:01:06 +00:00 |
|
ruthra kumar
|
bcb45ce8ef
|
Merge pull request #47031 from frappe/mergify/bp/version-15/pr-47012
fix: correct doctype in item_wise_purchase register (backport #47012)
|
2025-04-12 07:29:44 +05:30 |
|
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 |
|
ljain112
|
cd68832aa0
|
fix: correct doctype in item_wise_purchase register
(cherry picked from commit b8b8dce733)
|
2025-04-12 01:41:15 +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 |
|
Frappe PR Bot
|
8a33866a8c
|
chore(release): Bumped to Version 15.57.2
## [15.57.2](https://github.com/frappe/erpnext/compare/v15.57.1...v15.57.2) (2025-04-11)
### Bug Fixes
* condition for use_batchwise_valuation ([18dd128](18dd128838))
* removed display depends on ([b8436db](b8436dbd21))
v15.57.2
|
2025-04-11 15:16:34 +00:00 |
|
rohitwaghchaure
|
d3a987800b
|
Merge pull request #47025 from frappe/mergify/bp/version-15/pr-47021
fix: removed display depends on (backport #47020) (backport #47021)
|
2025-04-11 20:45:07 +05:30 |
|
rohitwaghchaure
|
1e19bc7f3f
|
Merge pull request #47024 from frappe/mergify/bp/version-15/pr-47023
fix: condition for use_batchwise_valuation (backport #47022) (backport #47023)
|
2025-04-11 20:44:54 +05:30 |
|
rohitwaghchaure
|
fa7675488d
|
chore: fix conflicts
|
2025-04-11 20:26:43 +05:30 |
|
Rohit Waghchaure
|
b8436dbd21
|
fix: removed display depends on
(cherry picked from commit e0bf45e03b)
(cherry picked from commit 00b25537f4)
# Conflicts:
# erpnext/stock/doctype/stock_settings/stock_settings.json
|
2025-04-11 14:24:37 +00:00 |
|
Rohit Waghchaure
|
18dd128838
|
fix: condition for use_batchwise_valuation
(cherry picked from commit cc171d9706)
(cherry picked from commit 0ff7465e27)
|
2025-04-11 14:24:31 +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 |
|
Frappe PR Bot
|
ff41ed534b
|
chore(release): Bumped to Version 15.57.1
## [15.57.1](https://github.com/frappe/erpnext/compare/v15.57.0...v15.57.1) (2025-04-11)
### Bug Fixes
* allow to use batchwise valuation for moving average items ([dded682](dded682feb))
v15.57.1
|
2025-04-11 12:22:21 +00:00 |
|
rohitwaghchaure
|
f2684d9b4c
|
Merge pull request #47018 from frappe/mergify/bp/version-15/pr-47017
fix: allow to use batch-wise valuation for moving average items (backport #47015) (backport #47017)
|
2025-04-11 17:50:55 +05:30 |
|
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 |
|
Rohit Waghchaure
|
dded682feb
|
fix: allow to use batchwise valuation for moving average items
(cherry picked from commit 65ba79bb85)
(cherry picked from commit e479975f54)
|
2025-04-11 11:56:35 +00:00 |
|
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 |
|
barredterra
|
2431141062
|
fix: remove invalid parameter
|
2025-04-11 13:07:44 +02:00 |
|
Patrick Eissler
|
b0e8f85a27
|
refactor: make linter happy
|
2025-04-11 12:25:58 +02:00 |
|
Patrick Eissler
|
b0f3d62dd0
|
fix: only update User Permissions if a relevant field has changed
|
2025-04-11 12:25:26 +02:00 |
|
Patrick Eissler
|
e47d07d98c
|
chore: use existing utility function
|
2025-04-11 12:24:25 +02:00 |
|
Patrick Eissler
|
7ab81b7e54
|
fix(Employee): remove User Permissions if create_user_permission is unchecked
|
2025-04-11 12:24:04 +02:00 |
|
rohitwaghchaure
|
5e1d3f77bb
|
chore: fix conflicts
|
2025-04-11 15:35:36 +05:30 |
|