nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24618 from rohitwaghchaure/fixed-incorrect-incoming-rate-for-sales-return

Browse Source 
fix: incorrect incoming rate for the sales return
This commit is contained in:
rohitwaghchaure
2021-02-12 14:20:02 +05:30
committed by GitHub
parent edfbb5d3be 37604c8d99
commit b96c7e0a0f
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
erpnext/controllers/selling_controller.py
View File

@@ -310,12 +310,27 @@ class SellingController(StockController):
if flt(d.conversion_factor)==0.0: if flt(d.conversion_factor)==0.0:
d.conversion_factor = get_conversion_factor(d.item_code, d.uom).get("conversion_factor") or 1.0 d.conversion_factor = get_conversion_factor(d.item_code, d.uom).get("conversion_factor") or 1.0
return_rate = 0 return_rate = 0
if cint(self.is_return) and self.return_against and self.docstatus==1: if cint(self.is_return) and self.docstatus==1:
against_document_no = (d.get("sales_invoice_item") if self.return_against:
if self.doctype == "Sales Invoice" else d.get("delivery_note_item")) against_document_no = (d.get("sales_invoice_item")
if self.doctype == "Sales Invoice" else d.get("delivery_note_item"))
return_rate = self.get_incoming_rate_for_sales_return(d.item_code, return_rate = self.get_incoming_rate_for_sales_return(d.item_code,
self.return_against, against_document_no) self.return_against, against_document_no)
else:
# For standalone credit note
args = frappe._dict({
"item_code": d.item_code,
"warehouse": d.warehouse,
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"qty": flt(d.qty),
"serial_no": d.serial_no,
"company": d.company,
"allow_zero_valuation": d.allow_zero_valuation
})
return_rate = get_incoming_rate(args)
# On cancellation or if return entry submission, make stock ledger entry for # On cancellation or if return entry submission, make stock ledger entry for
# target warehouse first, to update serial no values properly # target warehouse first, to update serial no values properly