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

Merge pull request #1178 from nabinhait/hotfix

Browse Source 
[fix] [minor] series skipping issue in salary manager
This commit is contained in:
Nabin Hait 2013-12-12 03:43:59 -08:00
commit 050be0248a
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hr/doctype/salary_manager/salary_manager.py
View File

@ -12,7 +12,6 @@ class DocType:
self.doc = doc self.doc = doc
self.doclist = doclist self.doclist = doclist
def get_emp_list(self): def get_emp_list(self):
""" """
Returns list of active employees based on selected criteria Returns list of active employees based on selected criteria

13
hr/doctype/salary_slip/salary_slip.py
View File

@ -29,18 +29,17 @@ class DocType(TransactionBase):
if struct: if struct:
self.pull_sal_struct(struct) self.pull_sal_struct(struct)
def check_sal_struct(self): def check_sal_struct(self):
struct = webnotes.conn.sql("select name from `tabSalary Structure` where employee ='%s' and is_active = 'Yes' "%self.doc.employee) struct = webnotes.conn.sql("""select name from `tabSalary Structure`
where employee=%s and is_active = 'Yes'""", self.doc.employee)
if not struct: if not struct:
msgprint("Please create Salary Structure for employee '%s'"%self.doc.employee) msgprint("Please create Salary Structure for employee '%s'" % self.doc.employee)
self.doc.employee = '' self.doc.employee = None
return struct and struct[0][0] or '' return struct and struct[0][0] or ''
def pull_sal_struct(self, struct): def pull_sal_struct(self, struct):
from hr.doctype.salary_structure.salary_structure import make_salary_slip from hr.doctype.salary_structure.salary_structure import get_mapped_doclist
self.doclist = make_salary_slip(struct, self.doclist) self.doclist = get_mapped_doclist(struct, self.doclist)
def pull_emp_details(self): def pull_emp_details(self):
emp = webnotes.conn.get_value("Employee", self.doc.employee, emp = webnotes.conn.get_value("Employee", self.doc.employee,

5
hr/doctype/salary_structure/salary_structure.py
View File

@ -74,6 +74,9 @@ class DocType:
@webnotes.whitelist() @webnotes.whitelist()
def make_salary_slip(source_name, target_doclist=None): def make_salary_slip(source_name, target_doclist=None):
return [d.fields for d in get_mapped_doclist(source_name, target_doclist)]
def get_mapped_doclist(source_name, target_doclist=None):
from webnotes.model.mapper import get_mapped_doclist from webnotes.model.mapper import get_mapped_doclist
def postprocess(source, target): def postprocess(source, target):
@ -109,4 +112,4 @@ def make_salary_slip(source_name, target_doclist=None):
} }
}, target_doclist, postprocess) }, target_doclist, postprocess)
return [d.fields for d in doclist] return doclist