nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 19:19:17 +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",
"width": 120,
},
{"fieldname": "address", "label": _("Address"), "fieldtype": "Data", "width": 130},
{"fieldname": "state", "label": _("State"), "fieldtype": "Data", "width": 100},
{"fieldname": "pincode", "label": _("Postal Code"), "fieldtype": "Data", "width": 90},
{"label": _("Address"), "fieldname": "address", "fieldtype": "Data", "width": 130},
{"label": _("Postal Code"), "fieldname": "pincode", "fieldtype": "Data", "width": 90},
{"label": _("City"), "fieldname": "city", "fieldtype": "Data", "width": 100},
{"label": _("State"), "fieldname": "state", "fieldtype": "Data", "width": 100},
{
"fieldname": "country",
"label": _("Country"),
"fieldname": "country",
"fieldtype": "Link",
"options": "Country",
"width": 100,
@@ -93,8 +94,9 @@ def get_data(filters):
lead.owner,
lead.company,
(Concat_ws(", ", address.address_line1, address.address_line2)).as_("address"),
address.state,
address.pincode,
address.city,
address.state,
address.country,
)
.where(lead.company == filters.company)