nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 23:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-12-hotfix' into fixed-incorrect-balance-qty-in-stock-ledger

Browse Source
This commit is contained in:
Deepesh Garg
2020-07-12 17:21:25 +05:30
committed by GitHub
parent 671fc7b919 fef3a79bf5
commit 8317ff8bb2
5 changed files with 236 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
View File

@@ -21,7 +21,7 @@ def execute(filters=None):
for cd in consumed_details.get(item_code):
if (cd.voucher_no not in material_transfer_vouchers):
if cd.voucher_type=="Delivery Note":
if cd.voucher_type in ["Delivery Note", "Sales Invoice"]:
delivered_qty += abs(flt(cd.actual_qty))
delivered_amount += abs(flt(cd.stock_value_difference))
elif cd.voucher_type!="Delivery Note":