Ranjith Kurungadam
e46639f47c
Employee Transfer allow same company, update internal work history ( #14430 )
2018-06-11 11:24:44 +05:30
Nabin Hait
8c7af497a0
Fixed merge conflict
2018-06-04 11:23:36 +05:30
Nabin Hait
a55090dc88
Fixed merge conflict
2018-06-04 11:14:50 +05:30
Ranjith Kurungadam
375db6181d
Earned Leave ( #14143 )
...
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this
* Earned Leave monthly scheduler method, test
* remove whitelist of method
2018-06-01 16:09:28 +05:30
Ranjith
793f8e8caa
Tax Exemption Declaration - update fields, move generic methods to utils
2018-05-30 20:50:48 +05:30
Ranjith
155ecc1b4a
Tax Exemption Declaration - HRA Calculation
2018-05-30 13:37:15 +05:30
Jamsheer
cf414cc499
Payroll Period - fields refactor
2018-05-25 12:37:36 +05:30
Ranjith
58363e6bbd
get_payroll_period return name, fix hard coded leave period
2018-05-17 10:00:33 +05:30
Ranjith
b485b1ef80
Salary Slip calc tax, except for flexi benefits
2018-05-16 23:01:40 +05:30
Manas Solanki
70899f5a60
Update utils.py
2018-05-15 18:52:14 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint
2018-05-14 20:57:40 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption
2018-05-14 20:47:35 +05:30
Manas Solanki
094e1841e0
minor changes and fixed the conflicts
2018-05-14 20:33:28 +05:30
Manas Solanki
b698846c30
[feature] added the employee onboarding and separation doctype
2018-05-14 20:27:00 +05:30
Saurabh
c1acbdfb69
[fix] overlapping dates
2018-05-12 17:45:39 +05:30
Saurabh
a35dad7610
add get leave period method
2018-05-12 17:45:39 +05:30
Ranjith
5a8e6427f4
Tax Declaration, Proof Submission, validation
2018-05-10 15:06:49 +05:30
Jamsheer
bec950428c
HR Utils - Trailing whitespace
2018-05-08 12:50:14 +05:30
Jamsheer
0e2cc5574d
HR Util methods
2018-05-08 12:35:40 +05:30
Ranjith
fddfffd3e6
Employee Promotion, Transfer - modal to add details to child table
2018-05-05 13:27:26 +05:30
Anand Doshi
885e074697
Changed company name from Web Notes to Frappe Technologies
2015-03-03 14:56:43 +05:30
Anand Doshi
bb370f3b6a
HR - Leave Approver and Expense Approver fields changed to Link Fields, better default permissions
2014-08-29 11:19:10 +05:30
Anand Doshi
c280d0655c
Set Employee Name if missing
2014-06-04 17:48:56 +05:30
Rushabh Mehta
9f0d625300
update translation strings #1403
2014-04-14 19:20:45 +05:30
Anand Doshi
e9baaa68e7
Changed frappe.conn to frappe.db
2014-02-26 12:35:33 +05:30
Rushabh Mehta
793ba6bd37
-webnotes +frappe 💥
2014-02-14 15:47:51 +05:30
Rushabh Mehta
afea58b7a1
moved modules inside erpnext folder
2013-12-11 10:43:52 +05:30
