Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(Leave Type): translatability of tour step (backport #1371) #1373

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #1371 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix(Leave Type): translatability of tour step

* fix(Leave Applications): make role and settings translatable

* chore: fix tour messages

---------

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit febb7d9)
@mergify mergify bot requested a review from ruchamahabal as a code owner February 2, 2024 05:36
@ruchamahabal ruchamahabal merged commit 3fa14df into version-15-hotfix Feb 2, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1371 branch February 2, 2024 05:45
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))
@frappe-pr-bot
Copy link
Collaborator

🎉 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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants