-
Notifications
You must be signed in to change notification settings - Fork 7.5k
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: prevent extra transfer against inter transfer transaction #39213
Merged
rohitwaghchaure
merged 2 commits into
frappe:develop
from
rohitwaghchaure:fixed-extra-transfer-against-inter-company-delivery-note
Jan 27, 2024
Merged
fix: prevent extra transfer against inter transfer transaction #39213
rohitwaghchaure
merged 2 commits into
frappe:develop
from
rohitwaghchaure:fixed-extra-transfer-against-inter-company-delivery-note
Jan 27, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rohitwaghchaure
force-pushed
the
fixed-extra-transfer-against-inter-company-delivery-note
branch
from
January 17, 2024 09:52
ca95966
to
8229b8d
Compare
rohitwaghchaure
force-pushed
the
fixed-extra-transfer-against-inter-company-delivery-note
branch
from
January 17, 2024 15:01
8229b8d
to
1107157
Compare
rohitwaghchaure
force-pushed
the
fixed-extra-transfer-against-inter-company-delivery-note
branch
from
January 27, 2024 06:53
1107157
to
d462edf
Compare
rohitwaghchaure
added
backport version-14-hotfix
backport to version 14
backport version-15-hotfix
labels
Jan 27, 2024
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## develop #39213 +/- ##
===========================================
+ Coverage 60.16% 60.18% +0.01%
===========================================
Files 757 757
Lines 70726 70785 +59
===========================================
+ Hits 42552 42600 +48
- Misses 28174 28185 +11
|
mergify bot
pushed a commit
that referenced
this pull request
Jan 27, 2024
* fix: prevent extra transfer against inter transfer transaction * fix: internal transfer dashboard (cherry picked from commit 8fdc244) # Conflicts: # erpnext/controllers/stock_controller.py
mergify bot
pushed a commit
that referenced
this pull request
Jan 27, 2024
* fix: prevent extra transfer against inter transfer transaction * fix: internal transfer dashboard (cherry picked from commit 8fdc244)
rohitwaghchaure
added a commit
that referenced
this pull request
Jan 27, 2024
…ort #39213) (#39595) * fix: prevent extra transfer against inter transfer transaction (#39213) * fix: prevent extra transfer against inter transfer transaction * fix: internal transfer dashboard (cherry picked from commit 8fdc244) # Conflicts: # erpnext/controllers/stock_controller.py * chore: fix conflicts --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 30, 2024
## [14.61.3](v14.61.2...v14.61.3) (2024-01-30) ### Bug Fixes * Asset Depreciation WDV as per Income Tax Act ([b840eb9](b840eb9)) * asset module test cases ([f604798](f604798)) * **Batch:** reload doc after splitting ([c759406](c759406)) * default enable closing stock balance (backport [#39551](#39551)) ([#39553](#39553)) ([1e32c62](1e32c62)) * do not auto-populate item delivery date ([1e341f0](1e341f0)) * do not consider rejected warehouses in pick list ([#39539](#39539)) ([f6725e4](f6725e4)) * do not delete batches implicitly ([9a5995a](9a5995a)) * **ecom:** do not create a new contact if a contact already exists ([#39290](#39290)) ([47c591c](47c591c)) * email list for auto reorder material request ([780c069](780c069)) * enqueue JV submission when more than 100 accounts ([66be3c5](66be3c5)) * fetch correct quantity and amount for grouped asset ([1dacb79](1dacb79)) * incorrect amount in the material request item (backport [#39567](#39567)) ([#39568](#39568)) ([c26f7bb](c26f7bb)) * linter issue ([941f882](941f882)) * not able to edit / change address from portal ([e3fdb6f](e3fdb6f)) * not able to edit address through portal ([b310a55](b310a55)) * Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template ([2953959](2953959)) * perf issue while submitting stock entry (backport [#39634](#39634)) ([#39641](#39641)) ([3ee0555](3ee0555)) * prevent extra transfer against inter transfer transaction (backport [#39213](#39213)) ([#39595](#39595)) ([bf61030](bf61030)) * qtn tests using delivery date ([c50988b](c50988b)) * return doc obj after submit ([0472879](0472879)) * RM valuation rate in SCR ([#39541](#39541)) ([9fd1692](9fd1692)) * typo's and parameter changes ([41c074d](41c074d))
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 30, 2024
# [15.11.0](v15.10.8...v15.11.0) (2024-01-30) ### Bug Fixes * AttributeError in company transaction deletion ([222005c](222005c)) * **Batch:** reload doc after splitting ([a97b8fd](a97b8fd)) * check page obj before adding menu ([0aa73e3](0aa73e3)) * default enable closing stock balance (backport [#39551](#39551)) ([#39554](#39554)) ([4853ab1](4853ab1)) * do not auto-populate item delivery date ([5cdc22a](5cdc22a)) * email list for auto reorder material request ([98c5653](98c5653)) * enqueue JV submission when more than 100 accounts ([07bcc24](07bcc24)) * fetch correct quantity and amount for grouped asset ([3bdd1e9](3bdd1e9)) * honour currency precision while fetching balance ([e0a3820](e0a3820)) * incorrect active serial nos (backport [#39389](#39389)) ([#39589](#39589)) ([7def475](7def475)) * incorrect amount in the material request item (backport [#39567](#39567)) ([#39569](#39569)) ([e0c35d6](e0c35d6)) * Item Tax template is not working for e-commerce ([2905db1](2905db1)) * make SO item code reqd ([171586d](171586d)) * not able to edit address through portal ([1f5dbeb](1f5dbeb)) * not able to save BOM (duplicate key error) (backport [#39620](#39620)) ([#39623](#39623)) ([53c7055](53c7055)) * not able to save subcontracting purchase receipt (old flow) (backport [#39590](#39590)) ([#39592](#39592)) ([63eef68](63eef68)) * not able to submit subcontracting pr (old flow) (backport [#39622](#39622)) ([#39625](#39625)) ([960443d](960443d)) * Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template ([b2e0d24](b2e0d24)) * perf issue while submitting stock entry (backport [#39634](#39634)) ([#39642](#39642)) ([d785c6c](d785c6c)) * prevent extra transfer against inter transfer transaction (backport [#39213](#39213)) ([#39596](#39596)) ([6d4ca6a](6d4ca6a)) * qtn tests using delivery date ([6b20a7e](6b20a7e)) * return doc obj after submit ([da33079](da33079)) * Serial No Ledger permission issue ([f9d1995](f9d1995)) * skip liability account for internal transfer ([e2d85c5](e2d85c5)) * type error on company doc ([a7d1368](a7d1368)) ### Features * In words in payment entry ([5df2f5d](5df2f5d)) * New financial views - Growth and margin views for P&L and balance sheet ([#39588](#39588)) ([a83f310](a83f310)) * Partly billed status in Purchase Receipt ([#39543](#39543)) ([e4230cf](e4230cf))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport version-14-hotfix
backport to version 14
backport version-15-hotfix
needs-tests
This PR needs automated unit-tests.
stock
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed #39047