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: purchase invoice standalone return GLEs (backport #31209) #31263

Merged
merged 3 commits into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2022

backport #31209

ankush and others added 2 commits June 7, 2022 08:58
(cherry picked from commit 293eb8d)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
#	erpnext/stock/tests/test_utils.py
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.

Caused by #24200

(cherry picked from commit 7726271)
@mergify mergify bot added the conflicts label Jun 7, 2022
@mergify mergify bot assigned ankush Jun 7, 2022
@ankush ankush added squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. and removed conflicts labels Jun 7, 2022
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-31209 branch from 0161b82 to 3cb02dd Compare June 7, 2022 09:04
@ankush ankush marked this pull request as draft June 7, 2022 09:05
@ankush ankush marked this pull request as ready for review June 7, 2022 09:59
@ankush ankush merged commit 6d99b5a into version-13-hotfix Jun 7, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31209 branch June 7, 2022 10:13
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 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
released squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants