[cleanup] Opportunity
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index edaa151..0ee0201 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -1,15 +1,23 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
-frappe.ui.form.on_change("Opportunity", "customer", function(frm) {
- erpnext.utils.get_party_details(frm) });
-frappe.ui.form.on_change("Opportunity", "customer_address", erpnext.utils.get_address_display);
-frappe.ui.form.on_change("Opportunity", "contact_person", erpnext.utils.get_contact_details);
-
-
frappe.provide("erpnext.crm");
frappe.require("assets/erpnext/js/utils.js");
cur_frm.email_field = "contact_email";
+frappe.ui.form.on("Opportunity", {
+ customer: function(frm) {
+ erpnext.utils.get_party_details(frm);
+ },
+ customer_address: erpnext.utils.get_address_display,
+ contact_person: erpnext.utils.get_contact_details,
+ enquiry_from: function(frm) {
+ frm.toggle_reqd("lead", frm.doc.enquiry_from==="Lead");
+ frm.toggle_reqd("customer", frm.doc.enquiry_from==="Customer");
+ },
+ refresh: function(frm) {
+ frm.events.enquiry_from(frm);
+ }
+})
// TODO commonify this code
erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
@@ -21,14 +29,11 @@
if(!this.frm.doc.status)
set_multiple(cdt, cdn, { status:'Draft' });
- if(!this.frm.doc.date)
- this.frm.doc.transaction_date = date.obj_to_str(new Date());
if(!this.frm.doc.company && frappe.defaults.get_user_default("company"))
set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("company") });
if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });
-
this.setup_queries();
},
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 7bf69f3..99aa312 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -12,6 +12,8 @@
"fields": [
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "from_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -32,6 +34,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
@@ -54,6 +58,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "enquiry_from",
"fieldtype": "Select",
"hidden": 0,
@@ -76,6 +82,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.enquiry_from===\"Customer\"",
"fieldname": "customer",
"fieldtype": "Link",
@@ -99,6 +107,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.enquiry_from===\"Lead\"",
"fieldname": "lead",
"fieldtype": "Link",
@@ -122,6 +132,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "",
"fieldname": "customer_name",
"fieldtype": "Data",
@@ -142,6 +154,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -162,6 +176,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
@@ -182,6 +198,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"default": "Sales",
"fieldname": "enquiry_type",
"fieldtype": "Select",
@@ -205,6 +223,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
@@ -228,6 +248,30 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:doc.status===\"Lost\"",
+ "fieldname": "order_lost_reason",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Lost Reason",
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "with_items",
"fieldtype": "Check",
"hidden": 0,
@@ -248,6 +292,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "with_items",
"fieldname": "items_section",
"fieldtype": "Section Break",
@@ -270,6 +316,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"description": "",
"fieldname": "items",
"fieldtype": "Table",
@@ -293,24 +341,9 @@
},
{
"allow_on_submit": 0,
- "fieldname": "fold",
- "fieldtype": "Fold",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "next_contact_by",
"depends_on": "eval:doc.lead || doc.customer",
"fieldname": "contact_info",
"fieldtype": "Section Break",
@@ -332,6 +365,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.customer || doc.lead",
"fieldname": "customer_address",
"fieldtype": "Link",
@@ -353,6 +388,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 1,
@@ -374,6 +411,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "customer",
"description": "",
"fieldname": "territory",
@@ -396,6 +435,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "customer",
"description": "",
"fieldname": "customer_group",
@@ -420,6 +461,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "column_break3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -438,6 +481,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.lead || doc.customer",
"fieldname": "contact_person",
"fieldtype": "Link",
@@ -459,6 +504,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "customer",
"fieldname": "contact_display",
"fieldtype": "Small Text",
@@ -479,6 +526,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.lead || doc.customer",
"fieldname": "contact_email",
"fieldtype": "Small Text",
@@ -499,6 +548,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"depends_on": "eval:doc.lead || doc.customer",
"fieldname": "contact_mobile",
"fieldtype": "Small Text",
@@ -519,13 +570,16 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "",
"fieldname": "more_info",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "More Info",
+ "label": "Source",
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "icon-file-text",
@@ -540,71 +594,8 @@
},
{
"allow_on_submit": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "50%"
- },
- {
- "allow_on_submit": 0,
- "default": "Today",
- "fieldname": "transaction_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Opportunity Date",
- "no_copy": 0,
- "oldfieldname": "transaction_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "50px"
- },
- {
- "allow_on_submit": 0,
- "fieldname": "company",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Company",
- "no_copy": 0,
- "oldfieldname": "company",
- "oldfieldtype": "Link",
- "options": "Company",
- "permlevel": 0,
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "source",
"fieldtype": "Select",
"hidden": 0,
@@ -627,6 +618,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"description": "Enter name of campaign if source of enquiry is campaign",
"fieldname": "campaign",
"fieldtype": "Link",
@@ -650,6 +643,79 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "50%"
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Company",
+ "no_copy": 0,
+ "oldfieldname": "company",
+ "oldfieldtype": "Link",
+ "options": "Company",
+ "permlevel": 0,
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 1,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "Today",
+ "fieldname": "transaction_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Opportunity Date",
+ "no_copy": 0,
+ "oldfieldname": "transaction_date",
+ "oldfieldtype": "Date",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "50px"
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "fiscal_year",
"fieldtype": "Link",
"hidden": 0,
@@ -672,18 +738,21 @@
},
{
"allow_on_submit": 0,
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "order_lost_reason",
- "fieldtype": "Text",
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "contact_by",
+ "fieldname": "next_contact",
+ "fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Lost Reason",
- "no_copy": 1,
+ "label": "Next Contact",
+ "no_copy": 0,
"permlevel": 0,
+ "precision": "",
"print_hide": 0,
- "read_only": 1,
+ "read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -692,26 +761,8 @@
},
{
"allow_on_submit": 0,
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "50%"
- },
- {
- "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"description": "Your sales person who will contact the customer in future",
"fieldname": "contact_by",
"fieldtype": "Link",
@@ -736,6 +787,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"description": "Your sales person will get a reminder on this date to contact the customer",
"fieldname": "contact_date",
"fieldtype": "Datetime",
@@ -758,6 +811,30 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "permlevel": 0,
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "50%"
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "to_discuss",
"fieldtype": "Small Text",
"hidden": 0,
@@ -779,6 +856,8 @@
},
{
"allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -810,7 +889,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
- "modified": "2015-08-07 17:11:33.955441",
+ "modified": "2015-08-26 02:56:36.201257",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",