CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 05:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use label "State/Province" for translatability (backport #48273) (#48286)

Browse Source 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: use label "State/Province" for translatability (#48273)
This commit is contained in:
mergify[bot]
2025-06-26 20:49:06 +02:00
committed by GitHub
parent 894bb703f6
commit af55ce0f6c
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/crm/doctype/lead/lead.json
View File

@@ -497,7 +497,7 @@
{ {
"fieldname": "state", "fieldname": "state",
"fieldtype": "Data", "fieldtype": "Data",
"label": "State" "label": "State/Province"
}, },
{ {
"fieldname": "country", "fieldname": "country",
@@ -512,11 +512,12 @@
"show_dashboard": 1 "show_dashboard": 1
} }
], ],
"grid_page_length": 50,
"icon": "fa fa-user", "icon": "fa fa-user",
"idx": 5, "idx": 5,
"image_field": "image", "image_field": "image",
"links": [], "links": [],
"modified": "2025-01-31 13:40:08.094759", "modified": "2025-06-26 11:02:01.158901",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",
@@ -575,6 +576,7 @@
"role": "Sales User" "role": "Sales User"
} }
], ],
"row_format": "Dynamic",
"search_fields": "lead_name,lead_owner,status", "search_fields": "lead_name,lead_owner,status",
"sender_field": "email_id", "sender_field": "email_id",
"sender_name_field": "lead_name", "sender_name_field": "lead_name",

6
erpnext/crm/doctype/opportunity/opportunity.json
View File

@@ -613,7 +613,7 @@
{ {
"fieldname": "state", "fieldname": "state",
"fieldtype": "Data", "fieldtype": "Data",
"label": "State" "label": "State/Province"
}, },
{ {
"fieldname": "country", "fieldname": "country",
@@ -622,10 +622,11 @@
"options": "Country" "options": "Country"
} }
], ],
"grid_page_length": 50,
"icon": "fa fa-info-sign", "icon": "fa fa-info-sign",
"idx": 195, "idx": 195,
"links": [], "links": [],
"modified": "2024-08-20 04:12:29.095761", "modified": "2025-06-26 11:16:13.665866",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Opportunity", "name": "Opportunity",
@@ -657,6 +658,7 @@
"write": 1 "write": 1
} }
], ],
"row_format": "Dynamic",
"search_fields": "status,transaction_date,party_name,opportunity_type,territory,company", "search_fields": "status,transaction_date,party_name,opportunity_type,territory,company",
"sender_field": "contact_email", "sender_field": "contact_email",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,

2
erpnext/crm/report/lead_details/lead_details.py
View File

@@ -58,7 +58,7 @@ def get_columns():
{"label": _("Address"), "fieldname": "address", "fieldtype": "Data", "width": 130}, {"label": _("Address"), "fieldname": "address", "fieldtype": "Data", "width": 130},
{"label": _("Postal Code"), "fieldname": "pincode", "fieldtype": "Data", "width": 90}, {"label": _("Postal Code"), "fieldname": "pincode", "fieldtype": "Data", "width": 90},
{"label": _("City"), "fieldname": "city", "fieldtype": "Data", "width": 100}, {"label": _("City"), "fieldname": "city", "fieldtype": "Data", "width": 100},
{"label": _("State"), "fieldname": "state", "fieldtype": "Data", "width": 100}, {"label": _("State/Province"), "fieldname": "state", "fieldtype": "Data", "width": 100},
{ {
"label": _("Country"), "label": _("Country"),
"fieldname": "country", "fieldname": "country",

2
erpnext/public/js/utils/contact_address_quick_entry.js
View File

@@ -81,7 +81,7 @@ frappe.ui.form.ContactAddressQuickEntryForm = class ContactAddressQuickEntryForm
fieldtype: "Data", fieldtype: "Data",
}, },
{ {
label: __("State"), label: __("State/Province"),
fieldname: "state", fieldname: "state",
fieldtype: "Data", fieldtype: "Data",
}, },

6
erpnext/stock/doctype/warehouse/warehouse.json
View File

@@ -174,7 +174,7 @@
{ {
"fieldname": "state", "fieldname": "state",
"fieldtype": "Data", "fieldtype": "Data",
"label": "State", "label": "State/Province",
"oldfieldname": "state", "oldfieldname": "state",
"oldfieldtype": "Select" "oldfieldtype": "Select"
}, },
@@ -259,11 +259,12 @@
"label": "Is Rejected Warehouse" "label": "Is Rejected Warehouse"
} }
], ],
"grid_page_length": 50,
"icon": "fa fa-building", "icon": "fa fa-building",
"idx": 1, "idx": 1,
"is_tree": 1, "is_tree": 1,
"links": [], "links": [],
"modified": "2024-08-14 16:08:15.733597", "modified": "2025-06-26 11:19:04.673115",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Warehouse", "name": "Warehouse",
@@ -316,6 +317,7 @@
"role": "Manufacturing User" "role": "Manufacturing User"
} }
], ],
"row_format": "Dynamic",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",