nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong currency in Subcontracting Order Service Item (#50517)

Browse Source
This commit is contained in:
Mihir Kandoi
2025-11-14 10:51:06 +05:30
committed by GitHub
parent 4f720b3969
commit b98f4611e6
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
View File

@@ -14,6 +14,7 @@
"supplier", "supplier",
"supplier_name", "supplier_name",
"supplier_warehouse", "supplier_warehouse",
"supplier_currency",
"column_break_7", "column_break_7",
"company", "company",
"transaction_date", "transaction_date",
@@ -460,12 +461,22 @@
"fieldtype": "Tab Break", "fieldtype": "Tab Break",
"label": "Connections", "label": "Connections",
"show_dashboard": 1 "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", "icon": "fa fa-file-text",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-12-06 15:21:49.924146", "modified": "2025-11-14 10:31:40.682892",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Subcontracting", "module": "Subcontracting",
"name": "Subcontracting Order", "name": "Subcontracting Order",
@@ -512,6 +523,7 @@
"write": 1 "write": 1
} }
], ],
"row_format": "Dynamic",
"search_fields": "status, transaction_date, supplier", "search_fields": "status, transaction_date, supplier",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "creation", "sort_field": "creation",
@@ -520,4 +532,4 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "supplier_name", "title_field": "supplier_name",
"track_changes": 1 "track_changes": 1
} }

1
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
View File

@@ -72,6 +72,7 @@ class SubcontractingOrder(SubcontractingController):
supplied_items: DF.Table[SubcontractingOrderSuppliedItem] supplied_items: DF.Table[SubcontractingOrderSuppliedItem]
supplier: DF.Link supplier: DF.Link
supplier_address: DF.Link | None supplier_address: DF.Link | None
supplier_currency: DF.Link | None
supplier_name: DF.Data supplier_name: DF.Data
supplier_warehouse: DF.Link supplier_warehouse: DF.Link
title: DF.Data | None title: DF.Data | None

9
erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
View File

@@ -67,7 +67,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"options": "currency", "options": "supplier_currency",
"reqd": 1 "reqd": 1
}, },
{ {
@@ -76,7 +76,7 @@
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"options": "currency", "options": "supplier_currency",
"read_only": 1, "read_only": 1,
"reqd": 1 "reqd": 1
}, },
@@ -155,7 +155,7 @@
], ],
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-12-05 17:33:46.099601", "modified": "2025-11-13 16:04:45.020225",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Subcontracting", "module": "Subcontracting",
"name": "Subcontracting Order Service Item", "name": "Subcontracting Order Service Item",
@@ -163,8 +163,9 @@
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 1, "quick_entry": 1,
"row_format": "Dynamic",
"search_fields": "item_name", "search_fields": "item_name",
"sort_field": "creation", "sort_field": "creation",
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }