fix: Pluralize year text instead of optional bracket #31210
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
ruchamahabal
reviewed
Jun 1, 2022
|
Unrelated test failure |
mergify bot
pushed a commit
that referenced
this pull request
Jun 1, 2022
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> (cherry picked from commit 37433aa)
ruchamahabal
added a commit
that referenced
this pull request
Jun 1, 2022
#31212) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Mohammad Hussain Nagaria <34810212+NagariaHussain@users.noreply.github.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jun 7, 2022
# [13.33.0](v13.32.0...v13.33.0) (2022-06-07) ### Bug Fixes * Close unsecured terms loans ([d6d1d79](d6d1d79)) * Consider only Approved leave applications in LWP, Employee Benefit calculations ([7f84c86](7f84c86)) * display currencies in validation message. ([ef22337](ef22337)) * incorrect billed_qty in sales order analysis report when multiple delivery notes for item (backport [#31194](#31194)) ([#31250](#31250)) ([3b1f6da](3b1f6da)) * incorrect LWP calculation for half days in employee benefit application ([10f0c93](10f0c93)) * **India:** GSTIN filter in GSTR-1 report ([abe9fe7](abe9fe7)) * **India:** Supplies from composite dealer not showing up ([15712c7](15712c7)) * **job card:** only hold during draft state (backport [#31243](#31243)) ([#31249](#31249)) ([a7fc278](a7fc278)) * **Leave Application:** 'Cancelled' status shown as 'Open' in list view ([8b48d45](8b48d45)) * leave balance for earned leaves in backdated Leave Application dashboard (backport [#31253](#31253)) ([#31256](#31256)) ([a22d92f](a22d92f)) * only fetch membership expiry if not already set in `member.js` ([#31259](#31259)) ([d433784](d433784)) * Parent dimension filters in orders ([b3cbcd8](b3cbcd8)) * Pluralize year text instead of optional bracket (backport [#31210](#31210)) ([#31212](#31212)) ([b31709c](b31709c)) * re-validate warehouse after 'update items' (backport [#31203](#31203)) ([#31206](#31206)) ([3a718c7](3a718c7)) * remove leave policy assignment creation patch (backport [#31097](#31097)) ([#31204](#31204)) ([4aeb448](4aeb448)) * Remove redundant query ([3c4cf59](3c4cf59)) * Reverse provisional entries on Purchase Invoice cancel ([1fba432](1fba432)) * **Sales Register:** incorrect query with dimensions (backport [#31242](#31242)) ([#31251](#31251)) ([0badfc8](0badfc8)) * Simply cancel reverse entries ([100b8d9](100b8d9)) ### Features * **india:** Improve E-way Bill Cancellation. ([#31088](#31088)) ([622d25e](622d25e))
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.
The Problem
The email sent for Work anniversary reminders uses optional brackets (
"(s)") to suffix number of years. It looks odd and even worse if multiple people have anniversaries on the same day (see below for an instance).The Fix
Conditionally add
"year"or"years"based on number of years completed at the Company.Before:
After: