Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt
index 408ad45..b969906 100644
--- a/selling/doctype/lead/lead.txt
+++ b/selling/doctype/lead/lead.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-04-10 11:45:37",
"docstatus": 0,
- "modified": "2013-09-26 16:30:36",
+ "modified": "2013-10-09 15:27:54",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -175,19 +175,6 @@
"search_index": 1
},
{
- "depends_on": "eval:!doc.__islocal",
- "description": "Date on which the lead was last contacted",
- "doctype": "DocField",
- "fieldname": "last_contact_date",
- "fieldtype": "Date",
- "label": "Last Contact Date",
- "no_copy": 1,
- "oldfieldname": "last_contact_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 1
- },
- {
"doctype": "DocField",
"fieldname": "col_break123",
"fieldtype": "Column Break",
diff --git a/selling/doctype/opportunity/opportunity.py b/selling/doctype/opportunity/opportunity.py
index c8c41e3..5854758 100644
--- a/selling/doctype/opportunity/opportunity.py
+++ b/selling/doctype/opportunity/opportunity.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import cstr, getdate, cint
+from webnotes.utils import cstr, cint
from webnotes.model.bean import getlist
from webnotes import msgprint
@@ -18,7 +18,7 @@
self.doclist = doclist
self.fname = 'enq_details'
self.tname = 'Opportunity Item'
-
+
self._prev = webnotes._dict({
"contact_date": webnotes.conn.get_value("Opportunity", self.doc.name, "contact_date") if \
(not cint(self.doc.fields.get("__islocal"))) else None,
@@ -70,10 +70,6 @@
return ret
def on_update(self):
- # Add to calendar
- if self.doc.contact_date and self.doc.contact_date_ref != self.doc.contact_date:
- webnotes.conn.set(self.doc, 'contact_date_ref',self.doc.contact_date)
-
self.add_calendar_event()
def add_calendar_event(self, opts=None, force=False):
@@ -101,14 +97,6 @@
super(DocType, self).add_calendar_event(opts, force)
- def set_last_contact_date(self):
- if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date:
- if getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date):
- self.doc.last_contact_date=self.doc.contact_date_ref
- else:
- msgprint("Contact Date Cannot be before Last Contact Date")
- raise Exception
-
def validate_item_details(self):
if not getlist(self.doclist, 'enquiry_details'):
msgprint("Please select items for which enquiry needs to be made")
@@ -121,7 +109,6 @@
msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1)
def validate(self):
- self.set_last_contact_date()
self.validate_item_details()
self.validate_uom_is_integer("uom", "qty")
self.validate_lead_cust()
diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt
index aeedd08..8a68a31 100644
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:30",
"docstatus": 0,
- "modified": "2013-09-25 19:32:29",
+ "modified": "2013-10-09 15:26:29",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -409,20 +409,6 @@
"read_only": 0
},
{
- "allow_on_submit": 0,
- "depends_on": "eval:!doc.__islocal",
- "description": "Date on which the lead was last contacted",
- "doctype": "DocField",
- "fieldname": "last_contact_date",
- "fieldtype": "Date",
- "label": "Last Contact Date",
- "no_copy": 1,
- "oldfieldname": "last_contact_date",
- "oldfieldtype": "Date",
- "print_hide": 1,
- "read_only": 1
- },
- {
"doctype": "DocField",
"fieldname": "to_discuss",
"fieldtype": "Small Text",
diff --git a/selling/doctype/quotation/quotation.py b/selling/doctype/quotation/quotation.py
index 44a67fa..8eb3654 100644
--- a/selling/doctype/quotation/quotation.py
+++ b/selling/doctype/quotation/quotation.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import cstr, getdate
+from webnotes.utils import cstr
from webnotes.model.bean import getlist
from webnotes.model.code import get_obj
from webnotes import _, msgprint
@@ -93,19 +93,6 @@
msgprint("You can not select non sales item "+d.item_code+" in Sales Quotation")
raise Exception
- #--------------Validation For Last Contact Date-----------------
- # ====================================================================================================================
- def set_last_contact_date(self):
- #if not self.doc.contact_date_ref:
- #self.doc.contact_date_ref=self.doc.contact_date
- #self.doc.last_contact_date=self.doc.contact_date_ref
- if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date:
- if getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date):
- self.doc.last_contact_date=self.doc.contact_date_ref
- else:
- msgprint("Contact Date Cannot be before Last Contact Date")
- raise Exception
-
def validate(self):
super(DocType, self).validate()
@@ -116,7 +103,6 @@
utilities.validate_status(self.doc.status, ["Draft", "Submitted",
"Order Confirmed", "Order Lost", "Cancelled"])
- self.set_last_contact_date()
self.validate_order_type()
self.validate_for_items()