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: set currency on change of company considering customer default currency (backport #42405) #42547

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2024

On change of company, set currency based on the following priority

  • If a customer is selected and the customer has default currency, use that
  • use company default currency
  • use global default currency

Also, took the opportunity to refactor the related codes.

Internal Issue: https://support.frappe.io/helpdesk/tickets/18670


This is an automatic backport of pull request #42405 done by Mergify.

…urrency (#42405)

(cherry picked from commit 4986f28)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
Copy link
Contributor Author

mergify bot commented Jul 31, 2024

Cherry-pick of 4986f28 has failed:

On branch mergify/bp/version-15-hotfix/pr-42405
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 4986f28a89.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/public/js/controllers/transaction.js

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@nabinhait nabinhait merged commit 7c8d13c into version-15-hotfix Jul 31, 2024
6 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-15-hotfix/pr-42405 branch July 31, 2024 07:32
frappe-pr-bot pushed a commit that referenced this pull request Aug 7, 2024
# [15.32.0](v15.31.5...v15.32.0) (2024-08-07)

### Bug Fixes

* 'undefined' in PL and BS report summary on Consolidated report ([3da7071](3da7071))
* all warehouse filter for the stock report (backport [#42584](#42584)) ([#42604](#42604)) ([830b95b](830b95b))
* company filter for filtring tax withheld vouchers ([3ad1f2d](3ad1f2d))
* disable primary action button only when there are no active capitalization ([2d644ac](2d644ac))
* Discount and taxes in return document should follow the reference document (backport [#41911](#41911)) ([#42574](#42574)) ([9321408](9321408))
* do not update item price and last purchase rate for inter transf… (backport [#42616](#42616)) ([#42633](#42633)) ([59b9b7d](59b9b7d))
* german translations ([f27e9f3](f27e9f3))
* inter transfer delivery note issue with batch (backport [#42552](#42552)) ([#42556](#42556)) ([97cc308](97cc308))
* min height for rows in sales funnel ([2f81c99](2f81c99))
* resolved conflict ([#42557](#42557)) ([c3293d1](c3293d1))
* reverse debit credit for party gl entry in payment entry based on negative amount ([#42367](#42367)) ([14f9aef](14f9aef))
* set currency on change of company considering customer default currency (backport [#42405](#42405)) ([#42547](#42547)) ([7c8d13c](7c8d13c))
* set query filters for sales / purchase tax template on PE ([dc9cf74](dc9cf74))
* use get_last_day to get the correct date (backport [#42564](#42564)) ([#42598](#42598)) ([2de86eb](2de86eb))

### Features

* expiry date column in Available Batch Report (backport [#42628](#42628)) ([#42642](#42642)) ([d8768c5](d8768c5))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.32.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants