From 82cc2921d1b13959833b49cf0591aa3816aaf0bc Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 12 Jun 2015 16:14:25 +0530 Subject: [PATCH 1/2] Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining' --- .../salary_structure/salary_structure.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py index 8580f2e4d4..69f341bb3c 100644 --- a/erpnext/hr/doctype/salary_structure/salary_structure.py +++ b/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): From 3c1a4a0b9b580c8eac48e056a8dbc7911aef9086 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 12 Jun 2015 18:31:36 +0530 Subject: [PATCH 2/2] percent_complete made no-copy in Project --- erpnext/projects/doctype/project/project.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index 2aca991877..486d86112e 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/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",