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: timesheet amount issue #26889

Merged
merged 3 commits into from
Aug 24, 2021

Conversation

frappe-pr-bot
Copy link
Collaborator

Backport a6aa6cd from #25993

* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement

(cherry picked from commit a6aa6cd)
@nabinhait nabinhait merged commit 512ddc5 into frappe:develop Aug 24, 2021
let row = frappe.get_doc(d.doctype, d.name)
set_timesheet_detail_rate(row.doctype, row.name, cur_frm.doc.currency, row.timesheet_detail)
});
calculate_total_billing_amount(cur_frm)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anupamvs can you please verify this?

The diff of this PR and original is totally different and there are two currency functions now?

asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement

(cherry picked from commit ba0eb54)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants