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

fix: currency symbol in SCO and SCR (#44577)

Browse Source
This commit is contained in:
rohitwaghchaure
2024-12-07 14:05:36 +05:30
committed by GitHub
parent d871e21a40
commit 8806d17ef1
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,7 +294,7 @@
"fieldname": "total",
"fieldtype": "Currency",
"label": "Total",
"options": "currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -353,6 +353,7 @@
"fieldname": "total_additional_costs",
"fieldtype": "Currency",
"label": "Total Additional Costs",
"options": "Company:company:default_currency",
"print_hide_if_no_value": 1,
"read_only": 1
},
@@ -450,21 +451,21 @@
"options": "Project"
},
{
"fieldname": "tab_other_info",
"fieldtype": "Tab Break",
"label": "Other Info"
"fieldname": "tab_other_info",
"fieldtype": "Tab Break",
"label": "Other Info"
},
{
"fieldname": "tab_connections",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
"fieldname": "tab_connections",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
}
],
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
"modified": "2024-03-27 13:10:46.060843",
"modified": "2024-12-06 15:21:49.924146",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order",

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

@@ -188,7 +188,7 @@
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
"options": "currency",
"options": "Company:company:default_currency",
"read_only": 1,
"reqd": 1
},
@@ -202,7 +202,7 @@
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
"options": "currency",
"options": "Company:company:default_currency",
"read_only": 1,
"reqd": 1
},
@@ -272,6 +272,7 @@
"fieldname": "service_cost_per_qty",
"fieldtype": "Currency",
"label": "Service Cost Per Qty",
"options": "Company:company:default_currency",
"read_only": 1,
"reqd": 1
},
@@ -280,6 +281,7 @@
"fieldname": "additional_cost_per_qty",
"fieldtype": "Currency",
"label": "Additional Cost Per Qty",
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -287,6 +289,7 @@
"fieldtype": "Currency",
"label": "Raw Material Cost Per Qty",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -403,7 +406,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2024-03-27 13:12:46.343298",
"modified": "2024-12-06 15:23:05.252346",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Order Item",

3
erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.py
View File

@@ -26,8 +26,11 @@ class SubcontractingOrderItem(Document):
include_exploded_items: DF.Check
item_code: DF.Link
item_name: DF.Data
job_card: DF.Link | None
manufacturer: DF.Link | None
manufacturer_part_no: DF.Data | None
material_request: DF.Link | None
material_request_item: DF.Data | None
page_break: DF.Check
parent: DF.Data
parentfield: DF.Data

27
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
View File

@@ -336,7 +336,7 @@
"fieldname": "total",
"fieldtype": "Currency",
"label": "Total",
"options": "currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -618,6 +618,7 @@
"fieldname": "total_additional_costs",
"fieldtype": "Currency",
"label": "Total Additional Costs",
"options": "Company:company:default_currency",
"print_hide_if_no_value": 1,
"read_only": 1
},
@@ -656,27 +657,27 @@
"fieldtype": "Column Break"
},
{
"fieldname": "tab_other_info",
"fieldtype": "Tab Break",
"label": "Other Info"
"fieldname": "tab_other_info",
"fieldtype": "Tab Break",
"label": "Other Info"
},
{
"collapsible": 1,
"fieldname": "order_status_section",
"fieldtype": "Section Break",
"label": "Order Status"
"collapsible": 1,
"fieldname": "order_status_section",
"fieldtype": "Section Break",
"label": "Order Status"
},
{
"fieldname": "tab_connections",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
"fieldname": "tab_connections",
"fieldtype": "Tab Break",
"label": "Connections",
"show_dashboard": 1
}
],
"in_create": 1,
"is_submittable": 1,
"links": [],
"modified": "2024-05-27 15:02:13.517969",
"modified": "2024-12-06 15:24:38.384232",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt",

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

@@ -208,7 +208,7 @@
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Rate",
"options": "currency",
"options": "Company:company:default_currency",
"print_width": "100px",
"read_only": 1,
"width": "100px"
@@ -218,7 +218,7 @@
"fieldtype": "Currency",
"in_list_view": 1,
"label": "Amount",
"options": "currency",
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -232,6 +232,7 @@
"fieldtype": "Currency",
"label": "Raw Material Cost Per Qty",
"no_copy": 1,
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -240,6 +241,7 @@
"fieldname": "service_cost_per_qty",
"fieldtype": "Currency",
"label": "Service Cost Per Qty",
"options": "Company:company:default_currency",
"read_only": 1,
"reqd": 1
},
@@ -249,6 +251,7 @@
"fieldname": "additional_cost_per_qty",
"fieldtype": "Currency",
"label": "Additional Cost Per Qty",
"options": "Company:company:default_currency",
"read_only": 1
},
{
@@ -591,7 +594,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2024-03-29 15:43:43.425544",
"modified": "2024-12-06 15:23:58.680169",
"modified_by": "Administrator",
"module": "Subcontracting",
"name": "Subcontracting Receipt Item",

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

@@ -28,6 +28,7 @@ class SubcontractingReceiptItem(Document):
is_scrap_item: DF.Check
item_code: DF.Link
item_name: DF.Data | None
job_card: DF.Link | None
manufacturer: DF.Link | None
manufacturer_part_no: DF.Data | None
page_break: DF.Check