ruthra kumar
|
88fcb8aebb
|
Merge pull request #41180 from frappe/mergify/bp/version-15/pr-41142
fix: mode of payment has precedance in Payment Entry (backport #41142)
|
2024-04-25 09:07:05 +05:30 |
|
ruthra kumar
|
0dfd6facc1
|
fix: mode of payment has precedance
Mode of Payment is given precedence over company/party bank account
(cherry picked from commit 4aef969879)
|
2024-04-25 03:34:30 +00:00 |
|
Frappe PR Bot
|
2fb035fe1b
|
chore(release): Bumped to Version 15.21.0
# [15.21.0](https://github.com/frappe/erpnext/compare/v15.20.6...v15.21.0) (2024-04-24)
### Bug Fixes
* account and stock manager read perm ([572e844](572e844a91))
* allow Employee role to select cost center & project (accounting dimensions) (backport [#41160](https://github.com/frappe/erpnext/issues/41160)) ([#41162](https://github.com/frappe/erpnext/issues/41162)) ([90d6e55](90d6e550aa))
* Allow updating cost center and project for repostable doctypes ([e278688](e278688a4b))
* balance qty for stock ledger report ([74ed656](74ed656bb9))
* do not add actual expense twice for validating budget ([c72478c](c72478c74d))
* do not add qty to supplied items (backport [#41061](https://github.com/frappe/erpnext/issues/41061)) ([#41066](https://github.com/frappe/erpnext/issues/41066)) ([1ae447e](1ae447e4fc))
* don't attempt to set gender from salutation (backport [#40997](https://github.com/frappe/erpnext/issues/40997)) ([#41073](https://github.com/frappe/erpnext/issues/41073)) ([ee7aaf0](ee7aaf0ea4))
* duplicate serial and batch bundle in stock entry and stock reco ([c10c211](c10c21157d))
* incorrect stock posting for current qty ([05d5c48](05d5c48d29))
* Missing args while fetching items from delivery note ([3b4575a](3b4575af3d))
* not able to update default supplier from Supplier Quotation Comparison report ([80891da](80891daaed))
* Party type in Payment Order ([83931e8](83931e872b))
* Payment entry against employee ([060d46a](060d46af42))
* Permission for lower dedcution certificate ([d7ddb00](d7ddb00e86))
* search not working for so in the Production Plan ([#36459](https://github.com/frappe/erpnext/issues/36459)) ([544e56a](544e56a71c))
* stock reco negative qty validation ([aee03fe](aee03fe2ef))
* validate uom is integer for PR item (backport [#41074](https://github.com/frappe/erpnext/issues/41074)) ([#41077](https://github.com/frappe/erpnext/issues/41077)) ([93242ca](93242ca883))
* validation for fraction number in Work Order ([ef2553e](ef2553edf9))
* validation for zero qty in SABB ([85796b3](85796b3534))
### Features
* Available batches report as on specific date ([791e426](791e4269d2))
* show expense breakup ([e047e1e](e047e1eb15))
v15.21.0
|
2024-04-24 10:48:02 +00:00 |
|
Deepesh Garg
|
f3be4cd2b3
|
Merge pull request #41150 from frappe/version-15-hotfix
chore: release v15
|
2024-04-24 16:16:41 +05:30 |
|
Deepesh Garg
|
15bb41d3c2
|
Merge pull request #41164 from frappe/mergify/bp/version-15-hotfix/pr-41106
chore: Remove heatmap from party dashboards (#41106)
|
2024-04-24 13:00:50 +05:30 |
|
Deepesh Garg
|
410990b2a3
|
chore: Remove heatmap from party dashboards
(cherry picked from commit a8f03e8baa)
|
2024-04-24 06:32:03 +00:00 |
|
Deepesh Garg
|
51a2b74db9
|
Merge pull request #41101 from frappe/mergify/bp/version-15-hotfix/pr-41085
fix: Permission for lower deduction certificate (#41085)
|
2024-04-24 12:00:50 +05:30 |
|
Deepesh Garg
|
bfc34939f2
|
Merge pull request #41048 from frappe/mergify/bp/version-15-hotfix/pr-40962
fix: Allow updating cost center and project for repostable doctypes (#40962)
|
2024-04-24 12:00:28 +05:30 |
|
mergify[bot]
|
90d6e550aa
|
fix: allow Employee role to select cost center & project (accounting dimensions) (backport #41160) (#41162)
* fix: allow Employee role to select cost center & project (accounting dimensions)
(cherry picked from commit d0d496a515)
# Conflicts:
# erpnext/accounts/doctype/cost_center/cost_center.json
# erpnext/projects/doctype/project/project.json
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2024-04-24 11:43:46 +05:30 |
|
Deepesh Garg
|
4f5af0ff9f
|
chore: Resolve conflicts
|
2024-04-24 11:32:26 +05:30 |
|
rohitwaghchaure
|
ab21b518e1
|
Merge pull request #41156 from frappe/mergify/bp/version-15-hotfix/pr-41135
feat: Available batches as on specific date report (backport #41135)
|
2024-04-24 11:14:16 +05:30 |
|
Nabin Hait
|
d4e2adbdb2
|
Merge pull request #41141 from frappe/mergify/bp/version-15-hotfix/pr-41136
fix: Missing args while fetching items from delivery note in Installation Note (backport #41136)
|
2024-04-24 10:58:34 +05:30 |
|
ruthra kumar
|
85e0e8110a
|
Merge pull request #41149 from frappe/mergify/bp/version-15-hotfix/pr-41147
refactor: better description and pop up on Advance accounts (backport #41147)
|
2024-04-24 07:19:19 +05:30 |
|
Rohit Waghchaure
|
791e4269d2
|
feat: Available batches report as on specific date
(cherry picked from commit b8f7979794)
|
2024-04-23 16:48:56 +00:00 |
|
rohitwaghchaure
|
3df5aa04b5
|
Merge pull request #41153 from frappe/mergify/bp/version-15-hotfix/pr-41145
fix: incorrect stock posting for current qty (backport #41145)
|
2024-04-23 17:12:03 +05:30 |
|
Rohit Waghchaure
|
05d5c48d29
|
fix: incorrect stock posting for current qty
(cherry picked from commit d4fe313de2)
|
2024-04-23 11:21:47 +00:00 |
|
ruthra kumar
|
2b736b52d6
|
chore: resolve conflicts
|
2024-04-23 15:35:02 +05:30 |
|
ruthra kumar
|
24954b909b
|
refactor: popup to inform on limited support for Advance accounts
(cherry picked from commit 9dbd321133)
|
2024-04-23 09:17:00 +00:00 |
|
ruthra kumar
|
ed5affe25a
|
refactor: better description for advance account
(cherry picked from commit de9c8fc9d6)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
# erpnext/setup/doctype/company/company.json
|
2024-04-23 09:17:00 +00:00 |
|
rohitwaghchaure
|
8591a151de
|
Merge pull request #41143 from frappe/mergify/bp/version-15-hotfix/pr-41098
fix: stock reconciliation negative qty validation (backport #41098)
|
2024-04-23 13:43:08 +05:30 |
|
rohitwaghchaure
|
b2a0e4b810
|
chore: fix conflicts
|
2024-04-23 13:17:23 +05:30 |
|
Rohit Waghchaure
|
aee03fe2ef
|
fix: stock reco negative qty validation
(cherry picked from commit 289495c308)
# Conflicts:
# erpnext/stock/stock_ledger.py
|
2024-04-23 07:44:47 +00:00 |
|
Deepesh Garg
|
62702b8bd6
|
Merge pull request #41134 from frappe/mergify/bp/version-15-hotfix/pr-41104
fix: Payment entry against employee (#41104)
|
2024-04-23 12:04:13 +05:30 |
|
Deepesh Garg
|
cfb36cc9a8
|
Merge pull request #41131 from frappe/mergify/bp/version-15-hotfix/pr-40797
fix: Party type in Payment Order (#40797)
|
2024-04-23 12:03:47 +05:30 |
|
Nabin Hait
|
3b4575af3d
|
fix: Missing args while fetching items from delivery note
(cherry picked from commit bbe323fbb4)
|
2024-04-23 04:55:06 +00:00 |
|
Deepesh Garg
|
060d46af42
|
fix: Payment entry against employee
(cherry picked from commit 93e6c6ccab)
|
2024-04-22 06:08:47 +00:00 |
|
Deepesh Garg
|
83931e872b
|
fix: Party type in Payment Order
(cherry picked from commit 91fa41c9ec)
|
2024-04-22 06:05:12 +00:00 |
|
Gursheen Kaur Anand
|
a8866b61a1
|
Merge pull request #41124 from frappe/mergify/bp/version-15-hotfix/pr-40769
fix: budget validation for purchase orders (backport #40769)
|
2024-04-21 18:57:15 +05:30 |
|
rohitwaghchaure
|
f733eddf0b
|
Merge pull request #41122 from frappe/mergify/bp/version-15-hotfix/pr-41120
fix: search not working for so in the Production Plan (backport #36459) (backport #41120)
|
2024-04-21 17:24:42 +05:30 |
|
Gursheen Anand
|
ba99bc5fff
|
refactor: show list for expense breakup
(cherry picked from commit 9a12376e29)
|
2024-04-21 11:26:31 +00:00 |
|
Gursheen Anand
|
e047e1eb15
|
feat: show expense breakup
(cherry picked from commit 59292a09c4)
|
2024-04-21 11:26:31 +00:00 |
|
Gursheen Anand
|
c72478c74d
|
fix: do not add actual expense twice for validating budget
(cherry picked from commit af26ac96e9)
|
2024-04-21 11:26:30 +00:00 |
|
rohitwaghchaure
|
544e56a71c
|
fix: search not working for so in the Production Plan (#36459)
fix: search not working for so
(cherry picked from commit 8c57d56240)
(cherry picked from commit 9a6e762b8b)
|
2024-04-21 11:21:04 +00:00 |
|
rohitwaghchaure
|
bb5096075f
|
Merge pull request #41114 from frappe/mergify/bp/version-15-hotfix/pr-41099
fix: not able to update default supplier from Supplier Quotation Comparison report (backport #41099)
|
2024-04-20 19:47:01 +05:30 |
|
Rohit Waghchaure
|
80891daaed
|
fix: not able to update default supplier from Supplier Quotation Comparison report
(cherry picked from commit ad8e189c26)
|
2024-04-20 05:51:36 +00:00 |
|
rohitwaghchaure
|
77a764e5bd
|
Merge pull request #41107 from frappe/mergify/bp/version-15-hotfix/pr-41102
fix: balance qty for stock ledger report (backport #41102)
|
2024-04-20 11:16:06 +05:30 |
|
Rohit Waghchaure
|
74ed656bb9
|
fix: balance qty for stock ledger report
(cherry picked from commit f00ae0b92b)
|
2024-04-19 16:22:16 +00:00 |
|
rohitwaghchaure
|
82ce228433
|
Merge pull request #41097 from frappe/mergify/bp/version-15-hotfix/pr-41067
fix: validation for zero qty in SABB (backport #41067)
|
2024-04-19 21:49:55 +05:30 |
|
Deepesh Garg
|
d7ddb00e86
|
fix: Permission for lower dedcution certificate
(cherry picked from commit f6f118855b)
# Conflicts:
# erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
|
2024-04-19 10:11:47 +00:00 |
|
Rohit Waghchaure
|
85796b3534
|
fix: validation for zero qty in SABB
(cherry picked from commit 497f560b4b)
|
2024-04-19 09:41:27 +00:00 |
|
Frappe PR Bot
|
b582570022
|
chore(release): Bumped to Version 15.20.6
## [15.20.6](https://github.com/frappe/erpnext/compare/v15.20.5...v15.20.6) (2024-04-19)
### Bug Fixes
* account and stock manager read perm ([6cc7c08](6cc7c08ccf))
v15.20.6
|
2024-04-19 08:40:13 +00:00 |
|
Gursheen Kaur Anand
|
8914bce3d8
|
Merge pull request #41095 from frappe/mergify/bp/version-15/pr-41093
fix: accounts manager perm for FY (backport #41093)
|
2024-04-19 14:08:59 +05:30 |
|
Gursheen Anand
|
6cc7c08ccf
|
fix: account and stock manager read perm
(cherry picked from commit 572e844a91)
|
2024-04-19 08:05:05 +00:00 |
|
Gursheen Kaur Anand
|
a1fb289290
|
Merge pull request #41093 from GursheenK/fy-accounts-manager-perm
fix: accounts manager perm for FY
|
2024-04-19 13:28:32 +05:30 |
|
Gursheen Anand
|
572e844a91
|
fix: account and stock manager read perm
|
2024-04-19 13:05:25 +05:30 |
|
rohitwaghchaure
|
906b9562de
|
Merge pull request #41084 from frappe/mergify/bp/version-15-hotfix/pr-41083
fix: validation for fraction number in Work Order (backport #41083)
|
2024-04-18 15:56:07 +05:30 |
|
Rohit Waghchaure
|
ef2553edf9
|
fix: validation for fraction number in Work Order
(cherry picked from commit f8305c2fc0)
|
2024-04-18 09:15:49 +00:00 |
|
mergify[bot]
|
93242ca883
|
fix: validate uom is integer for PR item (backport #41074) (#41077)
fix: validate uom is integer for PR item
(cherry picked from commit 9a290fdfc9)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-18 07:53:20 +05:30 |
|
mergify[bot]
|
ee7aaf0ea4
|
fix: don't attempt to set gender from salutation (backport #40997) (#41073)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: don't attempt to set gender from salutation (#40997)
|
2024-04-17 17:53:43 +02:00 |
|
mergify[bot]
|
1ae447e4fc
|
fix: do not add qty to supplied items (backport #41061) (#41066)
fix: do not add qty to supplied items
(cherry picked from commit 8233c392fb)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
|
2024-04-17 17:30:43 +05:30 |
|