-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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(stock): don't reserve qty on sales return. #31271
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #31271 +/- ##
========================================
Coverage 63.79% 63.80%
========================================
Files 810 810
Lines 59533 59539 +6
========================================
+ Hits 37981 37986 +5
- Misses 21552 21553 +1
|
@ankush Just wanted to checkup, have you thought of any way to implement this without disturbing existing workflows ? |
@dj12djdjs we can add an option in selling settings. The default behavior should be consistent with current behavior. |
# Conflicts: # erpnext/patches.txt # erpnext/public/js/utils/barcode_scanner.js # erpnext/regional/report/gstr_1/gstr_1.py # erpnext/stock/doctype/delivery_note/test_delivery_note.py
c9dce9c
to
494bbf0
Compare
d09c4ac
to
494bbf0
Compare
@ankush Ready for review |
@ankush Sorry about that, I just realized there was more conflicts 😅 |
@ankush Is there any issues with this ? |
This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
# Conflicts: # erpnext/stock/doctype/delivery_note/test_delivery_note.py
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dj12djdjs please resolve conflicts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes to erpnext/selling/doctype/sales_order/sales_order.json
seem to be unrelated; please revert these.
This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
@@ -94,51 +98,85 @@ def get_balance_qty_from_sle(item_code, warehouse): | |||
|
|||
|
|||
def get_reserved_qty(item_code, warehouse): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This function looks very complex and difficult to read, could you split the code into multiple methods?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rohitwaghchaure Honestly, I don't even fully understand the query. I just reverted it back to the previous query and used f string to inject the condition.
# Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json
e008cb8
to
3c553b0
Compare
bringing #31017 back to life