Kanchan Chauhan
8411be7720
[Fix] Candidate can apply to multiple jobs
2017-03-06 14:40:43 +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
Nabin Hait
c62362f064
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
...
[Fix] Employee name fixes in Salary Structure
2017-02-02 13:30:05 +05:30
Kanchan Chauhan
a0314f19ca
[Fix] Employee name fixes in Salary Structure
2017-02-02 12:56:56 +05:30
KanchanChauhan
b499fe91fa
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:16:35 +05:30
KanchanChauhan
929c3890a4
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
...
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44
Salary Structure Employee custom field can be used in Formula and Condition ( #7615 )
2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d
[Fix] Rate of Interest Fix
2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e
Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
...
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:41:36 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
99ce531beb
[minor] css for team updates
2017-02-01 11:46:47 +05:30
Rushabh Mehta
7ec4b717ed
[feature] added team updates page
2017-01-31 11:42:58 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Kanchan Chauhan
e877ecfb7b
[Fix] Permissions to view Leave Balance Report
2017-01-27 11:53:56 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
robert schouten
e14e042f2f
[fix] remove invalid parameter from leave allocation
2017-01-20 15:02:00 +08:00
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30