Update Master (#27)

Update Master

Author: vjFaLk

bloomstack_core/bloomstack_core/doctype/compliance_info/compliance_info.json

@@ -2,7 +2,7 @@
  "allow_copy": 0, 
  "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
- "allow_import": 0, 
+ "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "", 
  "beta": 0, 
@@ -48,6 +48,38 @@
    "translatable": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fetch_if_empty": 0, 
+   "fieldname": "cb_entity", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
@@ -190,7 +222,7 @@
    "collapsible": 0, 
    "columns": 0, 
    "fetch_if_empty": 0, 
-   "fieldname": "column_break_3", 
+   "fieldname": "cb_compliance", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -291,7 +323,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2019-05-02 03:04:22.955723", 
+ "modified": "2019-05-31 00:33:10.835703", 
  "modified_by": "Administrator", 
  "module": "Bloomstack Core", 
  "name": "Compliance Info", 

bloomstack_core/bloomstack_core/report/__init__.py

@@ -0,0 +1,34 @@
+// Copyright (c) 2019, Bloom Stack and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Address And Contacts"] = {
+	filters: [
+		{
+			reqd: 1,
+			fieldname: "party_type",
+			label: __("Party Type"),
+			fieldtype: "Link",
+			options: "DocType",
+			get_query: () => {
+				return {
+					filters: {
+						"name": ["in", ["Customer", "Supplier", "Sales Partner"]],
+					}
+				}
+			}
+		},
+		{
+			fieldname: "party_name",
+			label: __("Party Name"),
+			fieldtype: "Dynamic Link",
+			get_options: () => {
+				let party_type = frappe.query_report.get_filter_value('party_type');
+				if (!party_type) {
+					frappe.throw(__("Please select Party Type first"));
+				}
+				return party_type;
+			}
+		}
+	]
+}

bloomstack_core/bloomstack_core/report/address_and_contacts/__init__.py

@@ -0,0 +1,34 @@
+{
+ "add_total_row": 0, 
+ "creation": "2018-06-01 09:32:13.088771", 
+ "disable_prepared_report": 0, 
+ "disabled": 0, 
+ "docstatus": 0, 
+ "doctype": "Report", 
+ "idx": 0, 
+ "is_standard": "Yes", 
+ "letter_head": "Test", 
+ "modified": "2019-05-13 23:28:25.549924", 
+ "modified_by": "Administrator", 
+ "module": "Bloomstack Core", 
+ "name": "Address And Contacts", 
+ "owner": "Administrator", 
+ "prepared_report": 0, 
+ "ref_doctype": "Address", 
+ "report_name": "Address And Contacts", 
+ "report_type": "Script Report", 
+ "roles": [
+  {
+   "role": "Sales User"
+  }, 
+  {
+   "role": "Purchase User"
+  }, 
+  {
+   "role": "Maintenance User"
+  }, 
+  {
+   "role": "Accounts User"
+  }
+ ]
+}

bloomstack_core/bloomstack_core/report/address_and_contacts/address_and_contacts.js

