schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incoming rate fixes (#11986)

Browse Source
This commit is contained in:
rohitwaghchaure
2017-12-15 12:13:50 +05:30
committed by Nabin Hait
parent 7f13283b66
commit ce8adecbad
5 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/controllers/selling_controller.py
View File

@@ -185,7 +185,10 @@ class SellingController(StockController):
'batch_no': cstr(p.batch_no).strip(),
'serial_no': cstr(p.serial_no).strip(),
'name': d.name,
'target_warehouse': p.target_warehouse
'target_warehouse': p.target_warehouse,
'company': self.company,
'voucher_type': self.doctype,
'allow_zero_valuation': d.allow_zero_valuation_rate
}))
else:
il.append(frappe._dict({
@@ -198,7 +201,10 @@ class SellingController(StockController):
'batch_no': cstr(d.get("batch_no")).strip(),
'serial_no': cstr(d.get("serial_no")).strip(),
'name': d.name,
'target_warehouse': d.target_warehouse
'target_warehouse': d.target_warehouse,
'company': self.company,
'voucher_type': self.doctype,
'allow_zero_valuation': d.allow_zero_valuation_rate
}))
return il
@@ -293,7 +299,11 @@ class SellingController(StockController):
"posting_date": self.posting_date,
"posting_time": self.posting_time,
"qty": -1*flt(d.qty),
"serial_no": d.serial_no
"serial_no": d.serial_no,
"company": d.company,
"voucher_type": d.voucher_type,
"voucher_no": d.name,
"allow_zero_valuation": d.allow_zero_valuation
})
target_warehouse_sle.update({
"incoming_rate": get_incoming_rate(args)