From 8d0b45b835c9f393ac61cb6f4bbe32ed7226121a Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 29 Jan 2023 11:52:25 +0530 Subject: [PATCH 1/3] 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) From 5a9673ae1f95ae3816b25823bf4e2725c7417797 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sun, 29 Jan 2023 12:22:01 +0530 Subject: [PATCH 2/3] chore: add `Item Name` column in `Warehouse wise Item Balance Age and Value` report (cherry picked from commit 56356ffbb9302d36c6b206102fda94fc5997f2a6) --- .../warehouse_wise_item_balance_age_and_value.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 7e090864d46..bd657ad74d8 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 @@ -62,7 +62,7 @@ def execute(filters=None): continue total_stock_value = sum(item_value[(item, item_group)]) - row = [item, item_group, total_stock_value] + row = [item, item_map[item]["item_name"], item_group, total_stock_value] fifo_queue = item_ageing[item]["fifo_queue"] average_age = 0.00 @@ -96,6 +96,7 @@ def get_columns(filters): _("Age") + ":Float:60", ======= _("Item") + ":Link/Item:150", + _("Item Name") + ":Link/Item:150", _("Item Group") + "::120", _("Value") + ":Currency:120", _("Age") + ":Float:120", From 745bef8ebc19c14c31f34cbcd0d4dc59e4aef3c9 Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sat, 4 Feb 2023 13:51:17 +0530 Subject: [PATCH 3/3] 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)