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: update ru translate (backport #31200) #31304

Merged
merged 2 commits into from
Jun 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 9, 2022

This is an automatic backport of pull request #31200 done by Mergify.
Cherry-pick of 2675751 has failed:

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

You are currently cherry-picking commit 2675751d6c.
  (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/translations/ru.csv

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit 2675751)

# Conflicts:
#	erpnext/translations/ru.csv
@mergify mergify bot added the conflicts label Jun 9, 2022
@marination marination self-assigned this Jun 9, 2022
@codecov
Copy link

codecov bot commented Jun 9, 2022

Codecov Report

Merging #31304 (2675751) into version-13-hotfix (528c713) will increase coverage by 21.06%.
The diff coverage is 57.03%.

❗ Current head 2675751 differs from pull request most recent head a585cb5. Consider uploading reports for the commit a585cb5 to get more accurate results

@@                  Coverage Diff                   @@
##           version-13-hotfix   #31304       +/-   ##
======================================================
+ Coverage              42.41%   63.48%   +21.06%     
======================================================
  Files                   1097      988      -109     
  Lines                  68839    67574     -1265     
======================================================
+ Hits                   29200    42901    +13701     
+ Misses                 39639    24673    -14966     
Impacted Files Coverage Δ
...count_balance_timeline/account_balance_timeline.py 0.00% <0.00%> (ø)
...e/account/chart_of_accounts/import_from_openerp.py 0.00% <0.00%> (ø)
...of_accounts/verified/standard_chart_of_accounts.py 100.00% <ø> (ø)
erpnext/accounts/doctype/bank/bank.py 71.42% <0.00%> (ø)
.../accounts/doctype/bank_guarantee/bank_guarantee.py 0.00% <0.00%> (ø)
...ype/bank_statement_import/bank_statement_import.py 0.00% <0.00%> (ø)
...octype/bank_transaction/bank_transaction_upload.py 0.00% <0.00%> (ø)
erpnext/accounts/doctype/c_form/c_form.py 0.00% <0.00%> (ø)
...ctype/cash_flow_mapper/default_cash_flow_mapper.py 0.00% <ø> (ø)
...ccounts/doctype/cashier_closing/cashier_closing.py 0.00% <0.00%> (ø)
... and 916 more

@marination
Copy link
Collaborator

Unrelated flaky asset tests

@marination marination merged commit 77e4755 into version-13-hotfix Jun 9, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31200 branch June 9, 2022 13:47
frappe-pr-bot pushed a commit that referenced this pull request Jun 14, 2022
# [13.34.0](v13.33.0...v13.34.0) (2022-06-14)

### Bug Fixes

* (auto-merge) Use `frappe.log_error` instead of `doc.log_error` ([bced6a0](bced6a0))
* `test_work_order_with_non_stock_item` ([b827c3b](b827c3b))
* Add cost center in loan document ([c19dfbe](c19dfbe))
* **asset:** failing test case ([#31277](#31277)) ([8a4c9d1](8a4c9d1))
* Auto Insert Item Price If Missing when discount & blank UOM (backport [#31168](#31168)) ([#31267](#31267)) ([e69bff0](e69bff0))
* Call `calculate_cost` for Draft BOM and typo in argument ([d035aa2](d035aa2))
* Company address filter in quotation ([d375939](d375939))
* DB update child items, remove redundancy, fix perf ([cbc52a2](cbc52a2))
* Depreciate Asset before generating GL Entries on sale ([#30759](#30759)) ([dfbfe40](dfbfe40))
* Get fresh RM rate in `calculate_rm_cost` ([9a513fd](9a513fd))
* **India:** Incorrect taxable in GSTR-3B report ([e5d2c59](e5d2c59))
* **India:** Sales taxes and charges template fetching in quotation ([a1ba847](a1ba847))
* locale Currency and Float setting in update_employee ([391ed9c](391ed9c))
* misaligned columns in print format of AR/AP report ([81e32e2](81e32e2))
* Partially Ordered status for quotation ([37ba550](37ba550))
* purchase invoice standalone return GLEs (backport [#31209](#31209)) ([#31263](#31263)) ([6d99b5a](6d99b5a))
* Reset represents company on disabling internal customer and supplier (backport [#31302](#31302)) ([#31306](#31306)) ([fb9b302](fb9b302))
* Safe cast `row.rate` (in case of faulty exploded items, edge case but oh well) ([6d65e2b](6d65e2b))
* Supplied Qty not updated on Stock Entry cancel ([79b2062](79b2062))
* Trial Balance failing to ignore Finance Book ([00371f4](00371f4))
* typo in sql condition ([894f945](894f945))
* update fr translation (backport [#31232](#31232)) ([#31334](#31334)) ([5d0f271](5d0f271))
* update Period Closing Voucher per Company ([5ebbe81](5ebbe81))
* update ru translate (backport [#31200](#31200)) ([#31304](#31304)) ([77e4755](77e4755))
* Use `frappe.as_unicode` to decode output of redis module list (backport [#31282](#31282)) ([#31283](#31283)) ([633a452](633a452))
* **ux:** hide new version btn on unsaved BOM (backport [#31297](#31297)) ([#31298](#31298)) ([9f6b32a](9f6b32a))
* **UX:** use doc.status for Job Card status ([#31320](#31320)) ([78473b8](78473b8))

### Features

* Add german translations ([a3f2cf3](a3f2cf3))
* Level-wise BOM cost updation ([74d7d81](74d7d81))
* Only update exploded items rate and amount ([a26da58](a26da58))
* Track progress in Log Batch/Job wise ([3b2a8bf](3b2a8bf))

### Performance Improvements

* `get_boms_in_bottom_up_order` ([87c2b3b](87c2b3b))
* `get_next_higher_level_boms` ([767a775](767a775))
* Use cached doc instead of `get_doc` ([faa69c9](faa69c9))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.34.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants