From 39b5d39df67fd7f80a214fccb9c750510a2cba32 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 16 Sep 2016 15:55:34 +0530 Subject: [PATCH] [fix] remove campaign depends on --- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 4 ++-- erpnext/crm/doctype/lead/lead.json | 4 ++-- erpnext/crm/doctype/lead/lead.py | 4 ---- erpnext/docs/user/manual/en/setting-up/email/email-reports.md | 2 +- erpnext/selling/doctype/sales_order/sales_order.json | 4 ++-- erpnext/stock/doctype/delivery_note/delivery_note.json | 4 ++-- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 30f96e468b..8e6506103d 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2931,7 +2931,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "eval:doc.source == 'Campaign'", + "depends_on": "", "fieldname": "campaign", "fieldtype": "Link", "hidden": 0, @@ -3867,7 +3867,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-09-16 01:53:40.014037", + "modified": "2016-09-16 06:09:01.246951", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json index 6e87e23cd6..214379a5d1 100644 --- a/erpnext/crm/doctype/lead/lead.json +++ b/erpnext/crm/doctype/lead/lead.json @@ -263,7 +263,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "eval:doc.source == 'Campaign'", + "depends_on": "", "description": "", "fieldname": "campaign_name", "fieldtype": "Link", @@ -946,7 +946,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-09-16 01:52:31.334462", + "modified": "2016-09-16 06:17:22.790727", "modified_by": "Administrator", "module": "CRM", "name": "Lead", diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py index e1c3918901..605b9e9ecd 100644 --- a/erpnext/crm/doctype/lead/lead.py +++ b/erpnext/crm/doctype/lead/lead.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.utils import cstr, validate_email_add, cint, comma_and, has_gravatar -from frappe import session from frappe.model.mapper import get_mapped_doc from erpnext.controllers.selling_controller import SellingController @@ -34,9 +33,6 @@ class Lead(SellingController): self.set_status() self.check_email_id_is_unique() - if self.source == 'Campaign' and not self.campaign_name and session['user'] != 'Guest': - frappe.throw(_("Campaign Name is required")) - if self.email_id: if not self.flags.ignore_email_validation: validate_email_add(self.email_id, True) diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md index 723fa27950..1730143ae9 100644 --- a/erpnext/docs/user/manual/en/setting-up/email/email-reports.md +++ b/erpnext/docs/user/manual/en/setting-up/email/email-reports.md @@ -22,7 +22,7 @@ If your report has filters, you will see a table with the filters Step 1. Select the Report, the user for which you want to create this report. Permissions will apply for this user -With Filters +With Filters Click on the table to edit the table diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 262fee126d..c8158a6aea 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -2150,7 +2150,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "eval:doc.source == 'Campaign'", + "depends_on": "", "fieldname": "campaign", "fieldtype": "Link", "hidden": 0, @@ -3112,7 +3112,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-09-16 01:54:10.111597", + "modified": "2016-09-16 06:07:17.882648", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 2eff797613..1ab1abe07d 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -2188,7 +2188,7 @@ "bold": 0, "collapsible": 0, "columns": 0, - "depends_on": "eval:doc.source == 'Campaign'", + "depends_on": "", "fieldname": "campaign", "fieldtype": "Link", "hidden": 0, @@ -2908,7 +2908,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2016-09-16 01:54:24.934483", + "modified": "2016-09-16 05:55:36.487662", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note",