fix: ui issues across multiple pages

frappe · Jan 11, 2025 · 4617588 · 4617588
1 parent 1f1c01d
commit 4617588
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -199,9 +199,10 @@
   },
   {
    "depends_on": "eval:doc.get_items_from && doc.docstatus == 0",
+   "description": "Get Finished Goods for Manufacture",
    "fieldname": "get_items",
    "fieldtype": "Button",
-   "label": "Get Finished Goods for Manufacture"
+   "label": "Get Finished Goods"
   },
   {
    "fieldname": "po_items",
@@ -439,7 +440,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-12-04 11:55:03.108971",
+ "modified": "2025-01-10 17:47:52.207209",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan",

diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -717,7 +717,6 @@ erpnext.work_order = {
 									);
 								}
 							);
-							consumption_btn.addClass("btn-primary");
 						}
 					}
 				}

diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
@@ -267,7 +267,11 @@ erpnext.buying.SubcontractingOrderController = class SubcontractingOrderControll
 						);
 					}
 				}
-				cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
+				if (flt(doc.per_received) < 100 && me.has_unsupplied_items()) {
+					cur_frm.page.set_inner_btn_group_as_primary(__("Transfer"));
+				} else {
+					cur_frm.page.set_inner_btn_group_as_primary(__("Create"));
+				}
 			}
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -717,7 +717,6 @@ erpnext.work_order = { @@
     									);
     								}
     							);
-    							consumption_btn.addClass("btn-primary");
     						}
     					}
     				}
@@ Expand Down @@