Skip to content

fix(sales_and_purchase_return): consider net_rate instead of rate for return validation #54628

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

Open
diptanilsaha wants to merge 1 commit into
base: develop
Choose a base branch
from
+7 −7
Open

fix(sales_and_purchase_return): consider net_rate instead of rate for return validation #54628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions erpnext/controllers/sales_and_purchase_return.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def validate_return_against(doc):
def validate_returned_items(doc):
valid_items = frappe._dict()

select_fields = "item_code, qty, stock_qty, rate, parenttype, conversion_factor, name"
select_fields = "item_code, qty, stock_qty, net_rate, parenttype, conversion_factor, name"
if doc.doctype != "Purchase Invoice":
select_fields += ",serial_no, batch_no"

Expand Down Expand Up @@ -141,9 +141,9 @@ def validate_returned_items(doc):
validate_quantity(doc, key, d, ref, valid_items, already_returned_items)

if (
ref.rate
and flt(d.rate) > ref.rate
and doc.doctype in ("Delivery Note", "Sales Invoice")
ref.net_rate
and flt(d.net_rate) > ref.net_rate
and doc.doctype in ("Delivery Note", "Sales Invoice", "POS Invoice")
and get_valuation_method(ref.item_code, doc.company) != "Moving Average"
):
frappe.throw(
Expand Down Expand Up @@ -241,7 +241,7 @@ def get_ref_item_dict(valid_items, ref_item_row):
frappe._dict(
{
"qty": 0,
"rate": 0,
"net_rate": 0,
"stock_qty": 0,
"rejected_qty": 0,
"received_qty": 0,
Expand All @@ -254,8 +254,8 @@ def get_ref_item_dict(valid_items, ref_item_row):
item_dict = valid_items[key]
item_dict["qty"] += ref_item_row.qty
item_dict["stock_qty"] += ref_item_row.get("stock_qty", 0)
if ref_item_row.get("rate", 0) > item_dict["rate"]:
item_dict["rate"] = ref_item_row.get("rate", 0)
if ref_item_row.get("net_rate", 0) > item_dict["net_rate"]:
item_dict["net_rate"] = ref_item_row.get("net_rate", 0)

if ref_item_row.parenttype in ["Purchase Invoice", "Purchase Receipt", "Subcontracting Receipt"]:
item_dict["received_qty"] += ref_item_row.received_qty
Expand Down
Loading