Merge pull request #3465 from neilLasrado/po

Po

erpnext/hr/doctype/salary_structure/salary_structure.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import cstr, flt
+from frappe.utils import cstr, flt, getdate
 from frappe.model.naming import make_autoname
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
@@ -14,6 +14,13 @@ from erpnext.hr.utils import set_employee_name
 class SalaryStructure(Document):
 	def autoname(self):
 		self.name = make_autoname(self.employee + '/.SST' + '/.#####')
+		
+	def validate(self):
+		self.check_existing()
+		self.validate_amount()
+		self.validate_employee()
+		self.validate_joining_date()
+		set_employee_name(self)
 
 	def get_employee_details(self):
 		ret = {}
@@ -77,14 +84,11 @@ class SalaryStructure(Document):
 		old_employee = frappe.db.get_value("Salary Structure", self.name, "employee")
 		if old_employee and self.employee != old_employee:
 			frappe.throw(_("Employee can not be changed"))
-
-
-	def validate(self):
-		self.check_existing()
-		self.validate_amount()
-		self.validate_employee()
-		set_employee_name(self)
-
+			
+	def validate_joining_date(self):
+		joining_date = getdate(frappe.db.get_value("Employee", self.employee, "date_of_joining"))
+		if getdate(self.from_date) < joining_date:
+			frappe.throw(_("From Date in Salary Structure cannot be lesser than Employee Joining Date."))
 
 @frappe.whitelist()
 def make_salary_slip(source_name, target_doc=None):

erpnext/projects/doctype/project/project.json

@@ -163,6 +163,7 @@
    "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "% Tasks Completed", 
+   "no_copy": 1, 
    "permlevel": 0, 
    "read_only": 1
   }, 
@@ -356,7 +357,7 @@
  "icon": "icon-puzzle-piece", 
  "idx": 1, 
  "max_attachments": 4, 
- "modified": "2015-04-27 07:37:44.239930", 
+ "modified": "2015-06-12 09:00:54.080220", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project",