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(Expense Claim): description not saved #1265

Merged
merged 1 commit into from
Jan 8, 2024

Conversation

krantheman
Copy link
Member

@krantheman krantheman commented Jan 8, 2024

Closes: #1256

Expense Description was being fetched from Expense Claim Type. It is now fetched only if the field is left empty.

no-docs

@ruchamahabal ruchamahabal merged commit 60a2622 into frappe:develop Jan 8, 2024
8 checks passed
mergify bot pushed a commit that referenced this pull request Jan 8, 2024
(cherry picked from commit 60a2622)

# Conflicts:
#	hrms/hr/doctype/expense_claim_detail/expense_claim_detail.json
mergify bot pushed a commit that referenced this pull request Jan 8, 2024
ruchamahabal pushed a commit that referenced this pull request Jan 8, 2024
@krantheman krantheman deleted the fix-expense-claim branch January 8, 2024 08:21
frappe-pr-bot pushed a commit that referenced this pull request Jan 10, 2024
# [15.9.0](v15.8.0...v15.9.0) (2024-01-10)

### Bug Fixes

* cannot update status for Group Goals ([fba6087](fba6087))
* comp leave request fails on leave period boundary dates ([82144c3](82144c3))
* error message tense ([bc6024c](bc6024c))
* **Expense Claim:** description not saved (backport [#1265](#1265)) ([#1267](#1267)) ([60c099b](60c099b))
* expired leave balance is -ve when leaves taken > carry forwarded expired leaves (backport [#1288](#1288)) ([#1292](#1292)) ([48dfe64](48dfe64))
* get current leave period for leave balance report (backport [#1277](#1277)) ([#1279](#1279)) ([beb3d82](beb3d82))
* incorrect night shift assignment timings in shift calendar ([a12df94](a12df94))
* naming ([2fd540d](2fd540d))
* salary slip cancellation with loan repayment (backport [#1270](#1270)) ([#1271](#1271)) ([98702b0](98702b0))
* **Salary Slip:** data evaluation (backport [#1283](#1283)) ([#1290](#1290)) ([c7b4dfc](c7b4dfc))
* show error after confirm dialog ([c75a3b9](c75a3b9))
* status past tense ([9221bc0](9221bc0))
* translation strings ([b8f8b86](b8f8b86))
* ui update on progress update ([f23f995](f23f995))

### Features

* add bulk action for updating status ([2885a51](2885a51))
* add bulk unarchive and reopen ([c9fdb37](c9fdb37))
* **Goal Tree:** add Mark as Completed ([6e445aa](6e445aa))
* make Bulk Assign Structure a primary button and add Branch filter (backport [#1197](#1197)) ([#1276](#1276)) ([1fedea1](1fedea1))
krantheman added a commit to krantheman/hrms that referenced this pull request Jan 12, 2024
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.

Expense Claim: Description is not saved.
2 participants