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

frappe/frappe#478 fixes

Browse Source
This commit is contained in:
Rushabh Mehta 2014-04-03 17:43:06 +05:30
parent 7db7112d3f
commit 0cf531c8a6
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/hr/doctype/deduction_type/test_records.json
View File

@ -1 +1,10 @@
[] [
{
"doctype": "Deduction Type",
"deduction_name": "_Test Professional Tax"
},
{
"doctype": "Deduction Type",
"deduction_name": "_Test TDS"
}
]

13
erpnext/hr/doctype/earning_type/test_records.json
View File

@ -1 +1,12 @@
[] [
{
"doctype": "Earning Type",
"earning_name": "_Test Basic Salary",
"taxable": "Yes"
},
{
"doctype": "Earning Type",
"earning_name": "_Test Allowance",
"taxable": "Yes"
}
]

4
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -17,8 +17,8 @@ class LeaveApproverIdentityError(frappe.ValidationError): pass
from frappe.model.controller import DocListController from frappe.model.controller import DocListController
class LeaveApplication(DocListController): class LeaveApplication(DocListController):
def setup(self): def setup(self):
if frappe.db.exists(self.doctype, self.name): if not getattr(self, "__islocal", None) and frappe.db.exists(self.doctype, self.name):
self.previous_doc = frappe.get_doc(self.doctype, self.name) self.previous_doc = frappe.db.get_value(self.doctype, self.name, "*", as_dict=True)
else: else:
self.previous_doc = None self.previous_doc = None

16
erpnext/hr/doctype/salary_slip/test_salary_slip.py
View File

@ -23,10 +23,10 @@ class TestSalarySlip(unittest.TestCase):
ss.insert() ss.insert()
self.assertEquals(ss.total_days_in_month, 31) self.assertEquals(ss.total_days_in_month, 31)
self.assertEquals(ss.payment_days, 30) self.assertEquals(ss.payment_days, 30)
self.assertEquals(ss.doclist[1].e_modified_amount, 14516.13) self.assertEquals(ss.earning_details[0].e_modified_amount, 14516.13)
self.assertEquals(ss.doclist[2].e_modified_amount, 500) self.assertEquals(ss.earning_details[1].e_modified_amount, 500)
self.assertEquals(ss.doclist[3].d_modified_amount, 100) self.assertEquals(ss.deduction_details[0].d_modified_amount, 100)
self.assertEquals(ss.doclist[4].d_modified_amount, 48.39) self.assertEquals(ss.deduction_details[1].d_modified_amount, 48.39)
self.assertEquals(ss.gross_pay, 15016.13) self.assertEquals(ss.gross_pay, 15016.13)
self.assertEquals(ss.net_pay, 14867.74) self.assertEquals(ss.net_pay, 14867.74)
@ -35,10 +35,10 @@ class TestSalarySlip(unittest.TestCase):
ss.insert() ss.insert()
self.assertEquals(ss.total_days_in_month, 30) self.assertEquals(ss.total_days_in_month, 30)
self.assertEquals(ss.payment_days, 29) self.assertEquals(ss.payment_days, 29)
self.assertEquals(ss.doclist[1].e_modified_amount, 14500) self.assertEquals(ss.earning_details[0].e_modified_amount, 14500)
self.assertEquals(ss.doclist[2].e_modified_amount, 500) self.assertEquals(ss.earning_details[1].e_modified_amount, 500)
self.assertEquals(ss.doclist[3].d_modified_amount, 100) self.assertEquals(ss.deduction_details[0].d_modified_amount, 100)
self.assertEquals(ss.doclist[4].d_modified_amount, 48.33) self.assertEquals(ss.deduction_details[1].d_modified_amount, 48.33)
self.assertEquals(ss.gross_pay, 15000) self.assertEquals(ss.gross_pay, 15000)
self.assertEquals(ss.net_pay, 14851.67) self.assertEquals(ss.net_pay, 14851.67)