Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change State to State/Province #39223

Closed
wants to merge 12 commits into from
Closed

Change State to State/Province #39223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7a8cad
Update lead.json State to State/Province to sync with frappe existing…
mahsem Jan 8, 2024
f6b5ade
Update lead_details.py State to State/Province and sync with frappe e…
mahsem Jan 8, 2024
6d87032
Update addresses.json State to State/Province and sync with frappe ex…
mahsem Jan 8, 2024
84725f1
Update warehouse.json State to State/Province and sync with frappe ex…
mahsem Jan 8, 2024
1683214
Update purchase_taxes_and_charges.json
mahsem Jan 8, 2024
9d8e11d
Update sales_taxes_and_charges.json
mahsem Jan 8, 2024
a5d1424
Update advance_taxes_and_charges.json
mahsem Jan 8, 2024
fbd319c
Update pos_closing_entry_taxes.json
mahsem Jan 8, 2024
f68cea2
Update item_wise_sales_register.py
mahsem Jan 8, 2024
63d3355
Update account.json
mahsem Jan 8, 2024
b48a6f6
Update employee.json Change Personal to Personal Details
mahsem Jan 9, 2024
5fb3fa6
Merge branch 'frappe:develop' into develop
mahsem Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion erpnext/accounts/doctype/account/account.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"description": "Rate at which this tax is applied",
"fieldname": "tax_rate",
"fieldtype": "Float",
"label": "Rate",
"label": "Tax Rate",
"oldfieldname": "tax_rate",
"oldfieldtype": "Currency"
},
Expand Down
4 changes: 2 additions & 2 deletions erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"fieldname": "rate",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Rate",
"label": "Tax Rate",
"oldfieldname": "rate",
"oldfieldtype": "Currency"
},
Expand Down Expand Up @@ -187,4 +187,4 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "ASC"
}
}
4 changes: 2 additions & 2 deletions erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"fieldname": "rate",
"fieldtype": "Percent",
"in_list_view": 1,
"label": "Rate",
"label": "Tax Rate",
"read_only": 1
},
{
Expand Down Expand Up @@ -45,4 +45,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}
2 changes: 1 addition & 1 deletion erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def get_columns(additional_table_columns, filters):
"width": 100,
},
{
"label": _("Rate"),
"label": _("Tax Rate"),
"fieldname": "rate",
"fieldtype": "Float",
"options": "currency",
Expand Down
4 changes: 2 additions & 2 deletions erpnext/crm/doctype/lead/lead.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
{
"fieldname": "state",
"fieldtype": "Data",
"label": "State"
"label": "State/Province"
},
{
"fieldname": "country",
Expand Down Expand Up @@ -584,4 +584,4 @@
"states": [],
"subject_field": "title",
"title_field": "title"
}
}
2 changes: 1 addition & 1 deletion erpnext/crm/report/lead_details/lead_details.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def get_columns():
"width": 120,
},
{"fieldname": "address", "label": _("Address"), "fieldtype": "Data", "width": 130},
{"fieldname": "state", "label": _("State"), "fieldtype": "Data", "width": 100},
{"fieldname": "state", "label": _("State/Province"), "fieldtype": "Data", "width": 100},
{"fieldname": "pincode", "label": _("Postal Code"), "fieldtype": "Data", "width": 90},
{
"fieldname": "country",
Expand Down
4 changes: 2 additions & 2 deletions erpnext/setup/doctype/employee/employee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@
"collapsible": 1,
"fieldname": "personal_details",
"fieldtype": "Tab Break",
"label": "Personal"
"label": "Personal Details"
},
{
"fieldname": "passport_number",
Expand Down Expand Up @@ -872,4 +872,4 @@
"sort_order": "DESC",
"states": [],
"title_field": "employee_name"
}
}
4 changes: 2 additions & 2 deletions erpnext/stock/doctype/warehouse/warehouse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
{
"fieldname": "state",
"fieldtype": "Data",
"label": "State",
"label": "State/Province",
"oldfieldname": "state",
"oldfieldtype": "Select"
},
Expand Down Expand Up @@ -314,4 +314,4 @@
"states": [],
"title_field": "warehouse_name",
"track_changes": 1
}
}
4 changes: 2 additions & 2 deletions erpnext/utilities/web_form/addresses/addresses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"fieldname": "state",
"fieldtype": "Data",
"hidden": 0,
"label": "State",
"label": "State/Province",
"max_length": 0,
"max_value": 0,
"read_only": 0,
Expand Down Expand Up @@ -193,4 +193,4 @@
"show_in_filter": 0
}
]
}
}
Loading