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(Travel Request): get currency from Employee Master's Company #1807

Merged

Conversation

vinyselopal
Copy link
Contributor

Before: The Currency for Travel Request was inherited from Global Defaults, which is set as USD
After: Gets the Currency from Employee Master's Company

Screenshot 2024-05-24 at 12 18 44 PM Screenshot 2024-05-24 at 12 19 00 PM

@vinyselopal vinyselopal force-pushed the fix-travel-request-default-currency branch 2 times, most recently from e6cb873 to 804583d Compare May 24, 2024 11:12
@vinyselopal vinyselopal force-pushed the fix-travel-request-default-currency branch from 804583d to 8dfcd57 Compare May 24, 2024 11:40
@ruchamahabal ruchamahabal merged commit 533b968 into frappe:develop May 28, 2024
7 checks passed
mergify bot pushed a commit that referenced this pull request May 28, 2024
(cherry picked from commit 533b968)

# Conflicts:
#	hrms/hr/doctype/travel_request/travel_request.json
#	hrms/hr/doctype/travel_request_costing/travel_request_costing.json
mergify bot pushed a commit that referenced this pull request May 28, 2024
(cherry picked from commit 533b968)

# Conflicts:
#	hrms/hr/doctype/travel_request/travel_request.json
#	hrms/hr/doctype/travel_request_costing/travel_request_costing.json
ruchamahabal added a commit that referenced this pull request May 29, 2024
…kport #1807) (#1819)

* fix(Travel Request): get currency from Employee Master's Company (#1807)

(cherry picked from commit 533b968)

# Conflicts:
#	hrms/hr/doctype/travel_request/travel_request.json
#	hrms/hr/doctype/travel_request_costing/travel_request_costing.json

* chore: fix conficts

---------

Co-authored-by: Viny Selopal <52369157+vinyselopal@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
ruchamahabal added a commit that referenced this pull request May 29, 2024
…kport #1807) (#1818)

* fix(Travel Request): get currency from Employee Master's Company (#1807)

(cherry picked from commit 533b968)

# Conflicts:
#	hrms/hr/doctype/travel_request/travel_request.json
#	hrms/hr/doctype/travel_request_costing/travel_request_costing.json

* chore: fix conficts

---------

Co-authored-by: Viny Selopal <52369157+vinyselopal@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request May 30, 2024
# [15.22.0](v15.21.2...v15.22.0) (2024-05-30)

### Bug Fixes

* adjust score for autocompletions ([3eddaed](3eddaed))
* formula checkbox label ([daabeb0](daabeb0))
* goal score autocompletion ([3815b58](3815b58))
* show fixed no of digits in location coordinates ([14b8e44](14b8e44))
* skip setting geolocation if tracking is disabled ([c886999](c886999))
* **test:** revert final score changes ([2090bb2](2090bb2))
* **Travel Request:** get currency from Employee Master's Company (backport [#1807](#1807)) ([#1819](#1819)) ([515a44b](515a44b))

### Features

* allow adding formula to calculate final score in appraisal cycle ([76541b6](76541b6))
* **Desk:** fetch geolocation btn in Employee Checkin form ([e49589f](e49589f))
* geolocation in Employee Checkin ([dcb55e5](dcb55e5))
* HR Setting to enable geolocation tracking ([609657f](609657f))
* **PWA:** capture geolocation in checkins ([1132f91](1132f91))
* set desc for formula setting & make formula mandatory if checkbox is enabled ([1929a5d](1929a5d))
* split coordinates field into lat, long and set geolocation on validate ([7aad1ae](7aad1ae))
frappe-pr-bot pushed a commit that referenced this pull request May 30, 2024
## [14.28.3](v14.28.2...v14.28.3) (2024-05-30)

### Bug Fixes

* **Travel Request:** get currency from Employee Master's Company (backport [#1807](#1807)) ([#1818](#1818)) ([ca857ab](ca857ab))
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.

None yet

2 participants