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

feat: allow fractional values for "Current Work Experience" field in gratuity doctype #2340

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

asmitahase
Copy link
Contributor

@asmitahase asmitahase commented Oct 25, 2024

Changed the fieldtype of Current Work Experience in Gratuity doctype from Int to Float, to allow fractional values while creating gratuity.
Screenshot 2024-10-25 at 3 50 36 PM
no-docs

@ruchamahabal ruchamahabal merged commit 08984a6 into frappe:version-15-hotfix Oct 25, 2024
8 of 9 checks passed
mergify bot pushed a commit that referenced this pull request Oct 25, 2024
…gratuity doctype (#2340)

(cherry picked from commit 08984a6)

# Conflicts:
#	hrms/payroll/doctype/gratuity/gratuity.json
ruchamahabal added a commit that referenced this pull request Oct 25, 2024
…gratuity doctype (backport #2340) (#2341)

Co-authored-by: Asmita Hase <44727809+asmitahase@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2024
# [15.34.0](v15.33.2...v15.34.0) (2024-10-31)

### Bug Fixes

* **appraisal_cycle:** Value missing for Appraisal: Company while creating Appraisal from Appraisal Cycle (backport [#2336](#2336)) ([#2338](#2338)) ([57ffe17](57ffe17))
* correct bank entry calculation and update the testcase ([f0be056](f0be056))
* correct bank entry calculation with deductions and prevent multiple loan repayment deductions ([4d93cfa](4d93cfa))
* daily work summary page not found error (backport [#2208](#2208)) ([#2328](#2328)) ([bf0be70](bf0be70))
* merge conflicts ([d83d3df](d83d3df))
* **PWA:** broken translation strings ([87504dc](87504dc))
* **PWA:** broken translation strings in expense tables ([5caf1de](5caf1de))
* **PWA:** Fix translated toast message ([fb41efb](fb41efb))
* **PWA:** Fix translation of durations ([07c14e0](07c14e0))
* **PWA:** post login redirection fails due to `default_route` conflict with other app (backport [#2351](#2351)) ([#2353](#2353)) ([a07bca5](a07bca5))
* **PWA:** replace datepicker with input component (backport [#2366](#2366)) ([#2368](#2368)) ([a9b85d3](a9b85d3))
* **PWA:** Use standard formatter for currency ([48d4996](48d4996))
* remove function call ([ecd5aef](ecd5aef))
* stop leave allocation for left employees (backport [#2358](#2358)) ([#2363](#2363)) ([eccc11c](eccc11c))
* submit attendance request for future dates (backport [#2352](#2352)) ([#2364](#2364)) ([8afd526](8afd526))
* translate passed message in EmptyState component instead of translating it everywhere ([e178078](e178078))
* translation function used without injecting ([f9951db](f9951db))
* update the testcase ([962ddcf](962ddcf))

### Features

* add Payroll Entry to Bank Account dashboard (backport [#2369](#2369)) ([#2372](#2372)) ([940c6dc](940c6dc))
* allow fractional values for "Current Work Experience" field in gratuity doctype ([#2340](#2340)) ([08984a6](08984a6))
* **PWA:** Add translations loader plugin ([d24ec2c](d24ec2c))
* **PWA:** Add translations to bootinfo ([4a5ecca](4a5ecca))
* **PWA:** Translate app ([32c50d6](32c50d6))
* **PWA:** Translate Attendance dashboard ([561c9dc](561c9dc))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.34.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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants