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: currency symbol for Landed Cost Voucher Amount (backport #40550) #40553

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 19, 2024


This is an automatic backport of pull request #40550 done by [Mergify](https://mergify.com).

(cherry picked from commit 0725707)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
Copy link
Contributor Author

mergify bot commented Mar 19, 2024

Cherry-pick of 0725707 has failed:

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

You are currently cherry-picking commit 0725707cb1.
  (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/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

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

@rohitwaghchaure rohitwaghchaure merged commit 7851311 into version-14-hotfix Mar 19, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-40550 branch March 19, 2024 18:07
frappe-pr-bot pushed a commit that referenced this pull request Mar 20, 2024
## [14.65.4](v14.65.3...v14.65.4) (2024-03-20)

### Bug Fixes

* added index for voucher_detail_no in gl entry ([a1c8b93](a1c8b93))
* currency symbol for Landed Cost Voucher Amount (backport [#40550](#40550)) ([#40553](#40553)) ([7851311](7851311))
* Data too long for column 'stock_queue' ([#40450](#40450)) ([3340463](3340463))
* flaky ecommerce test case ([#40534](#40534)) ([b197c19](b197c19))
* get unique provisional accounts ([39d958c](39d958c))
* index error on Exchange Rate Revaluation creation ([8813b6b](8813b6b))
* invalid exchange loss booking on invoice againts base accounts ([a27f386](a27f386))
* missing range for ageing summary ([9f0ad7a](9f0ad7a))
* provisional entry for non-stock item ([0aef7f9](0aef7f9))
* **Supplier Quotation Comparison:** group by options ([cfed706](cfed706))
* Update Existing Price List Rate not working (backport [#40333](#40333)) ([#40526](#40526)) ([64f1844](64f1844))
* warehouse issue in pick list ([#40453](#40453)) ([5a2eaf9](5a2eaf9))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

2 participants