Merge branch 'staging' into production

Author: sahil28297

bloomstack_core/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '2.0.10'
+__version__ = '2.0.11'

bloomstack_core/bloomstack_core/page/license_search/license_search.js

@@ -253,20 +253,49 @@ class LicenseSearch {
 	}
 
 	create_document(doctype, license) {
-		frappe.show_alert({
-			message: __("Saving License {0}", [license.license_number]),
-			indicator: "blue"
-		});
-		frappe.xcall("bloomstack_core.bloomstack_core.page.license_search.license_search.add_license", {
-			license: license
-		}).then(r => {
-			frappe.show_alert({
-				message: __("Saved"),
-				indicator: "green"
-			});
+		let me = this;
 
-			frappe.new_doc(doctype);
+		let d = new frappe.ui.Dialog({
+			title: __("Select Company"),
+			fields: [
+				{
+					label: __("Company"),
+					fieldtype: "Link",
+					fieldname: "company",
+					options: "Company",
+					reqd: 1
+				}
+			],
+			primary_action: function() {
+				d.hide();
+				let values = d.get_values();
+				frappe.show_alert({
+					message: __("Saving License {0}", [license.license_number]),
+					indicator: "blue"
+				});
+				frappe.xcall("bloomstack_core.bloomstack_core.page.license_search.license_search.add_license", {
+					license: license,
+					company: values.company
+				}).then(r => {
+					frappe.show_alert({
+						message: __("Saved"),
+						indicator: "green"
+					});
+
+					frappe.model.open_mapped_doc({
+						method: "bloomstack_core.bloomstack_core.page.license_search.license_search.create_party_with_license",
+						args: {
+							party: doctype,
+							license: {
+								license: r
+							}
+						}
+					});
+				});
+			}
 		});
+
+		d.show();
 	}
 
 	get_address(city, country, zip_code) {
@@ -343,4 +372,4 @@ class LicenseSearch {
 	get_license_types() {
 		return this.license_types;
 	}
-}
+}

bloomstack_core/bloomstack_core/page/license_search/license_search.py

@@ -69,7 +69,7 @@ def fetch_license_types_from_bloomtrace():
 	return frappe.cache().hget("cannabis", "license_type")
 
 @frappe.whitelist()
-def add_license(license):
+def add_license(license, company):
 	license = json.loads(license)
 
 	existing_license = frappe.db.exists("Compliance Info", license.get("license_number"))
@@ -80,6 +80,7 @@ def add_license(license):
 
 	doc = frappe.get_doc({
 		"doctype": "Compliance Info",
+		"company": company,
 		"license_number": license.get("license_number"),
 		"license_type": license.get("license_type"),
 		"license_category": license.get("license_category"),
@@ -92,3 +93,12 @@ def add_license(license):
 	}).insert(ignore_permissions=True)
 
 	return doc.name
+
+@frappe.whitelist()
+def create_party_with_license(source_name, target_doc=None):
+	args = frappe.flags.args
+
+	party = frappe.new_doc(args.party)
+	party.append("licenses", args.license)
+
+	return party

bloomstack_core/patches.txt

@@ -13,4 +13,4 @@ bloomstack_core.patches.v0_0_1.set_task_name_in_timesheet
 bloomstack_core.patches.v0_0_1.move_compliance_item_to_item
 bloomstack_core.patches.v0_0_1.remove_bloomstack_user_integration
 bloomstack_core.patches.v0_0_1.delete_bom_from_property_setter
-bloomstack_core.patches.v0_0_1.removed_mandatory_for_attachment_field
+bloomstack_core.patches.v0_0_1.removed_mandatory_for_attachment_field #05-02-2021

bloomstack_core/patches/v0_0_1/removed_mandatory_for_attachment_field.py

@@ -1,4 +1,5 @@
 import frappe
 
 def execute():
-	frappe.delete_doc_if_exists("Custom Field", "Job Applicant-resume_attachment-reqd")
+	frappe.delete_doc_if_exists("Custom Field", "Job Applicant-resume_attachment-reqd")
+	frappe.delete_doc_if_exists("Property Setter", "Job Applicant-resume_attachment-reqd")

bloomstack_core/public/js/templates/address_list.html

@@ -17,11 +17,15 @@
 	</p>
 	<p class="h6">
 		{% if(addr_list[i].address_type!="Other") { %}
-		<span class="text-muted">({%= __(addr_list[i].address_type) %})</span>{% } %}
+		<span class="text-muted">Address Type: {%= __(addr_list[i].address_type) %}</span>{% } %}
+	</p>
+	<p class="h6">
 		{% if(addr_list[i].is_primary_address) { %}
-		<span class="text-muted">({%= __("Primary") %})</span>{% } %}
+		<span class="text-muted">({%= __("Preferred Billing") %})</span>{% } %}
 		{% if(addr_list[i].is_shipping_address) { %}
-		<span class="text-muted">({%= __("Shipping") %})</span>{% } %}
+		<span class="text-muted">({%= __("Preferred Shipping") %})</span>{% } %}
+		{% if(addr_list[i].disabled) { %}
+		<span class="text-muted">({%= __("Disabled") %})</span>{% } %}
 	</p>
 	<p>{%= addr_list[i].display %}</p>
 </div>