2289 Commits

Author SHA1 Message Date
Kanchan Chauhan
730ad5a507 [Minor] Guest should have read permissions on Job Openings 2017-03-22 12:37:38 +05:30
Nabin Hait
ee7b4f2882 Merge pull request #8016 from rmehta/posting-date-option
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
3d731df7e3 Field order changed for 'Qty as per Stock UOM' 2017-03-14 17:24:57 +05:30
Rushabh Mehta
6d4a52562b [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Nabin Hait
6923397ef6 Show net total in salary slip log in Process Payroll. Fixed #7986 2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2 Merge pull request #7909 from KanchanChauhan/employee-loan-jv
JV on submitting Employee Loan
2017-03-12 16:50:48 +05:30
Nabin Hait
132193309c Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
Multiple Salary Fixes
2017-03-12 16:48:11 +05:30
Kanchan Chauhan
37a57813fa Multiple Salary Fixes 2017-03-09 13:00:35 +05:30
Kanchan Chauhan
ffd1f112e6 JV on submitting Employee Loan 2017-03-09 12:21:37 +05:30
Kanchan Chauhan
a64f53801b [Minor] Label change in Expense Claim 2017-03-08 16:59:49 +05:30
Abdulla P I
cbe035b08a Only enabled user to be fetched 2017-03-07 13:34:08 +05:30
Nabin Hait
b3ffd6b282 Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Kanchan Chauhan
8411be7720 [Fix] Candidate can apply to multiple jobs 2017-03-06 14:40:43 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f changed doctype name userrole to has role 2017-03-06 14:24:39 +05:30
Rohit Waghchaure
d59f8b32cd changed user_roles to roles 2017-03-06 14:24:39 +05:30
Rohit Waghchaure
f8aa6ed46b removed fiscal year and month from the print 2017-03-02 17:51:15 +05:30
Nabin Hait
a0fb3e5128 Merge pull request #7888 from KanchanChauhan/payroll-fix
[Fix] JV entry for Employee Loan only if Loan exists
2017-03-02 14:15:59 +05:30
Kanchan Chauhan
cfb0adff98 [Minor] Removed Paid status from Salary Slip 2017-03-02 12:59:35 +05:30
Kanchan Chauhan
e6254b96c4 [Fix] JV entry for Loan only if Loan exists 2017-02-28 17:42:09 +05:30
Nabin Hait
631ecad985 Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
[Fix] Multiple fixes in Employee Loan
2017-02-27 17:28:20 +05:30
Nabin Hait
3ddc26060a Merge pull request #7876 from KanchanChauhan/salary-slip-fix
[Fix] Update totals on salary component deletion
2017-02-27 17:26:39 +05:30
Kanchan Chauhan
c02745c826 [Fix] Update totals on salary component deletion 2017-02-27 17:21:41 +05:30
Kanchan Chauhan
a13adc0e6b [Fix] Multiple fixes in Employee Loan 2017-02-27 16:56:00 +05:30
Nabin Hait
c642f76a4d Fixed merge conflict 2017-02-27 14:40:53 +05:30
Nabin Hait
697150f339 Leave application overlap validation for half day and test cases 2017-02-24 18:53:34 +05:30
Kanchan Chauhan
26b79f108a Leave Application Enchancement 2017-02-24 15:13:06 +05:30
Nabin Hait
8ec1b565f5 Merge pull request #7823 from KanchanChauhan/payroll-currency
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 16:52:23 +05:30
Kanchan Chauhan
52a5cb9ae3 [Fix] Holiday Calendar Fix 2017-02-23 16:15:12 +05:30
Nabin Hait
60db08fd7f Merge pull request #7817 from KanchanChauhan/loan-management-fix
[Minor] Field label rename
2017-02-23 16:09:11 +05:30
Kanchan Chauhan
951e31667b [Minor] Company default currency in Salary Slip and Structure 2017-02-23 11:16:53 +05:30
Nabin Hait
97b3be6f9d Update salary_structure_employee.json 2017-02-23 11:10:05 +05:30
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
Kanchan Chauhan
6af7140763 [Minor] Field label rename 2017-02-22 14:58:34 +05:30
Nabin Hait
7056ce54d7 Update salary_structure.py 2017-02-20 23:28:47 +05:30
Nabin Hait
6a85752ead Merge branch 'hotfix' into remove-joining-datep-validation 2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb Update salary_structure.py 2017-02-20 19:30:44 +05:30
Nabin Hait
8bb69ff8bf Fixed merge conflict 2017-02-20 19:01:04 +05:30
Nabin Hait
e49d901907 Update process_payroll.py 2017-02-20 18:36:12 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
Nabin Hait
507e6fa46e Merge pull request #7749 from KanchanChauhan/leave-application-cleanup
Rejected leave application can be submitted
2017-02-16 14:19:11 +05:30
Kanchan Chauhan
11f159193e Rejected leave application can be submitted 2017-02-15 19:09:21 +05:30
Kanchan Chauhan
ecdcac1fdf [Fix] Empty row in Goals of Appraisal fixed 2017-02-14 15:32:06 +05:30
Nabin Hait
6ff0caa87a Fixed merge conflict 2017-02-08 11:33:33 +05:30
Kanchan Chauhan
842ad55235 [Fix] Employee Details in Salary Slip preview 2017-02-07 12:07:55 +05:30
Kanchan Chauhan
5f5457085e Joining date validation removed from Salary Structure 2017-02-06 14:50:39 +05:30
Nabin Hait
20d2d7548a Update salary_component.js 2017-02-06 11:36:38 +05:30
KanchanChauhan
6575a0a7e2 [Minor]ROI fix in Employee Loan (#7643) 2017-02-02 16:01:43 +05:30
Kanchan Chauhan
3e2ecc3423 [Fix] Account filter in Process Payroll and Salary Component 2017-02-02 14:41:48 +05:30