Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] remove campaign depends on

Browse Source
This commit is contained in:
Rushabh Mehta 2016-09-16 15:55:34 +05:30
parent 59dc0ece9f
commit 39b5d39df6
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -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",

4
erpnext/crm/doctype/lead/lead.json
View File

@ -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",

4
erpnext/crm/doctype/lead/lead.py
View File

@ -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)

2
erpnext/docs/user/manual/en/setting-up/email/email-reports.md
View File

@ -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
<img class="screenshot" alt="With Filters" src="{{docs_base_url}}/assets/img/setup/email/auto-email-1.png">
<img class="screenshot" alt="With Filters" src="{{docs_base_url}}/assets/img/setup/email/auto-email-2.png">
Click on the table to edit the table

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -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",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -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",