CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: postal_code_move_and_fixes

Browse Source 
(cherry picked from commit 185bbb4c20)
This commit is contained in:
mahsem
2024-12-28 09:25:30 +01:00
committed by Mergify
parent 546da29761
commit 0e088dde36
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,12 +55,13 @@ def get_columns():
"options": "Company", "options": "Company",
"width": 120, "width": 120,
}, },
{"fieldname": "address", "label": _("Address"), "fieldtype": "Data", "width": 130}, {"label": _("Address"), "fieldname": "address", "fieldtype": "Data", "width": 130},
{"fieldname": "state", "label": _("State"), "fieldtype": "Data", "width": 100}, {"label": _("Postal Code"), "fieldname": "pincode", "fieldtype": "Data", "width": 90},
{"fieldname": "pincode", "label": _("Postal Code"), "fieldtype": "Data", "width": 90}, {"label": _("City"), "fieldname": "city", "fieldtype": "Data", "width": 100},
{"label": _("State"), "fieldname": "state", "fieldtype": "Data", "width": 100},
{ {
"fieldname": "country",
"label": _("Country"), "label": _("Country"),
"fieldname": "country",
"fieldtype": "Link", "fieldtype": "Link",
"options": "Country", "options": "Country",
"width": 100, "width": 100,
@@ -93,8 +94,9 @@ def get_data(filters):
lead.owner, lead.owner,
lead.company, lead.company,
(Concat_ws(", ", address.address_line1, address.address_line2)).as_("address"), (Concat_ws(", ", address.address_line1, address.address_line2)).as_("address"),
address.state,
address.pincode, address.pincode,
address.city,
address.state,
address.country, address.country,
) )
.where(lead.company == filters.company) .where(lead.company == filters.company)

2
erpnext/selling/report/address_and_contacts/address_and_contacts.py
View File

@@ -31,9 +31,9 @@ def get_columns(filters):
f"{frappe.unscrub(str(party_type_value))}::150", f"{frappe.unscrub(str(party_type_value))}::150",
"Address Line 1", "Address Line 1",
"Address Line 2", "Address Line 2",
"Postal Code",
"City", "City",
"State", "State",
"Postal Code",
"Country", "Country",
"Is Primary Address:Check", "Is Primary Address:Check",
"First Name", "First Name",

25
erpnext/utilities/web_form/addresses/addresses.json
View File

@@ -84,6 +84,18 @@
"reqd": 0, "reqd": 0,
"show_in_filter": 0 "show_in_filter": 0
}, },
{
"allow_read_on_all_link_options": 0,
"fieldname": "pincode",
"fieldtype": "Data",
"hidden": 0,
"label": "Postal Code",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{ {
"allow_read_on_all_link_options": 0, "allow_read_on_all_link_options": 0,
"fieldname": "city", "fieldname": "city",
@@ -108,18 +120,7 @@
"reqd": 0, "reqd": 0,
"show_in_filter": 0 "show_in_filter": 0
}, },
{
"allow_read_on_all_link_options": 0,
"fieldname": "pincode",
"fieldtype": "Data",
"hidden": 0,
"label": "Postal Code",
"max_length": 0,
"max_value": 0,
"read_only": 0,
"reqd": 0,
"show_in_filter": 0
},
{ {
"allow_read_on_all_link_options": 1, "allow_read_on_all_link_options": 1,
"fieldname": "country", "fieldname": "country",