@@ -0,0 +1,163 @@
+# Copyright (c) 2019, Bloom Stack and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+
+from six import iteritems
+from six.moves import range
+
+import frappe
+
+field_map = {
+	"Contact": ["first_name", "last_name", "phone", "mobile_no", "email_id", "is_primary_contact"],
+	"Address": ["address_line1", "address_line2", "city", "state", "pincode", "country", "is_primary_address"]
+}
+
+
+def execute(filters=None):
+	columns = get_columns(filters)
+	data = get_data(filters)
+
+	return columns, data
+
+
+def get_party_group(party_type):
+	if not party_type:
+		return
+
+	group = {
+		"Customer": "customer_group",
+		"Supplier": "supplier_group",
+		"Sales Partner": "partner_type"
+	}
+
+	return group[party_type]
+
+
+def get_columns(filters):
+	party_type = filters.get("party_type")
+	party_group = get_party_group(party_type)
+
+	columns = [
+		"{0}:Link/{0}".format(party_type),
+		"{0}::150".format(frappe.unscrub(str(party_group)))
+	]
+
+	if party_type == "Customer":
+		columns.extend([
+			"Territory",
+			"Sales Partner"
+		])
+
+	if party_type in ("Customer", "Supplier"):
+		columns.extend([
+			"License Type",
+			"License Number",
+			"Seller Permit"
+		])
+
+	columns.extend([
+		"Address Line 1",
+		"Address Line 2",
+		"City",
+		"State",
+		"Postal Code",
+		"Country",
+		"Is Primary Address:Check",
+		"First Name",
+		"Last Name",
+		"Phone",
+		"Mobile No",
+		"Email Id",
+		"Is Primary Contact:Check"
+	])
+
+	return columns
+
+
+def get_data(filters):
+	party_type = filters.get("party_type")
+	party = filters.get("party_name")
+	party_group = get_party_group(party_type)
+
+	return get_party_addresses_and_contact(party_type, party, party_group)
+
+
+def get_party_details(party_type, party_list, party_details):
+	for doctype in ("Contact", "Address"):
+		filters = [
+			["Dynamic Link", "link_doctype", "=", party_type],
+			["Dynamic Link", "link_name", "in", party_list]
+		]
+		fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
+
+		records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
+
+		for d in records:
+			details = party_details.get(d[0])
+			details.setdefault(frappe.scrub(doctype), []).append(d[1:])
+
+	return party_details
+
+
+def add_blank_columns_for(doctype):
+	return [None for field in field_map.get(doctype, [])]
+
+
+def get_party_addresses_and_contact(party_type, party, party_group):
+	data = []
+
+	# Build party details
+	party_details = frappe._dict()
+
+	if not party_type:
+		return []
+
+	filters = {"name": party} if party else None
+
+	party_list = frappe.get_list(party_type, filters=filters, fields=["name", party_group])
+	party_names = [d.get("name") for d in party_list]
+	party_groups = {d.get("name"): d.get(party_group) for d in party_list}
+
+	for d in party_names:
+		party_details.setdefault(d, frappe._dict())
+
+	party_details = get_party_details(party_type, party_names, party_details)
+
+	# Add a row for each party address and contact, along with party details
+	for party, details in iteritems(party_details):
+		territory = sales_partner = license_type = license_number = seller_permit = None
+
+		if party_type == "Customer":
+			territory = frappe.db.get_value(party_type, party, "territory")
+			sales_partner = frappe.db.get_value(party_type, party, "default_sales_partner")
+
+		if party_type in ("Customer", "Supplier"):
+			if frappe.db.exists("Compliance Info", {"entity_type": party_type, "entity": party}):
+				license_type, license_number, seller_permit = frappe.db.get_value("Compliance Info",
+					{"entity_type": party_type, "entity": party},
+					["license_type", "license_number", "seller_permit"])
+
+		# If no addresses and contacts exist, add a single row to display the party
+		addresses = details.get("address", [])
+		contacts = details.get("contact", [])
+		max_length = max(len(addresses), len(contacts), 1)
+
+		for idx in range(max_length):
+			result = [party]
+			result.append(party_groups.get(party))
+
+			if party_type == "Customer":
+				result.extend([territory, sales_partner])
+
+			if party_type in ("Customer", "Supplier"):
+				result.extend([license_type, license_number, seller_permit])
+
+			address = addresses[idx] if idx < len(addresses) else add_blank_columns_for("Address")
+			contact = contacts[idx] if idx < len(contacts) else add_blank_columns_for("Contact")
+
+			result.extend(address)
+			result.extend(contact)
+			data.append(result)
+
+	return data

bloomstack_core/bloomstack_core/report/address_and_contacts/address_and_contacts.json

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Waste Disposal", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Waste Disposal
+		() => frappe.tests.make('Waste Disposal', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

bloomstack_core/bloomstack_core/report/address_and_contacts/address_and_contacts.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Bloom Stack, Inc and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+
+
+class TestWasteDisposal(unittest.TestCase):
+	pass