From cfbd734f9bc7dd902c082c2e7356329a4681a4b7 Mon Sep 17 00:00:00 2001
From: s-aga-r <sagarsharma.s312@gmail.com>
Date: Wed, 1 Nov 2023 15:35:18 +0530
Subject: [PATCH 1/2] refactor: rearrange fields and update label

(cherry picked from commit ec1a7869f82c9bb3d5e12e8a9dc695823e502a4a)
---
 erpnext/stock/doctype/bin/bin.json | 53 ++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 14 deletions(-)

diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index a11572776a21..02371cf90fb7 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -5,22 +5,27 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "warehouse",
   "item_code",
-  "reserved_qty",
+  "column_break_yreo",
+  "warehouse",
+  "section_break_stag",
   "actual_qty",
-  "ordered_qty",
-  "indented_qty",
   "planned_qty",
-  "projected_qty",
+  "indented_qty",
+  "ordered_qty",
+  "column_break_xn5j",
+  "reserved_qty",
   "reserved_qty_for_production",
   "reserved_qty_for_sub_contract",
   "reserved_qty_for_production_plan",
-  "ma_rate",
+  "projected_qty",
+  "section_break_pmrs",
   "stock_uom",
-  "fcfs_rate",
+  "column_break_0slj",
   "valuation_rate",
-  "stock_value"
+  "stock_value",
+  "fcfs_rate",
+  "ma_rate"
  ],
  "fields": [
   {
@@ -56,7 +61,7 @@
    "fieldname": "reserved_qty",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Reserved Quantity",
+   "label": "Reserved Qty",
    "oldfieldname": "reserved_qty",
    "oldfieldtype": "Currency",
    "read_only": 1
@@ -67,7 +72,7 @@
    "fieldtype": "Float",
    "in_filter": 1,
    "in_list_view": 1,
-   "label": "Actual Quantity",
+   "label": "Actual Qty",
    "oldfieldname": "actual_qty",
    "oldfieldtype": "Currency",
    "read_only": 1
@@ -77,7 +82,7 @@
    "fieldname": "ordered_qty",
    "fieldtype": "Float",
    "in_list_view": 1,
-   "label": "Ordered Quantity",
+   "label": "Ordered Qty",
    "oldfieldname": "ordered_qty",
    "oldfieldtype": "Currency",
    "read_only": 1
@@ -86,7 +91,7 @@
    "default": "0.00",
    "fieldname": "indented_qty",
    "fieldtype": "Float",
-   "label": "Requested Quantity",
+   "label": "Requested Qty",
    "oldfieldname": "indented_qty",
    "oldfieldtype": "Currency",
    "read_only": 1
@@ -116,7 +121,7 @@
   {
    "fieldname": "reserved_qty_for_sub_contract",
    "fieldtype": "Float",
-   "label": "Reserved Qty for sub contract",
+   "label": "Reserved Qty for Subcontract",
    "read_only": 1
   },
   {
@@ -172,13 +177,33 @@
    "fieldtype": "Float",
    "label": "Reserved Qty for Production Plan",
    "read_only": 1
+  },
+  {
+   "fieldname": "section_break_stag",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_yreo",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_xn5j",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_pmrs",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_0slj",
+   "fieldtype": "Column Break"
   }
  ],
  "hide_toolbar": 1,
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2023-05-02 23:26:21.806965",
+ "modified": "2023-11-01 15:28:55.240522",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Bin",

From b2974fe5fa3a2dcb0dfd4fb54c526d1bdf51db7d Mon Sep 17 00:00:00 2001
From: s-aga-r <sagarsharma.s312@gmail.com>
Date: Wed, 1 Nov 2023 15:36:41 +0530
Subject: [PATCH 2/2] refactor: remove unused fields `fcfs_rate` and `ma_rate`
 from Bin

(cherry picked from commit f0a1f4ac7cb9362e8dfe05179533fe4ad00d061e)
---
 erpnext/stock/doctype/bin/bin.json | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 02371cf90fb7..02684a72419e 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -23,9 +23,7 @@
   "stock_uom",
   "column_break_0slj",
   "valuation_rate",
-  "stock_value",
-  "fcfs_rate",
-  "ma_rate"
+  "stock_value"
  ],
  "fields": [
   {
@@ -124,17 +122,6 @@
    "label": "Reserved Qty for Subcontract",
    "read_only": 1
   },
-  {
-   "fieldname": "ma_rate",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "Moving Average Rate",
-   "oldfieldname": "ma_rate",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1
-  },
   {
    "fieldname": "stock_uom",
    "fieldtype": "Link",
@@ -145,17 +132,6 @@
    "options": "UOM",
    "read_only": 1
   },
-  {
-   "fieldname": "fcfs_rate",
-   "fieldtype": "Float",
-   "hidden": 1,
-   "label": "FCFS Rate",
-   "oldfieldname": "fcfs_rate",
-   "oldfieldtype": "Currency",
-   "print_hide": 1,
-   "read_only": 1,
-   "report_hide": 1
-  },
   {
    "fieldname": "valuation_rate",
    "fieldtype": "Float",
@@ -203,7 +179,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2023-11-01 15:28:55.240522",
+ "modified": "2023-11-01 15:35:51.722534",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Bin",