From cbc49e29896476dd0be03a77e031fa240010bf4c Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 19 Jan 2017 17:45:22 +0530 Subject: [PATCH] [WIP] Address and Contact Fixes --- .../__init__.py | 0 .../supplier_addresses_and_contacts.json | 17 ----------------- erpnext/config/buying.py | 8 ++++++-- erpnext/config/selling.py | 18 ++++++++++++++++-- erpnext/crm/doctype/lead/lead.js | 1 + .../__init__.py | 0 .../customer_addresses_and_contacts.json | 19 ------------------- .../report/lead_details/lead_details.json | 6 ++++-- .../doctype/sales_partner/sales_partner.js | 4 ++-- 9 files changed, 29 insertions(+), 44 deletions(-) delete mode 100644 erpnext/buying/report/supplier_addresses_and_contacts/__init__.py delete mode 100644 erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json delete mode 100644 erpnext/selling/report/customer_addresses_and_contacts/__init__.py delete mode 100644 erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json diff --git a/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py b/erpnext/buying/report/supplier_addresses_and_contacts/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json b/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json deleted file mode 100644 index 128548f82a2..00000000000 --- a/erpnext/buying/report/supplier_addresses_and_contacts/supplier_addresses_and_contacts.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "apply_user_permissions": 1, - "creation": "2013-10-09 10:38:40", - "docstatus": 0, - "doctype": "Report", - "idx": 1, - "is_standard": "Yes", - "modified": "2014-09-11 08:53:17.358554", - "modified_by": "Administrator", - "module": "Buying", - "name": "Supplier Addresses and Contacts", - "owner": "Administrator", - "query": "SELECT\n `tabSupplier`.name as \"Supplier:Link/Supplier:120\",\n\t`tabSupplier`.supplier_name as \"Supplier Name::120\",\n\t`tabSupplier`.supplier_type as \"Supplier Type:Link/Supplier Type:120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2), \n\t\ttabAddress.state, tabAddress.pincode, tabAddress.country\n\t) as 'Address::180',\n concat_ws(', ', `tabContact`.first_name, `tabContact`.last_name) as \"Contact Name::180\",\n\t`tabContact`.phone as \"Phone\",\n\t`tabContact`.mobile_no as \"Mobile No\",\n\t`tabContact`.email_id as \"Email Address::120\",\n\t`tabContact`.is_primary_contact as \"Is Primary Contact::120\"\nFROM\n\t`tabSupplier`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.supplier=`tabSupplier`.name\n\t)\n\tleft join `tabContact` on (\n\t\t`tabContact`.supplier=`tabSupplier`.name\n\t)\nWHERE\n\t`tabSupplier`.docstatus<2\nORDER BY\n\t`tabSupplier`.name asc", - "ref_doctype": "Supplier", - "report_name": "Supplier Addresses and Contacts", - "report_type": "Query Report" -} \ No newline at end of file diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py index e246266b291..990ca7a8ba4 100644 --- a/erpnext/config/buying.py +++ b/erpnext/config/buying.py @@ -172,8 +172,12 @@ def get_data(): { "type": "report", "is_query_report": True, - "name": "Supplier Addresses and Contacts", - "doctype": "Supplier" + "name": "Addresses And Contacts", + "label": "Supplier Addresses And Contacts", + "doctype": "Address", + "route_options": { + "party_type": "Supplier" + } }, ] }, diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py index c406d09b1da..bbae2455519 100644 --- a/erpnext/config/selling.py +++ b/erpnext/config/selling.py @@ -117,6 +117,16 @@ def get_data(): "link": "Tree/Sales Person", "description": _("Manage Sales Person Tree."), }, + { + "type": "report", + "is_query_report": True, + "name": "Addresses And Contacts", + "label": "Sales Partner Addresses And Contacts", + "doctype": "Address", + "route_options": { + "party_type": "Sales Partner" + } + }, { "type": "report", "is_query_report": True, @@ -215,8 +225,12 @@ def get_data(): { "type": "report", "is_query_report": True, - "name": "Customer Addresses And Contacts", - "doctype": "Contact" + "name": "Addresses And Contacts", + "label": "Customer Addresses And Contacts", + "doctype": "Address", + "route_options": { + "party_type": "Customer" + } }, { "type": "report", diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js index be3cd82e7fa..fd7d9c1f6a0 100644 --- a/erpnext/crm/doctype/lead/lead.js +++ b/erpnext/crm/doctype/lead/lead.js @@ -25,6 +25,7 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({ refresh: function() { var doc = this.frm.doc; erpnext.toggle_naming_series(); + frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'name', doctype: 'Lead'} if(!this.frm.doc.__islocal && this.frm.doc.__onload && !this.frm.doc.__onload.is_customer) { this.frm.add_custom_button(__("Customer"), this.create_customer, __("Make")); diff --git a/erpnext/selling/report/customer_addresses_and_contacts/__init__.py b/erpnext/selling/report/customer_addresses_and_contacts/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json b/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json deleted file mode 100644 index 1f6707beb9e..00000000000 --- a/erpnext/selling/report/customer_addresses_and_contacts/customer_addresses_and_contacts.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "add_total_row": 0, - "apply_user_permissions": 1, - "creation": "2012-10-04 18:45:27", - "disabled": 0, - "docstatus": 0, - "doctype": "Report", - "idx": 1, - "is_standard": "Yes", - "modified": "2015-08-24 11:44:00.711112", - "modified_by": "Administrator", - "module": "Selling", - "name": "Customer Addresses And Contacts", - "owner": "Administrator", - "query": "SELECT\n\t`tabCustomer`.name as \"Customer ID:Link/Customer\",\n\t`tabCustomer`.customer_name as \"Customer Name\",\n\t`tabCustomer`.customer_group as \"Customer Group:Link/Customer Group\",\n\t`tabAddress`.address_line1 as \"Address Line 1\",\n\t`tabAddress`.address_line2 as \"Address Line 2\",\n\t`tabAddress`.city as \"City\",\n\t`tabAddress`.state as \"State\",\n\t`tabAddress`.pincode as \"Postal Code\",\n\t`tabAddress`.country as \"Country\",\n\t`tabAddress`.is_primary_address as \"Is Primary Address:Check\", \n\t`tabContact`.first_name as \"First Name\",\n\t`tabContact`.last_name as \"Last Name\",\n\t`tabContact`.phone as \"Phone\",\n\t`tabContact`.mobile_no as \"Mobile No\",\n\t`tabContact`.email_id as \"Email Address\",\n\t`tabContact`.is_primary_contact as \"Is Primary Contact:Check\"\nFROM\n\t`tabCustomer`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.customer=`tabCustomer`.name\n\t)\n\tleft join `tabContact` on (\n\t\t`tabContact`.customer=`tabCustomer`.name\n\t)\nWHERE\n\t`tabCustomer`.docstatus<2\nORDER BY\n\t`tabCustomer`.name asc", - "ref_doctype": "Customer", - "report_name": "Customer Addresses And Contacts", - "report_type": "Query Report" -} \ No newline at end of file diff --git a/erpnext/selling/report/lead_details/lead_details.json b/erpnext/selling/report/lead_details/lead_details.json index 387b5f89f61..047b4b785b6 100644 --- a/erpnext/selling/report/lead_details/lead_details.json +++ b/erpnext/selling/report/lead_details/lead_details.json @@ -1,16 +1,18 @@ { + "add_total_row": 0, "apply_user_permissions": 1, "creation": "2013-10-22 11:58:16", + "disabled": 0, "docstatus": 0, "doctype": "Report", "idx": 1, "is_standard": "Yes", - "modified": "2015-02-02 11:39:57.231750", + "modified": "2017-01-19 15:44:59.742195", "modified_by": "Administrator", "module": "Selling", "name": "Lead Details", "owner": "Administrator", - "query": "SELECT\n `tabLead`.name as \"Lead Id:Link/Lead:120\",\n `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Address::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.lead=`tabLead`.name\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", + "query": "SELECT\n `tabLead`.name as \"Lead Id:Link/Lead:120\",\n `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabDynamic Link` on (\n\t\t`tabDynamic Link`.link_name=`tabLead`.name\n\t)\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.name=`tabDynamic Link`.parent\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc", "ref_doctype": "Lead", "report_name": "Lead Details", "report_type": "Query Report" diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js index 1bfba98b270..5da0ecc529b 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.js +++ b/erpnext/setup/doctype/sales_partner/sales_partner.js @@ -6,11 +6,11 @@ frappe.ui.form.on('Sales Partner', { frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Sales Person'} if(frm.doc.__islocal){ - hide_field(['address_html', 'contact_html']); + hide_field(['address_html', 'contact_html', 'address_contacts']); erpnext.utils.clear_address_and_contact(frm); } else{ - unhide_field(['address_html', 'contact_html']); + unhide_field(['address_html', 'contact_html', 'address_contacts']); erpnext.utils.render_address_and_contact(frm); } }