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: Subcontracting Receipt GL Entries (backport #40773) (backport #40978) #40982

Merged
merged 2 commits into from
Apr 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 12, 2024

RM Cost = 1000
Service Cost = 100
Additional Cost = 200
Finished Good Valuation = 1300

Account Debit Credit
Accepted Warehouse A/c 1300
Item Expense A/c 1300
Supplier Warehouse A/c 1000
Item Expense A/c 1000
Additional Cost Expense Account 200
Item Expense A/c 200
2500 2500

Closes: #40177


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

* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae9)

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit c2c4548)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
Copy link
Contributor Author

mergify bot commented Apr 12, 2024

Cherry-pick of c2c4548 has failed:

On branch mergify/bp/version-14/pr-40978
Your branch is up to date with 'origin/version-14'.

You are currently cherry-picking commit c2c4548cc0.
  (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/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_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

@s-aga-r s-aga-r removed the conflicts label Apr 12, 2024
@s-aga-r s-aga-r merged commit 4672f59 into version-14 Apr 12, 2024
10 checks passed
@s-aga-r s-aga-r deleted the mergify/bp/version-14/pr-40978 branch April 12, 2024 10:00
frappe-pr-bot pushed a commit that referenced this pull request Apr 12, 2024
## [14.67.1](v14.67.0...v14.67.1) (2024-04-12)

### Bug Fixes

* Subcontracting Receipt GL Entries (backport [#40773](#40773)) (backport [#40978](#40978)) ([#40982](#40982)) ([4672f59](4672f59))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.67.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants