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

[minor] [fix] removed contact_date_ref

Browse Source
This commit is contained in:
Anand Doshi 2013-10-09 14:52:18 +05:30
parent 11faa57233
commit 17c8b940e3
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
selling/doctype/opportunity/opportunity.py
View File

@ -70,10 +70,6 @@ class DocType(TransactionBase):
return ret return ret
def on_update(self): 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() self.add_calendar_event()
def add_calendar_event(self, opts=None, force=False): def add_calendar_event(self, opts=None, force=False):
@ -102,12 +98,11 @@ class DocType(TransactionBase):
super(DocType, self).add_calendar_event(opts, force) super(DocType, self).add_calendar_event(opts, force)
def set_last_contact_date(self): def set_last_contact_date(self):
if self.doc.contact_date_ref and self.doc.contact_date_ref != self.doc.contact_date: if self.doc.contact_date:
if getdate(self.doc.contact_date_ref) < getdate(self.doc.contact_date): if not self.doc.last_contact_date or (getdate(self.doc.last_contact_date) <= getdate(self.doc.contact_date)):
self.doc.last_contact_date=self.doc.contact_date_ref self.doc.last_contact_date = self.doc.contact_date
else: else:
msgprint("Contact Date Cannot be before Last Contact Date") webnotes.throw(webnotes._("Contact Date Cannot be before Last Contact Date"))
raise Exception
def validate_item_details(self): def validate_item_details(self):
if not getlist(self.doclist, 'enquiry_details'): if not getlist(self.doclist, 'enquiry_details'):

16
selling/doctype/quotation/quotation.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
from webnotes.utils import cstr, getdate from webnotes.utils import cstr
from webnotes.model.bean import getlist from webnotes.model.bean import getlist
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
from webnotes import _, msgprint from webnotes import _, msgprint
@ -93,19 +93,6 @@ class DocType(SellingController):
msgprint("You can not select non sales item "+d.item_code+" in Sales Quotation") msgprint("You can not select non sales item "+d.item_code+" in Sales Quotation")
raise Exception 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): def validate(self):
super(DocType, self).validate() super(DocType, self).validate()
@ -116,7 +103,6 @@ class DocType(SellingController):
utilities.validate_status(self.doc.status, ["Draft", "Submitted", utilities.validate_status(self.doc.status, ["Draft", "Submitted",
"Order Confirmed", "Order Lost", "Cancelled"]) "Order Confirmed", "Order Lost", "Cancelled"])
self.set_last_contact_date()
self.validate_order_type() self.validate_order_type()
self.validate_for_items() self.validate_for_items()