fix: employee advance option added to payment entry #1380
Merged
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
bhavesh95863
changed the title
ruchamahabal
reviewed
Feb 4, 2024
ruchamahabal
approved these changes
Feb 5, 2024
mergify bot
pushed a commit
that referenced
this pull request
Feb 5, 2024
* fix: employee advance option added to payment entry * fix: Removed duplicate filter for expense claim. --------- Co-authored-by: nesscale-com <[email protected]> (cherry picked from commit b51df74)
ruchamahabal
pushed a commit
that referenced
this pull request
Feb 5, 2024
…1385) * fix: employee advance option added to payment entry * fix: Removed duplicate filter for expense claim. --------- Co-authored-by: nesscale-com <[email protected]> (cherry picked from commit b51df74) Co-authored-by: Bhavesh Maheshwari <[email protected]>
mergify bot
pushed a commit
that referenced
this pull request
Feb 5, 2024
* fix: employee advance option added to payment entry * fix: Removed duplicate filter for expense claim. --------- Co-authored-by: nesscale-com <[email protected]> (cherry picked from commit b51df74)
ruchamahabal
pushed a commit
that referenced
this pull request
Feb 5, 2024
…1386) * fix: employee advance option added to payment entry * fix: Removed duplicate filter for expense claim. --------- Co-authored-by: nesscale-com <[email protected]> (cherry picked from commit b51df74) Co-authored-by: Bhavesh Maheshwari <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 6, 2024
## [14.21.5](v14.21.4...v14.21.5) (2024-02-06) ### Bug Fixes * "is_query_report" check for Vehicle Expenses Report (backport [#1383](#1383)) ([#1387](#1387)) ([26b9404](26b9404)) * employee advance option added to payment entry (backport [#1380](#1380)) ([#1385](#1385)) ([db530c1](db530c1)) * **Leave Type:** translatability of tour step (backport [#1371](#1371)) ([#1372](#1372)) ([f2d9039](f2d9039))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 6, 2024
# [15.11.0](v15.10.0...v15.11.0) (2024-02-06) ### Bug Fixes * "is_query_report" check for Vehicle Expenses Report (backport [#1383](#1383)) ([#1388](#1388)) ([bee2c3c](bee2c3c)) * accounts validation ([5d1d030](5d1d030)) * employee advance option added to payment entry ([#1380](#1380)) ([b51df74](b51df74)) * **Leave Type:** translatability of tour step (backport [#1371](#1371)) ([#1373](#1373)) ([3fa14df](3fa14df)) * reset old code field values on update for better readability in the doctype form ([79f4616](79f4616)) * sanitize condition and formulae expressions before validation ([f17608f](f17608f)) * sanitize structure fields + reset fields on `on_update` for readability ([f626c4e](f626c4e)) * save formula/condition changes in version ([26f6b75](26f6b75)) * separate tab for HR and Payroll in company ([b9018d9](b9018d9)) * **Shift Attendance:** conversion of datetime to time for same date for None values (backport [#1345](#1345)) ([#1391](#1391)) ([d202c16](d202c16)) * update only submitted salary structures ([3870a0e](3870a0e)) ### Features * add autocompletion to code fields ([3fed929](3fed929)) * add autocompletions for Salary Structure and Salary Slip fields ([4956792](4956792)) * add employee field autocompletions ([f86b484](f86b484)) * add option to sync formula and condition for existing structures ([076f23f](076f23f)) * add Salary Structure Assignment to autocompletions ([d0dca02](d0dca02)) * add success toast ([cd8ac08](cd8ac08)) * add syntax highlighting to code fields ([160d9cb](160d9cb)) * add warning for unset accounts on insert ([8c55170](8c55170)) * increase base/variable weight in autocompletions ([7199511](7199511)) * **Salary Structure:** add syntax highlighting ([37641a6](37641a6)) * setup autocompletions for salary structure fields ([bd2d3de](bd2d3de)) * show alert in case of no Salary Structures to be updated ([7a54e4e](7a54e4e)) * show Salary Structures to be updated in confirm dialog ([bf96267](bf96267)) * use form links for structures in confirm dialog ([907eb93](907eb93))
|
🎉 This PR is included in version 15.11.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We can create a payment entry for an employee advance using a custom button within the 'Employee Advance' Doctype. However, currently, there is no direct way to select and process multiple employee advances together within the payment entry.
Before:
After:
