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

Merge pull request #3465 from neilLasrado/po

Browse Source 
Po
This commit is contained in:
Nabin Hait 2015-06-15 10:04:36 +05:30
commit b9626659ea
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/hr/doctype/salary_structure/salary_structure.py
View File

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

3
erpnext/projects/doctype/project/project.json
View File

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