From 8d0b45b835c9f393ac61cb6f4bbe32ed7226121a Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 29 Jan 2023 11:52:25 +0530 Subject: [PATCH] chore: column width in `Warehouse wise Item Balance Age and Value` report (cherry picked from commit d7a665cb8478c72efbb7046ec1432eaa04ecc247) # Conflicts: # erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py --- .../warehouse_wise_item_balance_age_and_value.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 10d951b7bd4..7e090864d46 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,10 +89,17 @@ 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 Group") + "::120", + _("Value") + ":Currency:120", + _("Age") + ":Float:120", +>>>>>>> d7a665cb84 (chore: column width in `Warehouse wise Item Balance Age and Value` report) ] return columns @@ -132,7 +139,14 @@ 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)