Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Incoming rate for sales return

Browse Source
This commit is contained in:
Nabin Hait 2014-06-18 15:12:03 +05:30 committed by Anand Doshi
parent afdc0a5f59
commit 216e5bb208
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -239,29 +239,24 @@ class StockEntry(StockController):
def get_incoming_rate(self, args): def get_incoming_rate(self, args):
incoming_rate = 0 incoming_rate = 0
if self.purpose == "Sales Return" and \ if self.purpose == "Sales Return":
(self.delivery_note_no or self.sales_invoice_no): incoming_rate = self.get_incoming_rate_for_sales_return(args)
sle = frappe.db.sql("""select name, posting_date, posting_time,
actual_qty, stock_value, warehouse from `tabStock Ledger Entry`
where voucher_type = %s and voucher_no = %s and
item_code = %s limit 1""",
((self.delivery_note_no and "Delivery Note" or "Sales Invoice"),
self.delivery_note_no or self.sales_invoice_no, args.item_code), as_dict=1)
if sle:
args.update({
"posting_date": sle[0].posting_date,
"posting_time": sle[0].posting_time,
"sle": sle[0].name,
"warehouse": sle[0].warehouse,
})
previous_sle = get_previous_sle(args)
incoming_rate = (flt(sle[0].stock_value) - flt(previous_sle.get("stock_value"))) / \
flt(sle[0].actual_qty)
else: else:
incoming_rate = get_incoming_rate(args) incoming_rate = get_incoming_rate(args)
return incoming_rate return incoming_rate
def get_incoming_rate_for_sales_return(self, args):
incoming_rate = 0.0
if self.delivery_note_no or self.sales_invoice_no:
incoming_rate = frappe.db.sql("""select abs(ifnull(stock_value_difference, 0) / actual_qty)
from `tabStock Ledger Entry`
where voucher_type = %s and voucher_no = %s and item_code = %s limit 1""",
((self.delivery_note_no and "Delivery Note" or "Sales Invoice"),
self.delivery_note_no or self.sales_invoice_no, args.item_code))[0][0]
return incoming_rate
def validate_incoming_rate(self): def validate_incoming_rate(self):
for d in self.get('mtn_details'): for d in self.get('mtn_details'):
if d.t_warehouse: if d.t_warehouse: