Merge c76025c into e300e05

Bloomstack · Oct 6, 2020 · 575972a · 575972a
2 parents e300e05 + c76025c
commit 575972a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
@@ -6,7 +6,11 @@ frappe.ui.form.on("Supplier", {
 		frm.make_methods = {
 			'Contract': () => frappe.model.open_mapped_doc({
 				method: 'erpnext.buying.doctype.supplier.supplier.make_contract',
-				frm: cur_frm
+				frm: frm
+			}),
+			'Subscription': () => frappe.model.open_mapped_doc({
+				method: 'erpnext.buying.doctype.supplier.supplier.make_subscription',
+				frm: frm
 			})
 		}
 

diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
@@ -69,4 +69,17 @@ def make_contract(source_name, target_doc=None):
 			}
 		}}, target_doc)
 
-	return target_doc
+	return target_doc
+
+@frappe.whitelist()
+def make_subscription(source_name, target_doc=None):
+	target_doc = get_mapped_doc("Supplier", source_name,
+		{"Supplier": {
+			"doctype": "Subscription",
+			"field_map": {
+				"doctype": "party_type",
+				"name": "party"
+			}
+		}}, target_doc)
+
+	return target_doc
diff --git a/erpnext/buying/doctype/supplier/supplier_dashboard.py b/erpnext/buying/doctype/supplier/supplier_dashboard.py
@@ -11,7 +11,8 @@ def get_data():
 		'non_standard_fieldnames': {
 			'Payment Entry': 'party_name',
 			'Bank Account': 'party',
-			'Contract': 'party_name'
+			'Contract': 'party_name',
+			'Subscription': 'party'
 		},
 		'transactions': [
 			{
@@ -37,6 +38,10 @@ def get_data():
 			{
 				'label': _('Contracts'),
 				'items': ['Contract']
+			},
+			{
+				'label': _('Subscriptions'),
+				'items': ['Subscription']
 			}
 		]
 	}
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
@@ -7,15 +7,19 @@ frappe.ui.form.on("Customer", {
 		frm.make_methods = {
 			'Quotation': () => frappe.model.open_mapped_doc({
 				method: 'erpnext.selling.doctype.customer.customer.make_quotation',
-				frm: cur_frm
+				frm: frm
 			}),
 			'Opportunity': () => frappe.model.open_mapped_doc({
 				method: 'erpnext.selling.doctype.customer.customer.make_opportunity',
-				frm: cur_frm
+				frm: frm
 			}),
 			'Contract': () => frappe.model.open_mapped_doc({
 				method: 'erpnext.selling.doctype.customer.customer.make_contract',
-				frm: cur_frm
+				frm: frm
+			}),
+			'Subscription': () => frappe.model.open_mapped_doc({
+				method: 'erpnext.selling.doctype.customer.customer.make_subscription',
+				frm: frm
 			})
 		}
 

diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
@@ -281,6 +281,19 @@ def make_contract(source_name, target_doc=None):
 
 	return target_doc
 
+@frappe.whitelist()
+def make_subscription(source_name, target_doc=None):
+	target_doc = get_mapped_doc("Customer", source_name,
+		{"Customer": {
+			"doctype": "Subscription",
+			"field_map": {
+				"doctype": "party_type",
+				"name": "party"
+			}
+		}}, target_doc)
+
+	return target_doc
+
 def _set_missing_values(source, target):
 	address = frappe.get_all('Dynamic Link', {
 			'link_doctype': source.doctype,