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: Make expense account editable in Purchase Receipt Item (backport #31730) #31879

Merged
merged 2 commits into from
Aug 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2022

This is an automatic backport of pull request #31730 done by Mergify.
Cherry-pick of 1a65089 has failed:

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

You are currently cherry-picking commit 1a6508972e.
  (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/stock/doctype/purchase_receipt_item/purchase_receipt_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/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

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit 1a65089)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@s-aga-r s-aga-r removed the conflicts label Aug 18, 2022
@s-aga-r s-aga-r merged commit 4775c42 into version-13-hotfix Aug 18, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31730 branch August 18, 2022 05:45
frappe-pr-bot pushed a commit that referenced this pull request Aug 18, 2022
## [13.36.4](v13.36.3...v13.36.4) (2022-08-18)

### Bug Fixes

* check item_code in all rows of po_items (backport [#31741](#31741)) ([#31843](#31843)) ([ba8dc89](ba8dc89))
* conflicts ([41b8563](41b8563))
* contact search in request for quotation (backport [#31828](#31828)) ([#31841](#31841)) ([2a615af](2a615af))
* incorrect produced-qty in production-plan-item (backport [#31706](#31706)) ([#31862](#31862)) ([7ddb332](7ddb332))
* incorrect rate in BOM exploded items (backport [#31513](#31513)) ([#31865](#31865)) ([3274e76](3274e76))
* Make expense account editable in Purchase Receipt Item (backport [#31730](#31730)) ([#31879](#31879)) ([4775c42](4775c42))
* not able to issue expired batches ([7ee75ff](7ee75ff))
* set `billing_address` for purchases in `get_party_details` ([a7d66fa](a7d66fa))
* set `company_address` for purchases in `party.js` ([d1de4b0](d1de4b0))
* Transit filter for Default Target Warehouse in SE (backport [#31839](#31839)) ([#31874](#31874)) ([b0917aa](b0917aa))
* use old style for `_dict.update` ([15654aa](15654aa))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.36.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
…rappe#31730) (frappe#31879)

* fix: Make expense account editable in Purchase Receipt Item (frappe#31730)

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit 1a65089)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: conflicts

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
## [13.36.4](frappe/erpnext@v13.36.3...v13.36.4) (2022-08-18)

### Bug Fixes

* check item_code in all rows of po_items (backport [frappe#31741](frappe#31741)) ([frappe#31843](frappe#31843)) ([ba8dc89](frappe@ba8dc89))
* conflicts ([41b8563](frappe@41b8563))
* contact search in request for quotation (backport [frappe#31828](frappe#31828)) ([frappe#31841](frappe#31841)) ([2a615af](frappe@2a615af))
* incorrect produced-qty in production-plan-item (backport [frappe#31706](frappe#31706)) ([frappe#31862](frappe#31862)) ([7ddb332](frappe@7ddb332))
* incorrect rate in BOM exploded items (backport [frappe#31513](frappe#31513)) ([frappe#31865](frappe#31865)) ([3274e76](frappe@3274e76))
* Make expense account editable in Purchase Receipt Item (backport [frappe#31730](frappe#31730)) ([frappe#31879](frappe#31879)) ([4775c42](frappe@4775c42))
* not able to issue expired batches ([7ee75ff](frappe@7ee75ff))
* set `billing_address` for purchases in `get_party_details` ([a7d66fa](frappe@a7d66fa))
* set `company_address` for purchases in `party.js` ([d1de4b0](frappe@d1de4b0))
* Transit filter for Default Target Warehouse in SE (backport [frappe#31839](frappe#31839)) ([frappe#31874](frappe#31874)) ([b0917aa](frappe@b0917aa))
* use old style for `_dict.update` ([15654aa](frappe@15654aa))
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