From 9a3569ff15bdb05fed367bb805b08baea2baca19 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 3 Jun 2024 18:34:27 +0530 Subject: [PATCH] fix: Use full name instead of abbreviation (#41738) --- erpnext/manufacturing/doctype/bom/bom.json | 6 +++--- .../doctype/bom_creator_item/bom_creator_item.json | 6 +++--- .../doctype/bom_operation/bom_operation.json | 12 ++++++------ erpnext/manufacturing/doctype/job_card/job_card.json | 4 ++-- .../production_plan_item/production_plan_item.json | 4 ++-- .../work_order_operation/work_order_operation.json | 8 ++++---- .../process_loss_report/process_loss_report.py | 7 ++++++- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json index dcc7a4f2176..a8098329c10 100644 --- a/erpnext/manufacturing/doctype/bom/bom.json +++ b/erpnext/manufacturing/doctype/bom/bom.json @@ -591,13 +591,13 @@ "default": "0", "fieldname": "fg_based_operating_cost", "fieldtype": "Check", - "label": "FG based Operating Cost" + "label": "Finished Goods based Operating Cost" }, { "depends_on": "fg_based_operating_cost", "fieldname": "fg_based_section_section", "fieldtype": "Section Break", - "label": "FG Based Operating Cost Section" + "label": "Finished Goods Based Operating Cost" }, { "depends_on": "fg_based_operating_cost", @@ -663,7 +663,7 @@ "image_field": "image", "is_submittable": 1, "links": [], - "modified": "2024-04-02 16:24:47.518411", + "modified": "2024-06-03 16:24:47.518411", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM", diff --git a/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json b/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json index 9be55667f80..7522bd24db8 100644 --- a/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json +++ b/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json @@ -83,7 +83,7 @@ "fieldname": "fg_item", "fieldtype": "Link", "in_list_view": 1, - "label": "FG Item", + "label": "Finished Goods Item", "options": "Item", "reqd": 1 }, @@ -218,7 +218,7 @@ { "fieldname": "fg_reference_id", "fieldtype": "Data", - "label": "FG Reference", + "label": "Finished Goods Reference", "no_copy": 1, "read_only": 1 }, @@ -320,7 +320,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-06-01 18:45:24.339532", + "modified": "2024-06-03 18:45:24.339532", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Creator Item", diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json index b9e960ab66e..d26529484db 100644 --- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json +++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json @@ -202,7 +202,7 @@ "fieldname": "finished_good", "fieldtype": "Link", "in_list_view": 1, - "label": "FG / Semi FG Item", + "label": "Finished Goods / Semi Finished Goods Item", "options": "Item" }, { @@ -219,7 +219,7 @@ "fieldname": "finished_good_qty", "fieldtype": "Float", "in_list_view": 1, - "label": "FG Qty" + "label": "Finished Goods Qty" }, { "default": "0", @@ -236,7 +236,7 @@ "depends_on": "eval:!doc.skip_material_transfer || doc.backflush_from_wip_warehouse", "fieldname": "wip_warehouse", "fieldtype": "Link", - "label": "WIP WH", + "label": "WIP Warehouse", "options": "Warehouse" }, { @@ -248,7 +248,7 @@ "fieldname": "fg_warehouse", "fieldtype": "Link", "in_list_view": 1, - "label": "FG WH", + "label": "Finished Goods Warehouse", "options": "Warehouse" }, { @@ -257,7 +257,7 @@ "fieldname": "source_warehouse", "fieldtype": "Link", "in_list_view": 1, - "label": "Source WH", + "label": "Source Warehouse", "options": "Warehouse" }, { @@ -290,7 +290,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-05-26 15:46:49.404875", + "modified": "2024-06-03 15:46:49.404875", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM Operation", diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json index 9a0d1c69a1b..0684fd1be01 100644 --- a/erpnext/manufacturing/doctype/job_card/job_card.json +++ b/erpnext/manufacturing/doctype/job_card/job_card.json @@ -555,7 +555,7 @@ { "fieldname": "semi_fg_bom", "fieldtype": "Link", - "label": "Semi FG BOM", + "label": "Semi Finished Goods BOM", "options": "BOM", "read_only": 1 }, @@ -614,7 +614,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2024-05-26 17:44:18.324743", + "modified": "2024-06-03 17:44:18.324743", "modified_by": "Administrator", "module": "Manufacturing", "name": "Job Card", diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json index ec6540829eb..4ac68aa9133 100644 --- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json +++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json @@ -85,7 +85,7 @@ "fieldname": "warehouse", "fieldtype": "Link", "in_list_view": 1, - "label": "FG Warehouse", + "label": "Finished Goods Warehouse", "options": "Warehouse" }, { @@ -220,7 +220,7 @@ "idx": 1, "istable": 1, "links": [], - "modified": "2024-03-27 13:10:20.252166", + "modified": "2024-06-03 13:10:20.252166", "modified_by": "Administrator", "module": "Manufacturing", "name": "Production Plan Item", diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json index 9146122a858..302f7180a48 100644 --- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json +++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json @@ -233,7 +233,7 @@ { "fieldname": "bom_no", "fieldtype": "Link", - "label": "BOM No (For Semi-FG)", + "label": "BOM No (For Semi-Finished Goods)", "options": "BOM", "read_only": 1 }, @@ -245,7 +245,7 @@ "fieldname": "finished_good", "fieldtype": "Link", "in_list_view": 1, - "label": "Semi FG / FG", + "label": "Semi Finished Goods / Finished Goods", "options": "Item", "read_only": 1 }, @@ -261,7 +261,7 @@ "fieldname": "fg_warehouse", "fieldtype": "Link", "in_list_view": 1, - "label": "FG Warehouse", + "label": "Finished Goods Warehouse", "options": "Warehouse" }, { @@ -297,7 +297,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2024-05-26 15:57:17.958543", + "modified": "2024-06-03 15:57:17.958543", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order Operation", diff --git a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py index 51efc6e655f..73560dd939b 100644 --- a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py +++ b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py @@ -102,7 +102,12 @@ def get_columns() -> Columns: "fieldtype": "Float", "width": "150", }, - {"label": _("FG Value"), "fieldname": "total_fg_value", "fieldtype": "Float", "width": "150"}, + { + "label": _("Finished Goods Value"), + "fieldname": "total_fg_value", + "fieldtype": "Float", + "width": "150", + }, { "label": _("Raw Material Value"), "fieldname": "total_rm_value",