Shiloh/brotherton-erpnext
1
0
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 15:16:54 +05:30
parent 3d72addae0
commit 599fe0532a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,13 +19,6 @@ class DocType(TransactionBase):
self.fname = 'enq_details' self.fname = 'enq_details'
self.tname = 'Opportunity Item' 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,
"contact_by": webnotes.conn.get_value("Opportunity", self.doc.name, "contact_by") if \
(not cint(self.doc.fields.get("__islocal"))) else None,
})
def get_item_details(self, item_code): def get_item_details(self, item_code):
item = sql("""select item_name, stock_uom, description_html, description, item_group, brand item = sql("""select item_name, stock_uom, description_html, description, item_group, brand
from `tabItem` where name = %s""", item_code, as_dict=1) from `tabItem` where name = %s""", item_code, as_dict=1)
@ -99,9 +92,9 @@ class DocType(TransactionBase):
def set_last_contact_date(self): def set_last_contact_date(self):
if self._prev.contact_date: if self._prev.contact_date:
if not self.doc.last_contact_date or (getdate(self._prev.contact_date) <= getdate(self.doc.contact_date)): if getdate(self._prev.contact_date) < getdate(self.doc.contact_date):
self.doc.last_contact_date = self._prev.contact_date self.doc.last_contact_date = self._prev.contact_date
else: elif getdate(self._prev.contact_date) > getdate(self.doc.contact_date):
webnotes.throw(webnotes._("Contact Date Cannot be before Last Contact Date")) webnotes.throw(webnotes._("Contact Date Cannot be before Last Contact Date"))
def validate_item_details(self): def validate_item_details(self):
@ -116,6 +109,13 @@ class DocType(TransactionBase):
msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1) msgprint("Customer is mandatory if 'Opportunity From' is selected as Customer", raise_exception=1)
def validate(self): def validate(self):
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,
"contact_by": webnotes.conn.get_value("Opportunity", self.doc.name, "contact_by") if \
(not cint(self.doc.fields.get("__islocal"))) else None,
})
self.set_last_contact_date() self.set_last_contact_date()
self.validate_item_details() self.validate_item_details()
self.validate_uom_is_integer("uom", "qty") self.validate_uom_is_integer("uom", "qty")