[cleanup] deprecated search criteria, amendment_date, cancel_reason

This commit is contained in:
Anand Doshi
2013-06-11 16:23:18 +05:30
parent 618edee8b7
commit 27e6f13b5d
46 changed files with 21 additions and 595 deletions

View File

@@ -72,11 +72,6 @@ class DocType(TransactionBase):
get_obj('Sales Common').validate_fiscal_year(self.doc.fiscal_year, self.doc.inst_date,
'Installation Date')
def validate_mandatory(self):
if self.doc.amended_from and not self.doc.amendment_date:
msgprint("Please Enter Amendment Date")
raise Exception, "Validation Error. "
def validate_reference_value(self):
mapper = get_obj('DocType Mapper', 'Delivery Note-Installation Note', with_children = 1)
mapper.validate_reference_value(self, self.doc.name)

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-04-30 13:13:06",
"docstatus": 0,
"modified": "2013-05-09 14:43:28",
"modified": "2013-06-11 16:16:39",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -229,18 +229,6 @@
"print_hide": 1,
"read_only": 1
},
{
"description": "The date at which current entry is corrected in the system.",
"doctype": "DocField",
"fieldname": "amendment_date",
"fieldtype": "Date",
"hidden": 1,
"label": "Amendment Date",
"no_copy": 1,
"oldfieldname": "amendment_date",
"oldfieldtype": "Date",
"print_hide": 1
},
{
"doctype": "DocField",
"fieldname": "remarks",
@@ -250,18 +238,6 @@
"oldfieldtype": "Small Text",
"print_hide": 1
},
{
"doctype": "DocField",
"fieldname": "cancel_reason",
"fieldtype": "Data",
"hidden": 1,
"label": "Cancel Reason",
"no_copy": 1,
"oldfieldname": "cancel_reason",
"oldfieldtype": "Data",
"print_hide": 1,
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "item_details",

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-03-07 18:50:30",
"docstatus": 0,
"modified": "2013-04-02 16:28:08",
"modified": "2013-06-11 16:03:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -429,22 +429,6 @@
"read_only": 1,
"width": "150px"
},
{
"doctype": "DocField",
"fieldname": "amendment_date",
"fieldtype": "Date",
"label": "Amendment Date",
"no_copy": 1,
"oldfieldname": "amendment_date",
"oldfieldtype": "Date",
"print_hide": 1,
"read_only": 1,
"width": "150px"
},
{
"doctype": "DocPerm",
"role": "System Manager"
},
{
"doctype": "DocPerm",
"role": "Sales User"

View File

@@ -98,13 +98,6 @@ class DocType(SellingController):
# VALIDATE
# ==============================================================================================
# Amendment date is necessary if document is amended
# --------------------------------------------------
def validate_mandatory(self):
if self.doc.amended_from and not self.doc.amendment_date:
msgprint("Please Enter Amendment Date")
raise Exception
# Fiscal Year Validation
# ----------------------
def validate_fiscal_year(self):

View File

@@ -93,10 +93,6 @@ class DocType(SellingController):
if getdate(self.doc.transaction_date) > getdate(self.doc.delivery_date):
msgprint("Expected Delivery Date cannot be before Sales Order Date")
raise Exception
# amendment date is necessary if document is amended
if self.doc.amended_from and not self.doc.amendment_date:
msgprint("Please Enter Amendment Date")
raise Exception
def validate_po(self):
# validate p.o date v/s delivery date