Faris Ansari
|
26eb513274
|
Rename occurences of max_days_allowed to max_continuous allowed (#14180)
|
2018-05-23 10:31:39 +05:30 |
|
Ameya Shenoy
|
1cc7500be9
|
Merge branch 'master' into develop
|
2018-05-22 09:18:38 +00:00 |
|
Rohit Waghchaure
|
8e12a59d9b
|
[Fix] Patch
|
2018-05-21 18:52:07 +05:30 |
|
Ameya Shenoy
|
35984daf72
|
relieving_date wasnt of type datetime
|
2018-05-21 16:37:27 +05:30 |
|
Rohit Waghchaure
|
11e2a9ac90
|
[Fix] Permission issue while saving leave application
|
2018-05-21 15:39:38 +05:30 |
|
rohitwaghchaure
|
1275ea5123
|
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver
Set leave approver in the leave application
|
2018-05-21 11:58:41 +05:30 |
|
Shridhar Patil
|
4c790488ea
|
job opening designation made mandatory (#14153)
|
2018-05-21 10:30:17 +05:30 |
|
Rohit Waghchaure
|
812224e56e
|
Set leave approver in the leave application
|
2018-05-20 21:21:33 +05:30 |
|
Zarrar
|
1f3f18534b
|
[Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149)
* move set_query to setup function
* rectify leave balance report according to deparmtent changes
|
2018-05-20 10:45:14 +05:30 |
|
Manas Solanki
|
d976c04b69
|
Merge pull request #14134 from manassolanki/fix-salary-patch
[fix] patch for the salary structure assignment for old employees
|
2018-05-18 15:47:14 +05:30 |
|
Manas Solanki
|
33c1a38dc8
|
[fix] patch for the salary structure assignment for old employees
|
2018-05-18 15:46:35 +05:30 |
|
Shreya
|
65dd1f6b4c
|
Mark attendance only if to_date <= nowdate in Leave Application
|
2018-05-17 17:13:56 +05:30 |
|
rohitwaghchaure
|
8c6b7557db
|
Merge branch 'develop' into jam_enterprise_emp_benefit
|
2018-05-17 14:08:06 +05:30 |
|
rohitwaghchaure
|
4444430200
|
Merge pull request #14108 from ESS-LLP/tax_deduction
Variable tax deduction
|
2018-05-17 13:55:52 +05:30 |
|
Ranjith
|
58363e6bbd
|
get_payroll_period return name, fix hard coded leave period
|
2018-05-17 10:00:33 +05:30 |
|
Zlash65
|
e3f7e8b101
|
typo in frappe.throw in employee_transfer
|
2018-05-17 01:34:35 +05:30 |
|
Ranjith
|
31eeff00f7
|
merge frappe/develop
|
2018-05-16 23:24:34 +05:30 |
|
Ranjith
|
b485b1ef80
|
Salary Slip calc tax, except for flexi benefits
|
2018-05-16 23:01:40 +05:30 |
|
Ranjith
|
c6b2575a9c
|
fields in salary detail, copy data from salary component on change
|
2018-05-16 22:59:21 +05:30 |
|
Rohit Waghchaure
|
8e4f676c8c
|
[Fix] onload set default employee, leave approver, company
|
2018-05-16 19:55:52 +05:30 |
|
Jamsheer
|
8b86d18f73
|
Remove unused imports
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3434aabc28
|
Employee Benefit Claim in Salary Slip
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3abae9c1ba
|
Employee Benefit Application - whitlist method get_max_benefits
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3e64297a3d
|
Employee Benefit Application - validate maximun benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
3cd0ad4c98
|
Codacy fixes
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
c9287b5b88
|
Manage grouping of salary component for flexible benefit
|
2018-05-16 19:50:30 +05:30 |
|
Jamsheer
|
6410022cab
|
minor fixes
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
c678d037e7
|
Salary slip - throw if no default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
5f6e274505
|
Salary slip - default flexi component
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
43740a6511
|
Employee Benefit Application - employee benefit in salary slip
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
0bc665c0a5
|
Salary Copmonent - Default flexible componnent
|
2018-05-16 19:49:39 +05:30 |
|
Jamsheer
|
15613e46ad
|
Salary Copmonent - Defualt flexible componnent
|
2018-05-16 19:48:47 +05:30 |
|
Jamsheer
|
d63c39a514
|
Payroll Period - get payroll period days
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d66fb842c1
|
Employee Benefit Application - validate max benefit for employee
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
2d6901d5dc
|
Employee Benefit Application - validate max benefit amount for component
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
9cb2fc2766
|
Employee Benefit Application - calcluate benefit amount
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
d48998bae1
|
Employee Benefit Application - Calculate benefit amounts
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
779f8ebbb3
|
Employee Benefit Application - get max benefit
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
41616de9cc
|
Employee Benefit Application - validate duplicate
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
9cd292b187
|
Employee Benefit Application - filter updated
|
2018-05-16 19:47:18 +05:30 |
|
Jamsheer
|
4d93d339f7
|
Employee benefit - filters fro earning component
|
2018-05-16 19:47:18 +05:30 |
|
Ranjith
|
29e0ed3da1
|
Exemption Declaration - field total_amount
|
2018-05-16 19:10:35 +05:30 |
|
Manas Solanki
|
5b34c00ba6
|
Added the travel request on the config page
|
2018-05-16 18:09:43 +05:30 |
|
Shreya
|
fda15702bc
|
Fix error
|
2018-05-16 16:14:34 +05:30 |
|
Manas Solanki
|
4534df36a9
|
Merge pull request #14078 from manassolanki/pos-fix
[enterprise] minor fixes
|
2018-05-16 14:53:21 +05:30 |
|
Manas Solanki
|
4256a34220
|
[enterprise] minor fixes
make the employee name mandatory in the employee onboarding
added the retention bonus amount
|
2018-05-16 14:51:25 +05:30 |
|
Manas Solanki
|
9b53b93e37
|
Merge pull request #14077 from manassolanki/travel-request
[rename] Photo ID -> Identification Document
|
2018-05-16 14:13:13 +05:30 |
|
Manas Solanki
|
6eb7f346bd
|
[rename] Photo ID -> Identification Document
|
2018-05-16 14:12:22 +05:30 |
|
rohitwaghchaure
|
9ad0ac9557
|
Merge pull request #14068 from manassolanki/travel-request
[feature] added travel request doctype in HR
|
2018-05-16 14:05:26 +05:30 |
|
Suraj Shetty
|
fbb6b3da5f
|
Undo replace of frappe.db.sql with frappe.get_list (#14074)
|
2018-05-16 13:53:31 +05:30 |
|