fix(Employee): treeview #39126
Merged
fix(Employee): treeview #39126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
barredterra
added
backport version-15-hotfix
backport version-14-hotfix
barredterra
force-pushed
the
fix-employee-tree
branch
from
8578383
to
1c5b77f
Compare
|
The failing unit test is unrelated / failing for all PRs |
ruchamahabal
approved these changes
Jan 4, 2024
mergify bot
pushed a commit
that referenced
this pull request
Jan 4, 2024
(cherry picked from commit e912e95)
mergify bot
pushed a commit
that referenced
this pull request
Jan 4, 2024
(cherry picked from commit e912e95)
barredterra
added a commit
that referenced
this pull request
Jan 4, 2024
…-39126 fix(Employee): treeview (backport #39126)
barredterra
added a commit
that referenced
this pull request
Jan 4, 2024
…-39126 fix(Employee): treeview (backport #39126)
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 10, 2024
# [14.59.0](v14.58.1...v14.59.0) (2024-01-10) ### Bug Fixes * add read permission to Buying Settings (backport [#39158](#39158)) ([#39257](#39257)) ([a15ad80](a15ad80)) * asset WDV depreciation calc according to IT act ([1cbe1e8](1cbe1e8)) * BOM replace tool does not update exploded items of root (backport [#39244](#39244)) ([#39249](#39249)) ([c2eeeec](c2eeeec)) * don't set rate for non-stock item in Internal Transfer (backport [#39140](#39140)) ([#39168](#39168)) ([06d193a](06d193a)) * Duplicate Closing Stock Balance (backport [#39262](#39262)) ([#39263](#39263)) ([a3146c3](a3146c3)) * **Employee:** treeview ([#39126](#39126)) ([080a742](080a742)) * FG Item incorrect qty in the work order (backport [#39200](#39200)) ([#39210](#39210)) ([5e517cf](5e517cf)) * Ignore asset qty and status validation while cancelling LCV ([952cee3](952cee3)) * Ignore UP on "allowed to transact with" (backport [#39103](#39103)) ([#39104](#39104)) ([7d64df0](7d64df0)) * improved validation message ([580e9f6](580e9f6)) * incorrect indicator title for portal sales order (backport [#39247](#39247)) ([#39254](#39254)) ([8c496fb](8c496fb)) * inventory dimension negative stock validation (backport [#39149](#39149)) ([#39150](#39150)) ([2866f7c](2866f7c)) * possible typeerror on transaction.js ([8fe346a](8fe346a)) * Purchase date and amount is not mandatory for composite asset creation ([0f6477a](0f6477a)) * remove global _("translation") calls (backport [#32828](#32828)) ([#39231](#39231)) ([ee7474b](ee7474b)) * resolved conflict ([b529883](b529883)) * set `First Name` in Supplier Contact ([69c460c](69c460c)) * Set asset purchase amount based on qty and valuation_rate ([41e3843](41e3843)) * set parent doctype on chart (backport [#39286](#39286)) ([#39287](#39287)) ([a2a8558](a2a8558)) * Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog ([7b4b630](7b4b630)) * Show timesheet table after fetching data from timesheet (backport [#39275](#39275)) ([#39280](#39280)) ([1cc887a](1cc887a)) * skip rate validation for return `DN Items` with `Moving Average` valuation (backport [#39242](#39242)) ([#39265](#39265)) ([f42e93b](f42e93b)) * total allocated percentage for sales team issue ([71f9b7f](71f9b7f)) * TypeError is pricing rules (backport [#39252](#39252)) ([#39259](#39259)) ([36ba33c](36ba33c)) * typerror on multi select dialog ([71ecf08](71ecf08)) * update Maintenance Schedule status on Maintenance Visit submit (backport [#39167](#39167)) ([#39185](#39185)) ([2ea2146](2ea2146)) * **UX:** dont override framework's permission check messages (backport [#39118](#39118)) ([#39119](#39119)) ([26ae708](26ae708)) ### Features * Copy project_name, from_time, to_time from timesheet details to sales invoice ([#33726](#33726)) ([d0e1162](d0e1162))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 10, 2024
# [15.10.0](v15.9.1...v15.10.0) (2024-01-10) ### Bug Fixes * add expected_start_date in sort by ([b064944](b064944)) * Add name to Hungary - Chart of Accounts for Microenterprises json ([0784488](0784488)) * add read permission to Buying Settings ([e62dd0d](e62dd0d)) * bank transction status upon reconciliation ([277aa7b](277aa7b)) * BOM replace tool does not update exploded items of root (backport [#39244](#39244)) ([#39250](#39250)) ([0898ea5](0898ea5)) * Creating Asset Activity while Importing Asset ([#39113](#39113)) ([5e46937](5e46937)) * don't set rate for non-stock item in Internal Transfer (backport [#39140](#39140)) ([#39169](#39169)) ([f3882a8](f3882a8)) * Duplicate Closing Stock Balance (backport [#39262](#39262)) ([#39264](#39264)) ([78c65f2](78c65f2)) * duplicate entry for serial / batch creation (backport [#39188](#39188)) ([#39192](#39192)) ([672e6d6](672e6d6)) * **Employee:** treeview ([#39126](#39126)) ([6020c8e](6020c8e)) * FG Item incorrect qty in the work order (backport [#39200](#39200)) ([#39211](#39211)) ([abc99f8](abc99f8)) * flaky demo test case (backport [#39135](#39135)) ([#39198](#39198)) ([3caf462](3caf462)) * Ignore asset qty and status validation while cancelling LCV ([87d1b0f](87d1b0f)) * ignore cancelled payments in Sales/Purchase Register ([9e1b443](9e1b443)) * Ignore UP on "allowed to transact with" ([#39103](#39103)) ([aad39cf](aad39cf)) * improved validation message ([e89dce7](e89dce7)) * incorrect indicator title for portal sales order (backport [#39247](#39247)) ([#39255](#39255)) ([9f793b9](9f793b9)) * incorrect outstanding amt validation on advance as liability ([51d8a7a](51d8a7a)) * Introduced company field to show amounts in company currency ([1d2e831](1d2e831)) * inventory dimension negative stock validation (backport [#39149](#39149)) ([#39151](#39151)) ([82b96d3](82b96d3)) * possible key error on Financial ratios report ([16269b0](16269b0)) * possible typeerror on transaction.js ([fec892c](fec892c)) * projects website list visible for guests and all logged in customers (backport [#39164](#39164)) ([#39273](#39273)) ([5d6bc96](5d6bc96)), closes [#39009](#39009) * Purchase date and amount is not mandatory for composite asset creation ([d6d54ed](d6d54ed)) * Resolved conflict ([afefae0](afefae0)) * serial / batch barcode scanner (backport [#39114](#39114)) ([#39143](#39143)) ([2db1e1a](2db1e1a)) * Set asset purchase amount based on qty and valuation_rate ([f0070b4](f0070b4)) * set parent doctype on chart (backport [#39286](#39286)) ([#39288](#39288)) ([fe973a4](fe973a4)) * Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog ([50300b9](50300b9)) * Show timesheet table after fetching data from timesheet (backport [#39275](#39275)) ([#39281](#39281)) ([2598f8e](2598f8e)) * skip rate validation for return `DN Items` with `Moving Average` valuation (backport [#39242](#39242)) ([#39266](#39266)) ([f00a6f6](f00a6f6)) * Subscription update patch ([7640fea](7640fea)) * total allocated percentage for sales team issue ([756c062](756c062)) * TypeError is pricing rules (backport [#39252](#39252)) ([#39260](#39260)) ([bb6025c](bb6025c)) * typerror on multi select dialog ([54a0df5](54a0df5)) * update Maintenance Schedule status on Maintenance Visit submit (backport [#39167](#39167)) ([#39186](#39186)) ([926850d](926850d)) * update status on manual allocation ([a147e29](a147e29)) * **UX:** dont override framework's permission check messages (backport [#39118](#39118)) ([#39120](#39120)) ([40ec5ff](40ec5ff)) ### Features * provision to close SCO (backport [#39127](#39127)) ([#39144](#39144)) ([b192ddd](b192ddd))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Employee has a hierarchy defined by the Reports To field:
erpnext/erpnext/setup/doctype/employee/employee.py
Lines 26 to 27 in 351ee5b
However, this was not reflected in the DocType definition.
This PR fixes the doctype definition to be in accordance with the controller code. This is necessary for permissions and treeview utils to work correctly.
Related: frappe/frappe#24107