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

Merge branch 'frappe:develop' into rounded-row-wise-tax

Browse Source
This commit is contained in:
Dany Robert
2023-10-11 12:31:13 +05:30
committed by GitHub
parent 159be1d40f cea0d65fbd
commit 6a27cbd61d
425 changed files with 16998 additions and 16021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/taxes_and_totals.py
View File

@@ -193,7 +193,9 @@ class calculate_taxes_and_totals(object):
item.net_rate = item.rate
if not item.qty and self.doc.get("is_return"):
if (
not item.qty and self.doc.get("is_return") and self.doc.get("doctype") != "Purchase Receipt"
):
item.amount = flt(-1 * item.rate, item.precision("amount"))
elif not item.qty and self.doc.get("is_debit_note"):
item.amount = flt(item.rate, item.precision("amount"))