Nabin Hait
|
ba2a76cfb7
|
Merge pull request #7453 from KanchanChauhan/salary-register-report
Changes to Salary Register
|
2017-01-13 11:51:48 +05:30 |
|
Nabin Hait
|
007c87ea63
|
Merge pull request #7440 from nabinhait/gle_repost_optimization
Optimization to reduce GLE reposting time for future stock transactions
|
2017-01-13 11:33:42 +05:30 |
|
Kanchan Chauhan
|
2f3ae914a6
|
Changes to Salary Register
|
2017-01-11 19:45:01 +05:30 |
|
RicardoJohann
|
7182de7684
|
allowed rename salary structure
|
2017-01-11 06:28:59 -02:00 |
|
Nabin Hait
|
51d45d8bce
|
Fixed merge conflict
|
2017-01-10 12:32:01 +05:30 |
|
Kanchan Chauhan
|
2b41f9d548
|
[Fix] Payroll Frequency toggle fix
|
2017-01-09 18:43:52 +05:30 |
|
Rushabh Mehta
|
8b133ac087
|
[minor] [tests] fix, tests will fail on the 5th of a month!
|
2017-01-06 17:21:04 +05:30 |
|
Kanchan Chauhan
|
b7cc393eb8
|
Email ID renamed to Email Address
|
2017-01-03 16:45:38 +05:30 |
|
Nabin Hait
|
ab42fc006f
|
Merge branch 'master' into develop
|
2017-01-02 17:26:55 +05:30 |
|
Kanchan Chauhan
|
5594050104
|
[Fix] Attendance validation in Leave Application
|
2017-01-02 11:14:44 +05:30 |
|
KanchanChauhan
|
4601fdd98d
|
Better Salary Slip logs in Process Payroll (#7322)
|
2016-12-30 16:26:55 +05:30 |
|
Nabin Hait
|
9784d27317
|
Optimization to reduce GLE reposting time for future stock transactions
|
2016-12-30 16:21:35 +05:30 |
|
Nabin Hait
|
e97d40806f
|
Merge branch 'master' into develop
|
2016-12-30 14:56:20 +05:30 |
|
Kanchan Chauhan
|
7b29dc7208
|
[Fix] Monthly Salary Register Fix
|
2016-12-30 12:36:00 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Nabin Hait
|
c2d66bdfb2
|
Merge branch 'master' into develop
|
2016-12-23 16:45:09 +05:30 |
|
Rohit Waghchaure
|
1af1a43616
|
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
|
2016-12-21 19:19:16 +05:30 |
|
Kanchan Chauhan
|
58ed0c6efa
|
Create User button in Employee if no User ID selected
|
2016-12-21 16:18:59 +05:30 |
|
Rushabh Mehta
|
2a86c32267
|
[minor] [patch] remove icon if present, fixes #6949
|
2016-12-20 12:20:39 +05:30 |
|
Rushabh Mehta
|
827588adf2
|
[minor] fixes to job opening
|
2016-12-19 17:06:26 +05:30 |
|
Rushabh Mehta
|
c3d8479443
|
[minor] allow website user to be selected as employee
|
2016-12-19 12:32:11 +05:30 |
|
Rohit Waghchaure
|
61fb496be6
|
[Fix] Test case
|
2016-12-16 12:19:56 +05:30 |
|
Nabin Hait
|
f02f1bb0c7
|
Added standard filters
|
2016-12-15 14:57:20 +05:30 |
|
Rushabh Mehta
|
01fab2ae1c
|
[minor] fix salary slip test
|
2016-12-15 11:43:29 +05:30 |
|
Rushabh Mehta
|
e9d9b8e6f0
|
[fix] demo and process payroll for demo (#7224)
* [fix] demo and process payroll for demo
* [fix] set payroll dates
|
2016-12-15 11:27:35 +05:30 |
|
Nabin Hait
|
1ae8e2c8fa
|
Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232)
|
2016-12-15 11:27:02 +05:30 |
|
Rushabh Mehta
|
9b049ee154
|
Revert "[Fixes]Payroll Fixes" (#7225)
|
2016-12-14 18:25:11 +05:30 |
|
Nabin Hait
|
42b6e37d15
|
Merge pull request #7216 from KanchanChauhan/salary-fixes
[Fixes]Payroll Fixes
|
2016-12-14 16:20:08 +05:30 |
|
Kanchan Chauhan
|
c292dd7213
|
[Fixes]Payroll Fixes
|
2016-12-14 15:50:54 +05:30 |
|
Nabin Hait
|
36f5471bab
|
Merge pull request #6855 from neilLasrado/training
[new Feature] Added Training Module
|
2016-12-14 12:51:51 +05:30 |
|
Nabin Hait
|
44cdbbe346
|
Merge pull request #7203 from KanchanChauhan/employee-permissions
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
|
2016-12-14 12:50:54 +05:30 |
|
Neil Trini Lasrado
|
6a2fa29b4a
|
Fixes for training Module
|
2016-12-14 12:08:28 +05:30 |
|
Neil Trini Lasrado
|
984ee372e8
|
[new Feature] Added Training Module
|
2016-12-13 15:42:12 +05:30 |
|
Nabin Hait
|
201af80706
|
Fixed merge conflict
|
2016-12-13 14:30:32 +05:30 |
|
Kanchan Chauhan
|
b79aa1d091
|
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
|
2016-12-13 14:16:57 +05:30 |
|
Nabin Hait
|
8ecc14b7bd
|
Revert "email cc test fixes for frappe/frappe#2441"
|
2016-12-13 14:11:49 +05:30 |
|
Kanchan Chauhan
|
d917b66a31
|
[Fix] Salary Slip test cases fix
|
2016-12-13 12:12:49 +05:30 |
|
Nabin Hait
|
ee877fd631
|
Merge pull request #7199 from RobertSchouten/email_cc_dev
email cc test fixes for frappe/frappe#2441
|
2016-12-13 11:31:06 +05:30 |
|
robert schouten
|
3d22eb1d59
|
email cc test fixes for frappe/frappe#2441
|
2016-12-13 11:32:09 +08:00 |
|
Kanchan Chauhan
|
f0b0db444d
|
Added Is Active to Sales Person
|
2016-12-12 19:12:41 +05:30 |
|
Kanchan Chauhan
|
0ece9e0e2e
|
[Fix] Salary Slip Test cases fix
|
2016-12-08 17:02:36 +05:30 |
|
Kanchan Chauhan
|
f7b25cbb6b
|
[WIP] Payroll Updates
|
2016-12-08 12:20:20 +05:30 |
|
Nabin Hait
|
5c18bd9b61
|
Fixed merge conflict
|
2016-12-06 16:16:58 +05:30 |
|
Nabin Hait
|
45fda8a257
|
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
[Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages
|
2016-12-06 16:01:38 +05:30 |
|
Nabin Hait
|
67d226f491
|
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
[Fix] lwp issue fixed for salary slip without salary structure
|
2016-12-06 15:48:47 +05:30 |
|
Nabin Hait
|
9313a7408c
|
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
[Enhancement] Total row added for report builder
|
2016-12-06 15:42:19 +05:30 |
|
Kanchan Chauhan
|
dc80b35104
|
[Minor] Apply Salary Slip validation only if it is submitted
|
2016-12-06 15:37:24 +05:30 |
|
Rohit Waghchaure
|
6f6a533d66
|
[fix] salary slip working days
|
2016-12-05 23:33:02 +05:30 |
|
Rohit Waghchaure
|
36a01d3464
|
[Enhancement] Total row added for report builder
|
2016-12-05 18:59:59 +05:30 |
|
Rushabh Mehta
|
323c06ebbf
|
[minor] rename icons as per FontAwesome 4 (#7136)
|
2016-12-05 14:17:26 +05:30 |
|