diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json index 779b1567fb178d2012cd2ef1b2c599a5942d384d..9d2888058a5be9876c4ea689e862a51440cfb435 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json @@ -14,6 +14,7 @@ "supplier", "supplier_name", "supplier_warehouse", + "supplier_currency", "column_break_7", "company", "transaction_date", @@ -460,12 +461,22 @@ "fieldtype": "Tab Break", "label": "Connections", "show_dashboard": 1 + }, + { + "fetch_from": "purchase_order.currency", + "fieldname": "supplier_currency", + "fieldtype": "Link", + "hidden": 1, + "label": "Job Worker Currency", + "no_copy": 1, + "options": "Currency", + "read_only": 1 } ], "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2024-12-06 15:21:49.924146", + "modified": "2025-11-14 10:31:40.682892", "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Order", @@ -512,6 +523,7 @@ "write": 1 } ], + "row_format": "Dynamic", "search_fields": "status, transaction_date, supplier", "show_name_in_global_search": 1, "sort_field": "creation", diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py index 5c596c676e921dea97ef4ca55b04aa7cb8863c2e..be7b6ec22476a74371bb84126ec679010bf0599d 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py @@ -72,6 +72,7 @@ class SubcontractingOrder(SubcontractingController): supplied_items: DF.Table[SubcontractingOrderSuppliedItem] supplier: DF.Link supplier_address: DF.Link | None + supplier_currency: DF.Link | None supplier_name: DF.Data supplier_warehouse: DF.Link title: DF.Data | None diff --git a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json index a0286b196ca4f716c22987f5231158ac574392d4..85d892d4c7820c3df568ddae9e167b7643bb9669 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json +++ b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json @@ -67,7 +67,7 @@ "fieldtype": "Currency", "in_list_view": 1, "label": "Rate", - "options": "currency", + "options": "supplier_currency", "reqd": 1 }, { @@ -76,7 +76,7 @@ "fieldtype": "Currency", "in_list_view": 1, "label": "Amount", - "options": "currency", + "options": "supplier_currency", "read_only": 1, "reqd": 1 }, @@ -155,7 +155,7 @@ ], "istable": 1, "links": [], - "modified": "2024-12-05 17:33:46.099601", + "modified": "2025-11-13 16:04:45.020225", "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Order Service Item", @@ -163,6 +163,7 @@ "owner": "Administrator", "permissions": [], "quick_entry": 1, + "row_format": "Dynamic", "search_fields": "item_name", "sort_field": "creation", "sort_order": "DESC",