| commit | d404a03947c6bc22798253e7b5fd0a9b0f107b77 | [log] [tgz] |
|---|---|---|
| author | Gokulnath <95605271+Gokulnath17@users.noreply.github.com> | Wed Dec 14 17:38:16 2022 +0530 |
| committer | GitHub <noreply@github.com> | Wed Dec 14 17:38:16 2022 +0530 |
| tree | c50aa326e2a98c3a3b8438ac93b4ead880947e96 | |
| parent | 41fc3be339cc78dc7418776556830c29aa875999 [diff] | |
| parent | 21c86bd649a734c4a20b5c54e0aaa298c8aa95a4 [diff] |
Merge branch 'develop' into Gokulnath_dev
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py index dacc809..99e86ae 100644 --- a/erpnext/accounts/report/gross_profit/gross_profit.py +++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -503,7 +503,7 @@ invoice_portion = 100 elif row.invoice_portion: invoice_portion = row.invoice_portion - else: + elif row.payment_amount: invoice_portion = row.payment_amount * 100 / row.base_net_amount if i == 0: