diff --git a/erpnext/selling/doctype/lead/lead.json b/erpnext/selling/doctype/lead/lead.json index 2d3d49c8f8..7a1d6d6940 100644 --- a/erpnext/selling/doctype/lead/lead.json +++ b/erpnext/selling/doctype/lead/lead.json @@ -160,7 +160,7 @@ "allow_on_submit": 0, "description": "Add to calendar on this date", "fieldname": "contact_date", - "fieldtype": "Date", + "fieldtype": "Datetime", "in_filter": 1, "label": "Next Contact Date", "no_copy": 1, @@ -368,7 +368,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-08-12 05:22:18.801092", + "modified": "2014-12-01 08:22:23.286314", "modified_by": "Administrator", "module": "Selling", "name": "Lead", diff --git a/erpnext/selling/doctype/lead/lead.py b/erpnext/selling/doctype/lead/lead.py index 98bed4dfc2..0fcfc1c306 100644 --- a/erpnext/selling/doctype/lead/lead.py +++ b/erpnext/selling/doctype/lead/lead.py @@ -45,6 +45,7 @@ class Lead(SellingController): def add_calendar_event(self, opts=None, force=False): super(Lead, self).add_calendar_event({ "owner": self.lead_owner, + "starts_on": self.contact_date, "subject": ('Contact ' + cstr(self.lead_name)), "description": ('Contact ' + cstr(self.lead_name)) + \ (self.contact_by and ('. By : ' + cstr(self.contact_by)) or '') diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json index 513fbc8bdb..17291ad13f 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.json +++ b/erpnext/selling/doctype/opportunity/opportunity.json @@ -372,7 +372,7 @@ { "description": "Your sales person will get a reminder on this date to contact the customer", "fieldname": "contact_date", - "fieldtype": "Date", + "fieldtype": "Datetime", "label": "Next Contact Date", "oldfieldname": "contact_date", "oldfieldtype": "Date", @@ -416,7 +416,7 @@ "icon": "icon-info-sign", "idx": 1, "is_submittable": 1, - "modified": "2014-08-12 05:21:51.282397", + "modified": "2014-12-01 08:46:35.331148", "modified_by": "Administrator", "module": "Selling", "name": "Opportunity", diff --git a/erpnext/selling/doctype/opportunity/opportunity.py b/erpnext/selling/doctype/opportunity/opportunity.py index ba331f9052..4420ad9e47 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.py +++ b/erpnext/selling/doctype/opportunity/opportunity.py @@ -57,6 +57,7 @@ class Opportunity(TransactionBase): opts = frappe._dict() opts.description = "" + opts.contact_date = self.contact_date if self.customer: if self.contact_person: