Merge c1acab9 into 35c601a

erpnext/crm/doctype/opportunity/opportunity.js

@@ -61,6 +61,13 @@ frappe.ui.form.on("Opportunity", {
 
 	with_items: function(frm) {
 		frm.trigger('toggle_mandatory');
+		frm.toggle_display('service_fee', !frm.doc.with_items);
+		frm.toggle_display('software_fee', !frm.doc.with_items);
+		if (frm.doc.with_items == 1) {
+			frm.trigger("calculate_amount");
+		} else {
+			frm.trigger("calculate_opportunity_cost");
+		}
 	},
 
 	customer_address: function(frm, cdt, cdn) {
@@ -116,6 +123,19 @@ frappe.ui.form.on("Opportunity", {
 		}
 	},
 
+	service_fee: function (frm) {
+		frm.trigger("calculate_opportunity_cost");
+	},
+
+	software_fee: function (frm) {
+		frm.trigger("calculate_opportunity_cost");
+	},
+
+	calculate_opportunity_cost: function (frm) {
+		let amount = flt(frm.doc.service_fee) + flt(frm.doc.software_fee);
+		frm.set_value("opportunity_amount", amount);
+	},
+
 	set_contact_link: function(frm) {
 		if(frm.doc.opportunity_from == "Customer" && frm.doc.party_name) {
 			frappe.dynamic_link = {doc: frm.doc, fieldname: 'party_name', doctype: 'Customer'}

erpnext/crm/doctype/opportunity/opportunity.json

@@ -33,6 +33,8 @@
   "with_items",
   "column_break_17",
   "probability",
+  "service_fee",
+  "software_fee",
   "items_section",
   "items",
   "contact_info",
@@ -409,11 +411,25 @@
    "fieldtype": "Link",
    "label": "Converted By",
    "options": "User"
+  },
+  {
+   "default": "0",
+   "fieldname": "service_fee",
+   "fieldtype": "Currency",
+   "label": "Service Fee",
+   "options": "currency"
+  },
+  {
+   "default": "0",
+   "fieldname": "software_fee",
+   "fieldtype": "Currency",
+   "label": "Software Fee",
+   "options": "currency"
   }
  ],
  "icon": "fa fa-info-sign",
  "idx": 195,
- "modified": "2020-08-17 12:51:30.774480",
+ "modified": "2020-09-02 23:11:52.248057",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",