Dany Robert
|
acfee42735
|
fix: expense causing p&l test case to fail
(cherry picked from commit 01888c98bc)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
62966ac550
|
chore: semgrep
(cherry picked from commit 581af4eced)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
23c3c3cc0c
|
fix: test case for zero deferred expense
(cherry picked from commit 7ef4dbcaf6)
|
2024-04-29 04:55:32 +00:00 |
|
Dany Robert
|
0a65a37eed
|
fix: missing def expense if no exp in first month
(cherry picked from commit 5c9ce575f6)
|
2024-04-29 04:55:31 +00:00 |
|
ruthra kumar
|
0df1005cb2
|
Merge pull request #41209 from frappe/mergify/bp/version-15-hotfix/pr-41208
fix: set receivable account based on response type (backport #41208)
|
2024-04-26 20:30:55 +05:30 |
|
rohitwaghchaure
|
807b2d5c0a
|
Merge pull request #41206 from frappe/mergify/bp/version-15-hotfix/pr-41165
feat: allow to do reposting for all stock transactions (audit) (backport #41165)
|
2024-04-26 14:25:40 +05:30 |
|
ruthra kumar
|
f65b28a189
|
fix: handle and receivable accounts based on response type
(cherry picked from commit 066859cca0)
|
2024-04-26 08:43:23 +00:00 |
|
rohitwaghchaure
|
a292e52b34
|
chore: fix conflicts
|
2024-04-26 13:47:03 +05:30 |
|
Rohit Waghchaure
|
4555f8a9a6
|
feat: allow to do reposting for all transactions (audit)
(cherry picked from commit aefbe21b46)
# Conflicts:
# erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
|
2024-04-26 08:15:11 +00:00 |
|
rohitwaghchaure
|
0fea5564b6
|
Merge pull request #41201 from frappe/mergify/bp/version-15-hotfix/pr-41185
fix: args when get the delivery note in delivery trip (backport #41185)
|
2024-04-26 13:34:44 +05:30 |
|
rohitwaghchaure
|
476b7f43a2
|
Merge pull request #41202 from frappe/mergify/bp/version-15-hotfix/pr-41182
fix: rendering the email template when user HTML (backport #41182)
|
2024-04-26 13:34:27 +05:30 |
|
rohitwaghchaure
|
d5d846f481
|
Merge pull request #41203 from frappe/mergify/bp/version-15-hotfix/pr-41167
fix: warehouse type filter for stock reports (backport #41167)
|
2024-04-26 13:34:00 +05:30 |
|
rohitwaghchaure
|
6fd356b654
|
chore: fix conflicts
|
2024-04-26 13:13:55 +05:30 |
|
Rohit Waghchaure
|
48351d6da8
|
fix: warehouse type filter for stock reports
(cherry picked from commit 4250ac821f)
|
2024-04-26 07:41:48 +00:00 |
|
Nihantra C. Patel
|
3068dad410
|
fix: rendering the email template when user HTML
(cherry picked from commit 7cb66f7fd3)
|
2024-04-26 07:41:37 +00:00 |
|
Nihantra Patel
|
61d6838b2c
|
fix: args when get the delivery note in delivery trip
(cherry picked from commit ca577f7aaa)
|
2024-04-26 07:40:36 +00:00 |
|
Nihantra Patel
|
e9acacdd5d
|
fix: args when get the delivery note in delivery trip
(cherry picked from commit 2f359e201d)
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.py
|
2024-04-26 07:40:36 +00:00 |
|
rohitwaghchaure
|
3bb26fde2b
|
Merge pull request #41199 from frappe/mergify/bp/version-15-hotfix/pr-41195
fix: basic rate for SABB (backport #41195)
|
2024-04-26 12:54:46 +05:30 |
|
Rohit Waghchaure
|
7b7987363f
|
fix: basic rate for SABB
(cherry picked from commit 7fa94843aa)
|
2024-04-26 07:21:46 +00:00 |
|
rohitwaghchaure
|
3193ef0a89
|
Merge pull request #41197 from frappe/mergify/bp/version-15-hotfix/pr-41192
fix: duplicate column in the stock ledger report (backport #41192)
|
2024-04-26 12:49:25 +05:30 |
|
Rohit Waghchaure
|
a62298a635
|
fix: duplicate column in the stock ledger report
(cherry picked from commit be7fd6bfb4)
|
2024-04-26 06:53:14 +00:00 |
|
Frappe PR Bot
|
6a7b6f6262
|
chore(release): Bumped to Version 15.21.2
## [15.21.2](https://github.com/frappe/erpnext/compare/v15.21.1...v15.21.2) (2024-04-26)
### Bug Fixes
* enable advance in separate acc only for customer and Supplier ([6da927a](6da927a573))
v15.21.2
|
2024-04-26 02:10:51 +00:00 |
|
ruthra kumar
|
5b389bf5ca
|
Merge pull request #41191 from frappe/mergify/bp/version-15/pr-41183
fix: restrict Advance in separate party to customer and supplier (backport #41183)
|
2024-04-26 07:39:32 +05:30 |
|
ruthra kumar
|
6da927a573
|
fix: enable advance in separate acc only for customer and Supplier
(cherry picked from commit 3c1af2acf0)
|
2024-04-26 01:50:34 +00:00 |
|
ruthra kumar
|
e6c7832485
|
Merge pull request #41189 from frappe/mergify/bp/version-15-hotfix/pr-41183
fix: restrict Advance in separate party to customer and supplier (backport #41183)
|
2024-04-25 20:35:50 +05:30 |
|
ruthra kumar
|
c3073d6e74
|
fix: enable advance in separate acc only for customer and Supplier
(cherry picked from commit 3c1af2acf0)
|
2024-04-25 14:30:58 +00:00 |
|
mergify[bot]
|
b34582e6ba
|
fix: handle stock balance unbuffered_cursor error (backport #41186) (#41188)
fix: handle stock balance unbuffered_cursor error (#41186)
(cherry picked from commit 341fb6d8f3)
Co-authored-by: Ankush Menat <ankush@frappe.io>
|
2024-04-25 17:26:26 +05:30 |
|
ruthra kumar
|
5136ffd10d
|
Merge pull request #41139 from frappe/mergify/bp/version-15-hotfix/pr-41086
fix: prevent foreign currency accounts as advance accounts. (backport #41086)
|
2024-04-25 09:37:49 +05:30 |
|
Frappe PR Bot
|
cacb5bfe03
|
chore(release): Bumped to Version 15.21.1
## [15.21.1](https://github.com/frappe/erpnext/compare/v15.21.0...v15.21.1) (2024-04-25)
### Bug Fixes
* mode of payment has precedance ([0dfd6fa](0dfd6facc1))
v15.21.1
|
2024-04-25 03:38:33 +00:00 |
|
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 |
|
ruthra kumar
|
5988941032
|
Merge pull request #41177 from frappe/mergify/bp/version-15-hotfix/pr-41142
fix: mode of payment has precedance in Payment Entry (backport #41142)
|
2024-04-25 08:55:20 +05:30 |
|
ruthra kumar
|
c6145a1101
|
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:13:13 +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 |
|