Merge pull request #5986 from nabinhait/pe_fix_101
Set received amount based on paid amount if currency is same
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 0c3652f..e1c3918 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -38,7 +38,8 @@
frappe.throw(_("Campaign Name is required"))
if self.email_id:
- validate_email_add(self.email_id, True)
+ if not self.flags.ignore_email_validation:
+ validate_email_add(self.email_id, True)
if self.email_id == self.lead_owner:
# Lead Owner cannot be same as the Lead
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 0f4d1f4..a2a1be2 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import frappe, json
-from frappe.utils import cstr, cint, get_fullname, validate_email_add
+from frappe.utils import cstr, cint, get_fullname
from frappe import msgprint, _
from frappe.model.mapper import get_mapped_doc
from erpnext.setup.utils import get_exchange_rate
@@ -43,7 +43,7 @@
def make_new_lead_if_required(self):
"""Set lead against new opportunity"""
- if not (self.lead or self.customer) and self.contact_email and validate_email_add(self.contact_email):
+ if not (self.lead or self.customer) and self.contact_email:
lead_name = frappe.db.get_value("Lead", {"email_id": self.contact_email})
if not lead_name:
sender_name = get_fullname(self.contact_email)
@@ -64,6 +64,7 @@
"lead_name": sender_name
})
+ lead.flags.ignore_email_validation = True
lead.insert(ignore_permissions=True)
lead_name = lead.name
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index 2435029..d1f4982 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -53,7 +53,7 @@
if not runs_for:
runs_for = frappe.utils.date_diff(frappe.utils.nowdate(), current_date)
# runs_for = 100
-
+
fixed_asset.work()
for i in xrange(runs_for):
@@ -72,9 +72,6 @@
stock.work()
accounts.work()
projects.run_projects(current_date)
- # run_stock()
- # run_accounts()
- # run_projects()
# run_messages()
current_date = frappe.utils.add_days(current_date, 1)
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index ab3f601..b86378d 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1993,7 +1993,7 @@
"collapsible": 0,
"depends_on": "show_in_website",
"fieldname": "route",
- "fieldtype": "Data",
+ "fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -2011,7 +2011,7 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
- "unique": 1
+ "unique": 0
},
{
"allow_on_submit": 0,
@@ -2335,7 +2335,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 1,
- "modified": "2016-07-28 19:12:27.253074",
+ "modified": "2016-08-03 17:30:51.323382",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",