refactor: timesheet #25701
Merged
refactor: timesheet #25701
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
anupamvs
force-pushed
the
timesheet-refactor
branch
3 times, most recently
from
7837567
to
03fe75b
Compare
anupamvs
force-pushed
the
timesheet-refactor
branch
5 times, most recently
from
f132b41
to
e2980b0
Compare
ruchamahabal
requested changes
May 14, 2021
There was a problem hiding this comment.
- If Billing Rate and Costing Rate are set in the Activity Type, and the timesheet currency != base currency, then the rate should be converted based on the standard exchange rate into timesheet currency.
- In a timesheet, if a Project is selected in parent and the child item’s project is not the same as the parent, add a server-side validation.
- Check the timesheet -> salary slip flow is working fine or not when timesheet currency is different. Add test case if possible.
- Add test cases for:
- Timesheet not fetched/linked for Credit Notes.
- Sales Invoice unlinked from timesheet on SI cancellation.
erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
Outdated
Show resolved
Hide resolved
anupamvs
force-pushed
the
timesheet-refactor
branch
from
6be7be1
to
fd4743c
Compare
anupamvs
force-pushed
the
timesheet-refactor
branch
from
aeceab8
to
35137ba
Compare
- show timesheet billing amounts in doc currency
ruchamahabal
approved these changes
May 20, 2021
anupamvs
pushed a commit
to anupamvs/erpnext
that referenced
this pull request
May 21, 2021
refactor: timesheet
anupamvs
pushed a commit
to anupamvs/erpnext
that referenced
this pull request
May 21, 2021
refactor: timesheet
This was referenced May 21, 2021
Merged
Merged
anupamvs
pushed a commit
to anupamvs/erpnext
that referenced
this pull request
Jun 2, 2021
refactor: timesheet
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Added Activity Type, Description Field in Sales Invoice Timesheet for more context of the activity.
Introduced Currency, Customer, and Exchange Rate fields in Timesheet.
Updated the list view of Timesheet.
link_formatters for Project field.
added Timesheet in auto_cancel_exempted_doctypes.
Unlinking the Timesheet on cancel of SI.
Don't allow the user to fetch timesheet for Credit Note.
Made Sales Invoice Timesheet fields read-only.
added auto rate conversion while fetching timesheets in SI.
Added base currency label in Activity Type
Multi-Currency in Timesheet and restructuring the fields.
