From 745bef8ebc19c14c31f34cbcd0d4dc59e4aef3c9 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sat, 4 Feb 2023 13:51:17 +0530 Subject: [PATCH] chore: conflicts --- .../warehouse_wise_item_balance_age_and_value.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py index bd657ad74d8..d561a9e172a 100644 --- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py +++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py @@ -89,18 +89,11 @@ def get_columns(filters): """return columns""" columns = [ -<<<<<<< HEAD - _("Item") + ":Link/Item:180", - _("Item Group") + "::100", - _("Value") + ":Currency:100", - _("Age") + ":Float:60", -======= _("Item") + ":Link/Item:150", _("Item Name") + ":Link/Item:150", _("Item Group") + "::120", _("Value") + ":Currency:120", _("Age") + ":Float:120", ->>>>>>> d7a665cb84 (chore: column width in `Warehouse wise Item Balance Age and Value` report) ] return columns @@ -140,14 +133,7 @@ def get_warehouse_list(filters): def add_warehouse_column(columns, warehouse_list): if len(warehouse_list) > 1: -<<<<<<< HEAD - columns += [_("Total Qty") + ":Int:50"] - - for wh in warehouse_list: - columns += [_(wh.name) + ":Int:54"] -======= columns += [_("Total Qty") + ":Int:120"] for wh in warehouse_list: columns += [_(wh.name) + ":Int:100"] ->>>>>>> d7a665cb84 (chore: column width in `Warehouse wise Item Balance Age and Value` report)