nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into allow-discharge

Browse Source
This commit is contained in:
Rucha Mahabal
2021-01-05 12:07:26 +05:30
committed by GitHub
parent f97e668130 06a401ffbf
commit d643bb7c4b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/selling_controller.py
View File

@@ -233,7 +233,7 @@ class SellingController(StockController):
'allow_zero_valuation': d.allow_zero_valuation_rate,
'sales_invoice_item': d.get("sales_invoice_item"),
'dn_detail': d.get("dn_detail"),
'incoming_rate': p.incoming_rate
'incoming_rate': p.get("incoming_rate")
}))
else:
il.append(frappe._dict({
@@ -252,7 +252,7 @@ class SellingController(StockController):
'allow_zero_valuation': d.allow_zero_valuation_rate,
'sales_invoice_item': d.get("sales_invoice_item"),
'dn_detail': d.get("dn_detail"),
'incoming_rate': d.incoming_rate
'incoming_rate': d.get("incoming_rate")
}))
return il