From 831a7ddd6f43b58f3625edf85d8f74f729736ccb Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 1 Feb 2020 23:14:11 +0530 Subject: [PATCH] fix: Minor fixes --- .../item_wise_sales_register.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py index cf48ad4701d..dc900f09e36 100644 --- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py @@ -106,7 +106,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum group_by_field, subtotal_display_field = get_group_by_and_display_fields(filters) data, prev_group_by_value = add_total_row(data, filters, prev_group_by_value, d, total_row_map, group_by_field, subtotal_display_field, grand_total) - update_total_row(row, total_row_map, d.get(group_by_field, ''), tax_columns) + add_sub_total_row(row, total_row_map, d.get(group_by_field, ''), tax_columns) data.append(row) @@ -565,10 +565,10 @@ def add_total_row(data, filters, prev_group_by_value, item, total_row_map, def get_display_value(filters, group_by_field, item): if filters.get('group_by') == 'Item': if item.get('item_code') != item.get('item_name'): - value = item.get('item_code') + "

" + \ - "" + item.get('item_name') + "" + value = cstr(item.get('item_code')) + "

" + \ + "" + cstr(item.get('item_name')) + "" else: - value = cstr(item.get('item_code')) + value = item.get('item_code', '') elif filters.get('group_by') in ('Customer', 'Supplier'): party = frappe.scrub(filters.get('group_by')) if item.get(party) != item.get(party+'_name'): @@ -594,7 +594,7 @@ def get_group_by_and_display_fields(filters): return group_by_field, subtotal_display_field -def update_total_row(item, total_row_map, group_by_value, tax_columns): +def add_sub_total_row(item, total_row_map, group_by_value, tax_columns): total_row = total_row_map.get(group_by_value) total_row['stock_qty'] += item['stock_qty'] total_row['amount'] += item['amount']