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) #40979

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.

(cherry picked from commit 9808ae9)

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

mergify bot commented Apr 12, 2024

Cherry-pick of 9808ae9 has failed:

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

You are currently cherry-picking commit 9808ae92a4.
  (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 marked this pull request as draft April 12, 2024 07:53
@s-aga-r s-aga-r removed the conflicts label Apr 12, 2024
@s-aga-r
Copy link
Contributor

s-aga-r commented Apr 12, 2024

@Mergifyio backport version-15

Copy link
Contributor Author

mergify bot commented Apr 12, 2024

backport version-15

✅ Backports have been created

@s-aga-r s-aga-r marked this pull request as ready for review April 12, 2024 09:45
@s-aga-r s-aga-r merged commit 9abc71f into version-15-hotfix Apr 12, 2024
11 checks passed
@s-aga-r s-aga-r deleted the mergify/bp/version-15-hotfix/pr-40773 branch April 12, 2024 09:45
mergify bot added a commit that referenced this pull request Apr 12, 2024
* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae9)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 9abc71f)
s-aga-r pushed a commit that referenced this pull request Apr 12, 2024
…0979) (#40983)

fix: Subcontracting Receipt GL Entries (backport #40773) (#40979)

* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae9)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py

* chore: `conflicts`

---------

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Apr 12, 2024
## [15.20.2](v15.20.1...v15.20.2) (2024-04-12)

### Bug Fixes

* Subcontracting Receipt GL Entries (backport [#40773](#40773)) (backport [#40979](#40979)) ([#40983](#40983)) ([3d6ba6f](3d6ba6f))
frappe-pr-bot pushed a commit that referenced this pull request Apr 17, 2024
## [15.20.4](v15.20.3...v15.20.4) (2024-04-17)

### Bug Fixes

* Delayed Order Report not working (backport [#41037](#41037)) ([#41039](#41039)) ([40d059c](40d059c))
* do not validate batch qty for LCV ([5de9b6a](5de9b6a))
* Don't set delivery date as today while making SO from Quotation ([fea906b](fea906b))
* expense account set as COGS for stock entry Material Issue (backport [#41026](#41026)) ([#41029](#41029)) ([f59e433](f59e433))
* get address if multiple companies ([dcfc768](dcfc768))
* get address if multiple companies ([ccdbad9](ccdbad9))
* **gp:** SLEs not fetched for correct warehouse ([881dc02](881dc02))
* incorrect exc gain/loss for PE against JE for payable accounts ([361d7f1](361d7f1))
* landed cost voucher for legacy pr with batch ([4e215c6](4e215c6))
* Link Validation Error on Dunning cancellation ([0053d57](0053d57))
* Multiple partial payment requests against Purchase Invoice ([e287376](e287376))
* not able to submit subcontracting receipt (backport [#41041](#41041)) ([#41045](#41045)) ([b27ad76](b27ad76))
* Subcontracting Receipt GL Entries (backport [#40773](#40773)) ([#40979](#40979)) ([9abc71f](9abc71f))
* Test case ([641b2a4](641b2a4))
* test cases ([0ee91a2](0ee91a2))
* type of transaction validation for the stock entry (backport [#40986](#40986)) ([#40992](#40992)) ([4342b89](4342b89))
* **ux:** Sales Order Stock Reservation Dialog (backport [#40707](#40707)) ([#40980](#40980)) ([14a1a18](14a1a18))
* voucher no. is link field for non english user interface ([1c28ed4](1c28ed4))
* zero division error ([e9c6c5a](e9c6c5a))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.20.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 2, 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