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

Changed contact_date to Datetime so appointment or call with time can be scheduled

Browse Source
This commit is contained in:
Revant Nandgaonkar 2014-12-01 23:31:53 +05:30
parent 83db3e3ddb
commit d0a44ca85c
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"description": "Add to calendar on this date", "description": "Add to calendar on this date",
"fieldname": "contact_date", "fieldname": "contact_date",
"fieldtype": "Date", "fieldtype": "Datetime",
"in_filter": 1, "in_filter": 1,
"label": "Next Contact Date", "label": "Next Contact Date",
"no_copy": 1, "no_copy": 1,
@ -368,7 +368,7 @@
], ],
"icon": "icon-user", "icon": "icon-user",
"idx": 1, "idx": 1,
"modified": "2014-08-12 05:22:18.801092", "modified": "2014-12-01 08:22:23.286314",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Lead", "name": "Lead",

1
erpnext/selling/doctype/lead/lead.py
View File

@ -45,6 +45,7 @@ class Lead(SellingController):
def add_calendar_event(self, opts=None, force=False): def add_calendar_event(self, opts=None, force=False):
super(Lead, self).add_calendar_event({ super(Lead, self).add_calendar_event({
"owner": self.lead_owner, "owner": self.lead_owner,
"starts_on": self.contact_date,
"subject": ('Contact ' + cstr(self.lead_name)), "subject": ('Contact ' + cstr(self.lead_name)),
"description": ('Contact ' + cstr(self.lead_name)) + \ "description": ('Contact ' + cstr(self.lead_name)) + \
(self.contact_by and ('. By : ' + cstr(self.contact_by)) or '') (self.contact_by and ('. By : ' + cstr(self.contact_by)) or '')

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

@ -372,7 +372,7 @@
{ {
"description": "Your sales person will get a reminder on this date to contact the customer", "description": "Your sales person will get a reminder on this date to contact the customer",
"fieldname": "contact_date", "fieldname": "contact_date",
"fieldtype": "Date", "fieldtype": "Datetime",
"label": "Next Contact Date", "label": "Next Contact Date",
"oldfieldname": "contact_date", "oldfieldname": "contact_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@ -416,7 +416,7 @@
"icon": "icon-info-sign", "icon": "icon-info-sign",
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"modified": "2014-08-12 05:21:51.282397", "modified": "2014-12-01 08:46:35.331148",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Opportunity", "name": "Opportunity",

1
erpnext/selling/doctype/opportunity/opportunity.py
View File

@ -57,6 +57,7 @@ class Opportunity(TransactionBase):
opts = frappe._dict() opts = frappe._dict()
opts.description = "" opts.description = ""
opts.contact_date = self.contact_date
if self.customer: if self.customer:
if self.contact_person: if self.contact_person: