nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source
This commit is contained in:
Anand Doshi
2013-01-18 14:50:25 +05:30
parent a81370f2a3 a1716543c2
commit 35af9ba4e6
2 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock/doctype/stock_entry/stock_entry.py
View File

@@ -178,6 +178,7 @@ class DocType(TransactionBase):
d.amount = flt(d.qty) * flt(d.incoming_rate)
def get_incoming_rate(self, args):
incoming_rate = 0
if self.doc.purpose == "Sales Return" and \
(self.doc.delivery_note_no or self.doc.sales_invoice_no):
sle = webnotes.conn.sql("""select name, posting_date, posting_time,