mergify[bot]
b8f4c3193a
fix: SBB Total Qty validation for SE (backport #39335 ) (backport #39348 ) ( #39353 )
...
fix: SBB Total Qty validation for SE
(cherry picked from commit c20241fcb5d7269c08c38f51c92bf73289650708)
(cherry picked from commit ca18853785757380a6070f36c0d907693de6b167)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-13 10:25:53 +05:30
Frappe PR Bot
1dc85fcaf8
chore(release): Bumped to Version 15.10.0
...
# [15.10.0](https://github.com/frappe/erpnext/compare/v15.9.1...v15.10.0 ) (2024-01-10)
### Bug Fixes
* add expected_start_date in sort by ([b064944](b0649447530784488eece62dd0d7cb277aa7bc2b#39244 ](https://github.com/frappe/erpnext/issues/39244 )) ([#39250 ](https://github.com/frappe/erpnext/issues/39250 )) ([0898ea5](0898ea5d92#39113 ](https://github.com/frappe/erpnext/issues/39113 )) ([5e46937](5e4693763a#39140 ](https://github.com/frappe/erpnext/issues/39140 )) ([#39169 ](https://github.com/frappe/erpnext/issues/39169 )) ([f3882a8](f3882a854f#39262 ](https://github.com/frappe/erpnext/issues/39262 )) ([#39264 ](https://github.com/frappe/erpnext/issues/39264 )) ([78c65f2](78c65f27b0#39188 ](https://github.com/frappe/erpnext/issues/39188 )) ([#39192 ](https://github.com/frappe/erpnext/issues/39192 )) ([672e6d6](672e6d6d06#39126 ](https://github.com/frappe/erpnext/issues/39126 )) ([6020c8e](6020c8e8f7#39200 ](https://github.com/frappe/erpnext/issues/39200 )) ([#39211 ](https://github.com/frappe/erpnext/issues/39211 )) ([abc99f8](abc99f84e9#39135 ](https://github.com/frappe/erpnext/issues/39135 )) ([#39198 ](https://github.com/frappe/erpnext/issues/39198 )) ([3caf462](3caf462c6b87d1b0f4769e1b443857#39103 ](https://github.com/frappe/erpnext/issues/39103 )) ([aad39cf](aad39cf686e89dce726b#39247 ](https://github.com/frappe/erpnext/issues/39247 )) ([#39255 ](https://github.com/frappe/erpnext/issues/39255 )) ([9f793b9](9f793b9b2851d8a7a0c11d2e831846#39149 ](https://github.com/frappe/erpnext/issues/39149 )) ([#39151 ](https://github.com/frappe/erpnext/issues/39151 )) ([82b96d3](82b96d368816269b0730fec892c211#39164 ](https://github.com/frappe/erpnext/issues/39164 )) ([#39273 ](https://github.com/frappe/erpnext/issues/39273 )) ([5d6bc96](5d6bc96375#39009 ](https://github.com/frappe/erpnext/issues/39009 )
* Purchase date and amount is not mandatory for composite asset creation ([d6d54ed](d6d54ed220afefae08af#39114 ](https://github.com/frappe/erpnext/issues/39114 )) ([#39143 ](https://github.com/frappe/erpnext/issues/39143 )) ([2db1e1a](2db1e1a737f0070b4046#39286 ](https://github.com/frappe/erpnext/issues/39286 )) ([#39288 ](https://github.com/frappe/erpnext/issues/39288 )) ([fe973a4](fe973a4b5350300b9be6#39275 ](https://github.com/frappe/erpnext/issues/39275 )) ([#39281 ](https://github.com/frappe/erpnext/issues/39281 )) ([2598f8e](2598f8e7ec#39242 ](https://github.com/frappe/erpnext/issues/39242 )) ([#39266 ](https://github.com/frappe/erpnext/issues/39266 )) ([f00a6f6](f00a6f6c597640feaaa7756c062733#39252 ](https://github.com/frappe/erpnext/issues/39252 )) ([#39260 ](https://github.com/frappe/erpnext/issues/39260 )) ([bb6025c](bb6025ca2654a0df5164#39167 ](https://github.com/frappe/erpnext/issues/39167 )) ([#39186 ](https://github.com/frappe/erpnext/issues/39186 )) ([926850d](926850d1f6a147e2954f#39118 ](https://github.com/frappe/erpnext/issues/39118 )) ([#39120 ](https://github.com/frappe/erpnext/issues/39120 )) ([40ec5ff](40ec5ff90f#39127 ](https://github.com/frappe/erpnext/issues/39127 )) ([#39144 ](https://github.com/frappe/erpnext/issues/39144 )) ([b192ddd](b192ddd13b
2024-01-10 10:36:08 +00:00
Deepesh Garg
e4e3313a0e
Merge pull request #39245 from frappe/version-15-hotfix
...
chore: release v15
2024-01-10 16:04:56 +05:30
mergify[bot]
2598f8e7ec
fix: Show timesheet table after fetching data from timesheet (backport #39275 ) ( #39281 )
...
fix: Show timesheet table after fetching data from timesheet
(cherry picked from commit e1ba5878a3c61d44006dbc5f1f269e6a2542583c)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2024-01-10 12:33:24 +05:30
mergify[bot]
fe973a4b53
fix: set parent doctype on chart (backport #39286 ) ( #39288 )
...
fix: set parent doctype on chart (#39286 )
(cherry picked from commit 38c5ecf007751b0e3b152ee5089e7a8e00f17f41)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-10 12:27:16 +05:30
Nabin Hait
f82125144a
Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163
...
fix: Purchase information is not required for creating a composite asset (backport #39163 )
2024-01-10 12:15:02 +05:30
Nabin Hait
38c1350018
Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191
...
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191 )
2024-01-10 12:14:45 +05:30
Nabin Hait
24cfcf36e4
Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238
...
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238 )
2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90
Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214
...
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214 )
2024-01-10 12:12:32 +05:30
ruthra kumar
cd57bbc3d0
Merge pull request #39284 from frappe/mergify/bp/version-15-hotfix/pr-39282
...
fix: possible typeerror on transaction.js (backport #39282 )
2024-01-10 12:00:43 +05:30
Nabin Hait
afefae08af
fix: Resolved conflict
2024-01-10 11:59:54 +05:30
ruthra kumar
fec892c211
fix: possible typeerror on transaction.js
...
(cherry picked from commit 9f27ac142b6239bb01fb8304056776f1fae24694)
2024-01-10 06:24:46 +00:00
Nabin Hait
87d1b0f476
fix: Ignore asset qty and status validation while cancelling LCV
...
(cherry picked from commit e9d36242ce3e09ee423f917eede2275bded10d6d)
2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046
fix: Set asset purchase amount based on qty and valuation_rate
...
(cherry picked from commit 135e19d0aab3b1f4ae2361b327c579468d71d6d6)
2024-01-10 06:03:01 +00:00
mergify[bot]
5d6bc96375
fix: projects website list visible for guests and all logged in customers (backport #39164 ) ( #39273 )
...
fix: projects website list visible for guests and all logged in customers (#39164 )
* fix: projects website list visible for guests
fix: projects website list visible for guests and all logged in customers
see the issue for details
fixes issue #39009
* fix: remove user = frappe.session.user
(cherry picked from commit eabf706f3728f0e571ea54fb825462a76984f245)
Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
2024-01-10 10:45:45 +05:30
Raffael Meyer
4fa978ef1f
test: fix wrong fieldname ( #39270 )
2024-01-10 10:32:01 +05:30
mergify[bot]
f00a6f6c59
fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242 ) ( #39266 )
...
fix: skip rate validation for return `DN Items` with `Moving Average` valuation
(cherry picked from commit e0ad52b50036e689247f23090a5de89a7fb4abfa)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-09 22:02:20 +05:30
mergify[bot]
78c65f27b0
fix: Duplicate Closing Stock Balance (backport #39262 ) ( #39264 )
...
fix: Duplicate Closing Stock Balance
(cherry picked from commit b15795392bdf8165e7ddfb60451353ebefa177d2)
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-09 20:37:38 +05:30
Raffael Meyer
a326876cc5
Merge pull request #39258 from frappe/mergify/bp/version-15-hotfix/pr-39158
...
fix: add read permission to Buying Settings (backport #39158 )
2024-01-09 13:34:56 +01:00
mergify[bot]
9f793b9b28
fix: incorrect indicator title for portal sales order (backport #39247 ) ( #39255 )
...
fix: incorrect indicator title for portal sales order (#39247 )
(cherry picked from commit 2d2ff7cf52a548b8e880cd212cbbe6ef4569ea28)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 17:42:27 +05:30
mergify[bot]
bb6025ca26
fix: TypeError is pricing rules (backport #39252 ) ( #39260 )
...
fix: TypeError is pricing rules (#39252 )
(cherry picked from commit 274c65c451ccc71f11f29a2abc6d13b2b49b776c)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 17:41:53 +05:30
ruthra kumar
4ad61fc3a5
Merge pull request #39253 from frappe/mergify/bp/version-15-hotfix/pr-39251
...
fix: update status on manual allocation (backport #39251 )
2024-01-09 16:36:35 +05:30
s-aga-r
e62dd0d7cb
fix: add read permission to Buying Settings
...
(cherry picked from commit e05bf9d32a00aac55021faaacbfa914ee9f7275a)
2024-01-09 10:44:21 +00:00
ruthra kumar
a147e2954f
fix: update status on manual allocation
...
(cherry picked from commit d32a407e08609737fa0bc880d5ef737ebf2b3e4c)
2024-01-09 10:29:36 +00:00
mergify[bot]
0898ea5d92
fix: BOM replace tool does not update exploded items of root (backport #39244 ) ( #39250 )
...
fix: BOM replace tool does not update exploded items of root (#39244 )
(cherry picked from commit 5e0d017497ef7afaaa70abffbd3d3924f9e56063)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-09 15:59:12 +05:30
ruthra kumar
d0688e7a55
Merge pull request #39241 from frappe/mergify/bp/version-15-hotfix/pr-39237
...
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237 )
2024-01-09 14:40:24 +05:30
ruthra kumar
756c062733
fix: total allocated percentage for sales team issue
...
(cherry picked from commit b498094a9759bb95a3c77c6ec6877aafc6daa0ea)
2024-01-09 07:39:28 +00:00
ruthra kumar
ec7a60bd02
Merge pull request #39234 from frappe/mergify/bp/version-15-hotfix/pr-39196
...
fix: bank transaction status upon reconciliation (backport #39196 )
2024-01-09 11:57:50 +05:30
ruthra kumar
53eb6129ea
refactor: remove 'Bank Trasaction' logic from status_update
...
(cherry picked from commit cf988434e9e4fd7f7c6df2b024902f8df9942ca3)
2024-01-09 05:51:38 +00:00
ruthra kumar
277aa7bc2b
fix: bank transction status upon reconciliation
...
(cherry picked from commit 6de8c18f9803c055c17e220f8f8d7eed5dfb45c6)
2024-01-09 05:51:37 +00:00
Nabin Hait
97a51487c1
Merge pull request #39219 from frappe/mergify/bp/version-15-hotfix/pr-39209
...
fix: Introduced company field to show amounts in company currency (backport #39209 )
2024-01-08 21:53:16 +05:30
Nabin Hait
1d2e831846
fix: Introduced company field to show amounts in company currency
...
(cherry picked from commit eab22eb2822055e0e04adf853879237c00988572)
2024-01-08 16:09:42 +00:00
Nabin Hait
50300b9be6
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog
...
(cherry picked from commit c14986f9e6e617b67e97c8d25843a4dc33b77dcf)
2024-01-08 16:07:23 +00:00
mergify[bot]
abc99f84e9
fix: FG Item incorrect qty in the work order (backport #39200 ) ( #39211 )
...
fix: FG Item incorrect qty in the work order (#39200 )
(cherry picked from commit 466625213b6355b53b7af3ee1682cee6fc8649a4)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-08 18:18:32 +05:30
mergify[bot]
3caf462c6b
fix: flaky demo test case (backport #39135 ) ( #39198 )
...
fix: flaky demo test case
(cherry picked from commit 5b1571879cdb7859725bda2b0d32d9a4f57676e8)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-01-08 17:44:24 +05:30
Shariq Ansari
58357f8891
Merge pull request #39206 from frappe/mergify/bp/version-15-hotfix/pr-39204
...
fix: add expected_start_date in sort by (backport #39204 )
2024-01-08 16:37:37 +05:30
Shariq Ansari
8cc9ddaebd
chore: linter fix
2024-01-08 16:30:26 +05:30
Shariq Ansari
1f64b8fcd8
chore: linter fix
2024-01-08 16:30:03 +05:30
Shariq Ansari
80a2b79bba
chore: linter fix
2024-01-08 16:29:13 +05:30
Shariq Ansari
b064944753
fix: add expected_start_date in sort by
...
(cherry picked from commit 3d54fd8389c41b14e8002518b111ebd71fd94186)
2024-01-08 10:40:20 +00:00
mergify[bot]
672e6d6d06
fix: duplicate entry for serial / batch creation (backport #39188 ) ( #39192 )
...
fix: duplicate entry for serial / batch creation (#39188 )
(cherry picked from commit b96c063c93532b8910b910b04750b3de367954cc)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-08 14:21:04 +05:30
mergify[bot]
926850d1f6
fix: update Maintenance Schedule status on Maintenance Visit submit (backport #39167 ) ( #39186 )
...
* fix: make `Sales Person` non-mandatory
(cherry picked from commit 4d56f725fe23495fa2392be01545c5d2fa8889b3)
* fix: update Maintenance Schedule status on Maintenance Visit submit
(cherry picked from commit cd293a5173aaec693afee23e9b874b1db649a267)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-01-08 13:23:12 +05:30
Nabin Hait
d6d54ed220
fix: Purchase date and amount is not mandatory for composite asset creation
...
(cherry picked from commit c34f09c503b367f6ea1eee5e24f8aa6e94976e01)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
2024-01-08 06:53:11 +00:00
Nabin Hait
e89dce726b
fix: improved validation message
...
(cherry picked from commit fe43dab4d78091e626ddfb6432b2d69f84793d92)
2024-01-08 06:53:10 +00:00
ruthra kumar
83288fedf1
Merge pull request #39187 from ruthra-kumar/backport_37613
...
fix: possible key error in Financial Ratio's report
2024-01-08 12:08:13 +05:30
ruthra kumar
16269b0730
fix: possible key error on Financial ratios report
2024-01-08 11:50:13 +05:30
ruthra kumar
f1d25700a8
Merge pull request #39183 from frappe/mergify/bp/version-15-hotfix/pr-39161
...
refactor: allow sales invoice in Bank Reconciliation tool (backport #39161 )
2024-01-08 11:09:42 +05:30
ruthra kumar
00d36d14fb
refactor: allow sales invoice in Bank Reconciliation tool
...
(cherry picked from commit b69cdeb4a6c881642fd2e3a081f13b65191d44bc)
2024-01-08 05:02:30 +00:00
ruthra kumar
c912e4c99d
Merge pull request #39182 from frappe/mergify/bp/version-15-hotfix/pr-39165
...
fix: incorrect outstanding amt validation on advance as liability (backport #39165 )
2024-01-08 10:31:17 +05:30
ruthra kumar
1eee52c59c
Merge pull request #39181 from frappe/mergify/bp/version-15-hotfix/pr-39159
...
refactor: prevent permission error by always processing bulk transaction in background (backport #39159 )
2024-01-08 10:30:48 +05:30
