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: expense account should be fetched from related asset category (backport #41024) #41389

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 8, 2024

There was an issue with fixed asset item, when we are making a “Material request”, “Purchase order” and "Purchase Receipt" transaction where application sets the expenses account by default in the item child table but it should fetch the correct account from the related Asset Category.

Screenshot 2024-04-16 at 11 07 33 AM Screenshot 2024-04-16 at 11 08 38 AM Before expense account was not fetched based on asset category. Screenshot 2024-04-16 at 11 10 00 AM

After the fix:-
Screenshot 2024-04-16 at 11 09 28 AM

no-docs


This is an automatic backport of pull request #41024 done by Mergify.

“Khushi and others added 2 commits May 8, 2024 20:01
(cherry picked from commit 651e469)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit 272ce24)
Copy link
Contributor Author

mergify bot commented May 8, 2024

Cherry-pick of 651e469 has failed:

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

You are currently cherry-picking commit 651e4696fd.
  (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)

Changes to be committed:
	modified:   erpnext/assets/doctype/asset/test_asset.py
	modified:   erpnext/controllers/accounts_controller.py
	modified:   erpnext/controllers/buying_controller.py
	modified:   erpnext/stock/doctype/item/test_item.py
	modified:   erpnext/stock/get_item_details.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

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

Copy link

stale bot commented May 25, 2024

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label May 25, 2024
@khushi8112 khushi8112 closed this May 27, 2024
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-41024 branch May 27, 2024 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants