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.

Sign up for GitHub

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

Jump to bottom

fix: incorrect process loss validation for multiple finished items #37576

Merged
merged 1 commit into from
Oct 24, 2023
Merged

fix: incorrect process loss validation for multiple finished items #37576

merged 1 commit into from
Oct 24, 2023

Conversation

rohitwaghchaure
Copy link
Collaborator

@rohitwaghchaure rohitwaghchaure commented Oct 18, 2023 •
edited
Loading

  1. Create manufacture stock entry to produce 30 Quantity of FG Items
  2. Add same finished items two times with 15 Quantity.
  3. Add process loss qty as 2 and save the stock entry, you will end up with the below error
Screenshot 2023-10-18 at 5 52 21 PM

After Fix

Screenshot 2023-10-18 at 6 20 06 PM

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Oct 18, 2023
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-multiple-finished-items-with-process-loss branch 4 times, most recently from 0d887fa to cf1946e Compare October 19, 2023 09:45
@rohitwaghchaure rohitwaghchaure force-pushed the fixed-multiple-finished-items-with-process-loss branch from cf1946e to 697e17a Compare October 19, 2023 11:13
@rohitwaghchaure rohitwaghchaure added the backport version-14-hotfix backport to version 14 label Oct 22, 2023
@rohitwaghchaure rohitwaghchaure merged commit 92cbe58 into frappe:develop Oct 24, 2023
10 of 11 checks passed
mergify bot pushed a commit that referenced this pull request Oct 24, 2023
@rohitwaghchaure @mergify
fix: incorrect process loss validation for multiple finished items (#…
f1e94e8 
…37576)

(cherry picked from commit 92cbe58)
@mergify mergify bot mentioned this pull request Oct 24, 2023
Merged
rohitwaghchaure added a commit that referenced this pull request Oct 24, 2023
@mergify @rohitwaghchaure
fix: incorrect process loss validation for multiple finished items (b…
638c271 
…ackport #37576) (#37656)

fix: incorrect process loss validation for multiple finished items (#37576)

(cherry picked from commit 92cbe58)

Co-authored-by: rohitwaghchaure <[email protected]>
rohitwaghchaure added a commit that referenced this pull request Oct 25, 2023
@frappe-pr-bot @mergify
@blaggacao @rohitwaghchaure @GursheenK @saeedkola @deepeshgarg007 @ruthra-kumar @anandbaburajan @s-aga-r @barredterra
chore: release v14 (#37654)
f35a0c2 
* fix(delivery): rename dt fetch stop action (backport #37605) (#37606)

fix(delivery): rename dt fetch stop action

(cherry picked from commit 79d51a0)

Co-authored-by: David Arnold <[email protected]>

* fix: incorrect cost center in the purchase invoice (backport #37591) (#37609)

* fix: incorrect cost center in the purchase invoice (#37591)

(cherry picked from commit 14b009b)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <[email protected]>

* fix(minor): filter bank accounts in bank statement import (#37525)

fix(minor): filter bank accounts in bank statement import (#37525)

fix: filter by company in bank account
(cherry picked from commit 9d39297)

Co-authored-by: Gursheen Kaur Anand <[email protected]>

* fix: set empty value for tax template in item details (#37496)

* fix: set empty value for tax template in item details (#37496)

* fix: empty tax template for items with invalid templates

* fix: test for empty tax template

* fix: test for item tax template calculation

* fix: test for pos inv tax template calculation

(cherry picked from commit b0d440c)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <[email protected]>

* fix(minor): filter tax template based on company in subscription (#37562)

fix: filter tax template based on company

(cherry picked from commit 1a2f659)

Co-authored-by: Gursheen Anand <[email protected]>

* fix: Cash flow mapping fix (#37522)

Cash flow mapping fix

* fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37628)

fix: remove from or target warehouse for non internal transfer entries (#37612)

(cherry picked from commit 5136fe1)

Co-authored-by: rohitwaghchaure <[email protected]>

* Revert "fix: set empty value for tax template in item details (#37496)"

Revert "fix: set empty value for tax template in item details (#37496)"

This reverts commit ec208b8.

* refactor: gain_loss posting date fields in the allocation table

(cherry picked from commit 55dbcee)

* refactor: introduce fields in popup

(cherry picked from commit 5323bb7)

* refactor: pass gain loss posting date to controller

(cherry picked from commit 7e600a6)

* test: varying posting date for gain loss journal

(cherry picked from commit 514d543)

* fix: overallocation on Payment with PO/SO

(cherry picked from commit 23df420)

# Conflicts:
#	erpnext/accounts/utils.py

* test: overalloction on reconciliation when PO is involved

(cherry picked from commit 946228d)

* refactor(test): make use of utility methods

(cherry picked from commit 547993f)

* chore: fix flakiness `test_sales_order_partial_advance_payment`

(cherry picked from commit 4dff2c7)

* chore: resolve conflict

* fix: close employee loan on write off (#37638)

* fix: exclude written off amount while calculating loan repayment

* fix: revert exclude written off amount while calculating loan repayment

* fix: close employee loan on write off

* refactor: button on PE to filter associated Journals

(cherry picked from commit 150728d)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/payment_entry.js

* chore: resolve conflict

* fix: incorrect process loss validation for multiple finished items (backport #37576) (#37656)

fix: incorrect process loss validation for multiple finished items (#37576)

(cherry picked from commit 92cbe58)

Co-authored-by: rohitwaghchaure <[email protected]>

* chore: fixed test cases related to Internal Transfer (#37659)

* fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#37660)

* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* fix: rearrange functions

* chore: rearrange functions

* chore: rearrange functions

* fix: Purchase Invoice GL entires for assets

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* chore: make `Reserve Stock` checkbox visible in SO

* refactor: rename field `Auto Reserve Stock for Sales Order`

* feat: add fields to hold SO and SO Item ref in PR Item

* test: Deprecate tests

* test: Depricate tests

* test: Depricate tests

* refactor: Remove expense included in valuation accounts

* chore: Add back default in transit warehousefield

---------

Co-authored-by: s-aga-r <[email protected]>

* fix: wrong german translation (#37658)

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: David Arnold <[email protected]>
Co-authored-by: rohitwaghchaure <[email protected]>
Co-authored-by: Gursheen Kaur Anand <[email protected]>
Co-authored-by: Gursheen Anand <[email protected]>
Co-authored-by: saeedkola <[email protected]>
Co-authored-by: Deepesh Garg <[email protected]>
Co-authored-by: ruthra kumar <[email protected]>
Co-authored-by: Anand Baburajan <[email protected]>
Co-authored-by: s-aga-r <[email protected]>
Co-authored-by: Raffael Meyer <[email protected]>
s-aga-r pushed a commit to s-aga-r/erpnext that referenced this pull request Oct 25, 2023
@rohitwaghchaure @s-aga-r
fix: incorrect process loss validation for multiple finished items (f…
c078d68 
…rappe#37576)
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2023
@frappe-bot
chore(release): Bumped to Version 14.46.0
0f848fd 
# [14.46.0](v14.45.4...v14.46.0) (2023-10-31)

### Bug Fixes

* add regional support to extend purchase gl entries ([d02ebd6](d02ebd6))
* avoid name clash in delivery stop (backport [#37306](#37306)) ([#37701](#37701)) ([556095d](556095d))
* Cash flow mapping fix ([#37522](#37522)) ([8e31379](8e31379))
* close employee loan on write off ([#37638](#37638)) ([922ace4](922ace4))
* **defaults:** apply discount and provisonal defaults from item group and brand if available (backport [#37466](#37466)) ([#37703](#37703)) ([a0893dd](a0893dd))
* **delivery:** rename dt fetch stop action (backport [#37605](#37605)) ([#37606](#37606)) ([8660faa](8660faa))
* GL Entries for receiving non CWIP assets using Purchase Receipt ([#37660](#37660)) ([80774e2](80774e2))
* incorrect cost center in the purchase invoice (backport [#37591](#37591)) ([#37609](#37609)) ([50daf70](50daf70))
* incorrect material request quantity in production plan ([#37785](#37785)) ([25718d9](25718d9))
* incorrect process loss validation for multiple finished items (backport [#37576](#37576)) ([#37656](#37656)) ([638c271](638c271))
* indexing on Delivery Note Item (backport [#37766](#37766)) ([#37777](#37777)) ([9b66a06](9b66a06))
* make changes that enable gantt view for job cards (backport [#37661](#37661)) ([#37756](#37756)) ([712ddb7](712ddb7))
* **minor:** filter bank accounts in bank statement import ([#37525](#37525)) ([1cb9f4c](1cb9f4c))
* **minor:** filter tax template based on company in subscription ([#37562](#37562)) ([c05e0a4](c05e0a4))
* **minor:** set tax values for item variants (backport [#37674](#37674)) ([#37738](#37738)) ([fabcfc1](fabcfc1))
* negative current qty causing recursion issue ([#37752](#37752)) ([f1407bc](f1407bc))
* overallocation on Payment with PO/SO ([d71b885](d71b885))
* purchase receipt with stock and asset items ([375be8c](375be8c))
* remove from or target warehouse for non internal transfer entries (backport [#37612](#37612)) ([#37628](#37628)) ([78b7c26](78b7c26))
* set correct `purchase_sle` in `get_last_sle()` ([#37708](#37708)) ([86cf156](86cf156))
* set empty value for tax template in item details ([#37496](#37496)) ([ec208b8](ec208b8))
* typeerror on tds payable monthly report ([fea27d5](fea27d5))
* update existing doc if possible ([89f07dc](89f07dc))
* wrong german translation ([#37658](#37658)) ([fa5780c](fa5780c))

### Features

* allow return of components for SCO that don't have SCR created (backport [#37686](#37686)) ([#37692](#37692)) ([e96d5b3](e96d5b3))
* **delivery:** link to delivery notes list view from delivery trip (backport [#37604](#37604)) ([#37695](#37695)) ([c58fefb](c58fefb))

### Reverts

* Revert "fix: set empty value for tax template in item details (#37496)" ([ca13816](ca13816)), closes [#37496](#37496) [#37496](#37496)
@commit-lint commit-lint bot mentioned this pull request Nov 14, 2023
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@s-aga-r s-aga-r Awaiting requested review from s-aga-r

Assignees
No one assigned
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@rohitwaghchaure