Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: currency symbol in landed cost voucher and material request (backport #40138) (#40141)

Browse Source 
fix: currency symbol in landed cost voucher and material request (#40138)

(cherry picked from commit 8aa2b7c1838e2af39f73557a0359313e76032197)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot] 2024-02-26 23:16:49 +05:30 committed by GitHub
parent 9d19ec43c8
commit 57bb031602
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
View File

@ -1,187 +1,77 @@
{ {
"allow_copy": 0, "actions": [],
"allow_import": 0, "creation": "2013-02-22 01:28:02",
"allow_rename": 0, "doctype": "DocType",
"beta": 0, "document_type": "Document",
"creation": "2013-02-22 01:28:02", "editable_grid": 1,
"custom": 0, "engine": "InnoDB",
"docstatus": 0, "field_order": [
"doctype": "DocType", "receipt_document_type",
"document_type": "Document", "receipt_document",
"editable_grid": 1, "supplier",
"col_break1",
"posting_date",
"grand_total"
],
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "fieldname": "receipt_document_type",
"bold": 0, "fieldtype": "Select",
"collapsible": 0, "in_list_view": 1,
"fieldname": "receipt_document_type", "label": "Receipt Document Type",
"fieldtype": "Select", "options": "\nPurchase Invoice\nPurchase Receipt",
"hidden": 0, "reqd": 1
"ignore_user_permissions": 0, },
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Receipt Document Type",
"length": 0,
"no_copy": 0,
"options": "\nPurchase Invoice\nPurchase Receipt",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_on_submit": 0, "fieldname": "receipt_document",
"bold": 0, "fieldtype": "Dynamic Link",
"collapsible": 0, "in_list_view": 1,
"fieldname": "receipt_document", "label": "Receipt Document",
"fieldtype": "Dynamic Link", "oldfieldname": "purchase_receipt_no",
"hidden": 0, "oldfieldtype": "Link",
"ignore_user_permissions": 0, "options": "receipt_document_type",
"ignore_xss_filter": 0, "print_width": "220px",
"in_filter": 0, "reqd": 1,
"in_list_view": 1,
"label": "Receipt Document",
"length": 0,
"no_copy": 0,
"oldfieldname": "purchase_receipt_no",
"oldfieldtype": "Link",
"options": "receipt_document_type",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"print_width": "220px",
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "220px" "width": "220px"
}, },
{ {
"allow_on_submit": 0, "fieldname": "supplier",
"bold": 0, "fieldtype": "Link",
"collapsible": 0, "in_list_view": 1,
"fieldname": "supplier", "label": "Supplier",
"fieldtype": "Link", "options": "Supplier",
"hidden": 0, "read_only": 1
"ignore_user_permissions": 0, },
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Supplier",
"length": 0,
"no_copy": 0,
"options": "Supplier",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_on_submit": 0, "fieldname": "col_break1",
"bold": 0, "fieldtype": "Column Break",
"collapsible": 0,
"fieldname": "col_break1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "50%" "width": "50%"
}, },
{ {
"allow_on_submit": 0, "fieldname": "posting_date",
"bold": 0, "fieldtype": "Date",
"collapsible": 0, "label": "Posting Date",
"fieldname": "posting_date", "read_only": 1
"fieldtype": "Date", },
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_on_submit": 0, "fieldname": "grand_total",
"bold": 0, "fieldtype": "Currency",
"collapsible": 0, "in_list_view": 1,
"fieldname": "grand_total", "label": "Grand Total",
"fieldtype": "Currency", "options": "Company:company:default_currency",
"hidden": 0, "read_only": 1
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
} }
], ],
"hide_heading": 0, "idx": 1,
"hide_toolbar": 0, "istable": 1,
"idx": 1, "links": [],
"image_view": 0, "modified": "2024-02-26 18:41:06.281750",
"in_create": 0, "modified_by": "Administrator",
"module": "Stock",
"is_submittable": 0, "name": "Landed Cost Purchase Receipt",
"issingle": 0, "owner": "Administrator",
"istable": 1, "permissions": [],
"max_attachments": 0, "sort_field": "modified",
"modified": "2020-09-18 17:26:09.703215", "sort_order": "ASC",
"modified_by": "Administrator", "states": []
"module": "Stock",
"name": "Landed Cost Purchase Receipt",
"owner": "Administrator",
"permissions": [],
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_order": "ASC",
"track_seen": 0
} }

4
erpnext/stock/doctype/material_request_item/material_request_item.json
View File

@ -198,12 +198,14 @@
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rate", "label": "Rate",
"options": "Company:company:default_currency",
"print_hide": 1 "print_hide": 1
}, },
{ {
"fieldname": "amount", "fieldname": "amount",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Amount", "label": "Amount",
"options": "Company:company:default_currency",
"print_hide": 1, "print_hide": 1,
"read_only": 1 "read_only": 1
}, },
@ -489,7 +491,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2024-02-08 16:30:56.137858", "modified": "2024-02-26 18:30:03.684872",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Material Request Item", "name": "Material Request Item",