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 #40773

Merged
merged 1 commit into from Apr 12, 2024

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Mar 29, 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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Mar 29, 2024
@s-aga-r s-aga-r added backport version-14-hotfix backport to version 14 backport version-15-hotfix and removed needs-tests This PR needs automated unit-tests. labels Mar 29, 2024
@s-aga-r s-aga-r marked this pull request as ready for review April 2, 2024 03:38
@rohitwaghchaure rohitwaghchaure merged commit b04d0df into frappe:develop Apr 12, 2024
14 checks passed
s-aga-r added a commit that referenced this pull request Apr 12, 2024
* fix: Subcontracting Receipt GL Entries

(cherry picked from commit 9808ae9)

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
mergify bot added a commit that referenced this pull request Apr 12, 2024
* 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
s-aga-r 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>
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 added a commit that referenced this pull request Apr 12, 2024
…0978) (#40982)

* fix: Subcontracting Receipt GL Entries (backport #40773) (#40978)

* 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

* chore: `conflicts`

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
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
## [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 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
## [14.67.2](v14.67.1...v14.67.2) (2024-04-17)

### Bug Fixes

* barcode not fetched on selection of item (backport [#40814](#40814)) ([#41027](#41027)) ([0bee921](0bee921))
* Delayed Order Report not working (backport [#41037](#41037)) ([#41038](#41038)) ([e956dbb](e956dbb))
* Don't call get_fiscal_year if setup is not done yet ([59cea9f](59cea9f))
* Don't set delivery date as today while making SO from Quotation ([b47e224](b47e224))
* exclude some query builder lines from ruff rules ([2425119](2425119))
* expense account set as COGS for stock entry Material Issue (backport [#41026](#41026)) ([#41028](#41028)) ([153e0ba](153e0ba))
* get address if multiple companies ([c2b6b64](c2b6b64))
* get address if multiple companies ([0493872](0493872))
* **gp:** SLEs not fetched for correct warehouse ([97e7b3f](97e7b3f))
* incorrect exc gain/loss for PE against JE for payable accounts ([50a74ee](50a74ee))
* Resolve merge conflicts ([cc925ae](cc925ae))
* Subcontracting Receipt GL Entries (backport [#40773](#40773)) ([#40978](#40978)) ([c2c4548](c2c4548))
* test cases ([79e23da](79e23da))
* **treewide:** manual ruff fixes ([b087fb3](b087fb3))
* use 'eq' and isnull() on qb conditions ([b4ed2d2](b4ed2d2))
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))
@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Subcontracting Receipt fails if rate is zero
2 participants