mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 15:42:52 +00:00
fix(profit-and-loss-statement-report): margin calculation the report showing null% for empty cell
This commit is contained in:
@@ -785,11 +785,19 @@ def compute_margin_view_data(data, columns, accumulated_values):
|
|||||||
|
|
||||||
for column in columns:
|
for column in columns:
|
||||||
curr_period = column.get("key")
|
curr_period = column.get("key")
|
||||||
base_value = base_row[curr_period]
|
|
||||||
curr_value = row[curr_period]
|
|
||||||
|
|
||||||
if curr_value is None or base_value <= 0:
|
base_value = base_row.get(curr_period)
|
||||||
data[row_idx][curr_period] = None
|
curr_value = row.get(curr_period)
|
||||||
|
|
||||||
|
if base_value is None or curr_value is None:
|
||||||
|
data[row_idx][curr_period] = "N/A"
|
||||||
|
continue
|
||||||
|
|
||||||
|
if base_value == 0:
|
||||||
|
if curr_value == 0:
|
||||||
|
data[row_idx][curr_period] = ""
|
||||||
|
else:
|
||||||
|
data[row_idx][curr_period] = "N/A"
|
||||||
continue
|
continue
|
||||||
|
|
||||||
margin_percent = round((curr_value / base_value) * 100, 2)
|
margin_percent = round((curr_value / base_value) * 100, 2)
|
||||||
|
|||||||
Reference in New Issue
Block a user