-
Notifications
You must be signed in to change notification settings - Fork 7.5k
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: strings for translation (backport #44816) #44927
Merged
nabinhait
merged 2 commits into
version-15-hotfix
from
mergify/bp/version-15-hotfix/pr-44816
Dec 27, 2024
Merged
fix: strings for translation (backport #44816) #44927
nabinhait
merged 2 commits into
version-15-hotfix
from
mergify/bp/version-15-hotfix/pr-44816
Dec 27, 2024
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
(cherry picked from commit 3be633f) # Conflicts: # erpnext/accounts/utils.py
mergify
bot
requested review from
rohitwaghchaure,
deepeshgarg007 and
ruthra-kumar
as code owners
December 27, 2024 05:28
Cherry-pick of 3be633f has failed:
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 |
github-actions
bot
added
accounts
needs-tests
This PR needs automated unit-tests.
labels
Dec 27, 2024
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 1, 2025
## [15.47.2](v15.47.1...v15.47.2) (2025-01-01) ### Bug Fixes * add company filter to project ([d550b43](d550b43)) * allow zero valuation rate (backport [#44902](#44902)) ([#44910](#44910)) ([9060e4c](9060e4c)) * apply apply_pricing_rule date change ([f09acc7](f09acc7)) * apply discount on qty change ([c19725c](c19725c)) * clear payment schedule in purchase invoice for is_paid ([6cc7060](6cc7060)) * copy accounting dimensions to asset and sales invoice ([#44964](#44964)) ([839ffb3](839ffb3)) * duplicate validate for closing stock balance ([#45015](#45015)) ([8d650e5](8d650e5)) * failing tests fixed ([61367ee](61367ee)) * fetch advance payment entries on pos invoice (backport [#44856](#44856)) ([#44931](#44931)) ([cc827c8](cc827c8)) * fetch amount in company currency ([b135a68](b135a68)) * get item tax template based on posting date ([2feeebb](2feeebb)) * ignore duplicate while creating default templates ([6c206c1](6c206c1)) * ignore inventory dimension for SABB and Pick List (backport [#44933](#44933)) ([#44941](#44941)) ([772b7b9](772b7b9)) * ignore validate while making WO from MR (backport [#44939](#44939)) ([#44942](#44942)) ([c33e075](c33e075)) * in_contex_translation_fixes ([1353a14](1353a14)) * include company in filter condition ([7422043](7422043)) * incorrect filter for BOM (backport [#44954](#44954)) ([#44956](#44956)) ([9853bd9](9853bd9)) * incorrect quality inspection linked in purchase receipt (backport [#44985](#44985)) ([#45020](#45020)) ([0a2cc6b](0a2cc6b)) * limit discount value to 100 in pos cart (backport [#44916](#44916)) ([#44932](#44932)) ([28442f3](28442f3)) * load customer default price list in pos during item selection (backport [#44991](#44991)) ([#44993](#44993)) ([20efe7b](20efe7b)) * material request status (backport [#44917](#44917)) ([#44918](#44918)) ([042d12b](042d12b)) * move code from purchase invoice to buying controller ([98631eb](98631eb)) * negative stock balance (backport [#44990](#44990)) ([#44996](#44996)) ([6f71389](6f71389)) * not able to make purchase receipt from SCR (backport [#44919](#44919)) ([#44925](#44925)) ([c241262](c241262)) * pos payment using non-default mode of payment (backport [#44920](#44920)) ([#44971](#44971)) ([7dd2b0c](7dd2b0c)), closes [#41108](#41108) * precision issue (backport [#45013](#45013)) ([#45019](#45019)) ([52bdf5b](52bdf5b)) * refactor query in get_total_allocated_amount in bank_transaction ([944dc96](944dc96)) * relabel rate to tax rate ([991a336](991a336)) * remove unused variable ([b892282](b892282)) * **report:** Purchase Order Analysis pymysql.err (backport [#44957](#44957)) ([#44994](#44994)) ([ea4b6e8](ea4b6e8)) * resolved conflicts ([00ae829](00ae829)) * set paid amount in party currency in bank reco payment entry ([6703a45](6703a45)) * set/update billing address on change of company ([cfa432d](cfa432d)) * Show order tax amount in customer currency on the portal (backport [#44915](#44915)) ([#44923](#44923)) ([5cc9e10](5cc9e10)) * SQL syntax error in Purchase Receipt query for empty filters ([#44636](#44636)) ([2f279a6](2f279a6)) * strings for translation (backport [#44816](#44816)) ([#44927](#44927)) ([488d808](488d808)) * update item_tax_rate in backend ([8885b07](8885b07)) * use meta to check field instead of doctype ([e582ff8](e582ff8)) * Validate party on non receivable / payable account (backport [#44883](#44883)) ([#44973](#44973)) ([d6903fb](d6903fb)) * whitespace ([2efc701](2efc701))
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.
Backport to version-15
This is an automatic backport of pull request #44816 done by Mergify.