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 |
|
Kanchan Chauhan
|
4a888b4c91
|
[Fix] lwp issue fixed for salary slip without salary structure
|
2016-12-04 13:42:30 +05:30 |
|
Kanchan Chauhan
|
faa525e4f1
|
[Fix] Fixed condition and formula issue in Salary Slip
|
2016-12-01 15:31:38 +05:30 |
|
Rushabh Mehta
|
4e61564f73
|
[minor] fixes to daily work summary formatting
|
2016-11-22 21:59:20 +05:30 |
|
Rushabh Mehta
|
557e7f787b
|
[minor] UX fixes for Daily Work Summary
|
2016-11-21 12:10:44 +05:30 |
|
Rushabh Mehta
|
9dd58d42df
|
[fix] test cases and final wiring for daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
c10d2a0025
|
[wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Rushabh Mehta
|
fe816c3852
|
[fix] [wip] daily work summary
|
2016-11-18 12:40:18 +05:30 |
|
Nabin Hait
|
46753de6d7
|
fixed merge conflict
|
2016-11-17 15:55:11 +05:30 |
|
Nabin Hait
|
d4e8b297cd
|
Merge pull request #6784 from RobertSchouten/calendar_fix
[fix] calendar range fixes
|
2016-11-17 14:45:59 +05:30 |
|
Kanchan Chauhan
|
7652b857c8
|
[Fix] Filters to get employee in Payroll
|
2016-11-16 15:29:01 +05:30 |
|
Nabin Hait
|
6d04afc19d
|
fixed merge conflict
|
2016-11-16 12:56:31 +05:30 |
|
Nabin Hait
|
00e841d744
|
update missing salary component abbr
|
2016-11-16 12:55:17 +05:30 |
|
Rushabh Mehta
|
4bfa0748cd
|
[merge] master
|
2016-11-16 11:28:23 +05:30 |
|
Rushabh Mehta
|
8dfbe7c748
|
[fix] patch missing salary component type based on existing salary slips (#6955)
|
2016-11-16 11:18:20 +05:30 |
|
Nabin Hait
|
95e6ccd419
|
Merge branch 'master' into develop
|
2016-11-14 12:42:26 +05:30 |
|
Nabin Hait
|
598a0c918d
|
[fix] fixed student dashboard issue (#6897)
|
2016-11-10 17:25:37 +05:30 |
|
Nabin Hait
|
a469e659c5
|
Fixed merge conflict
|
2016-11-08 15:26:27 +05:30 |
|
Rushabh Mehta
|
13fc52d713
|
[minor] added default standard filters (#6854)
|
2016-11-07 17:19:19 +05:30 |
|
KanchanChauhan
|
dd01bcc485
|
Get employee details in Salary Slip (#6837)
|
2016-11-07 17:09:07 +05:30 |
|
Nabin Hait
|
f5d8dd3b18
|
Fixed merge conflict
|
2016-11-04 16:54:53 +05:30 |
|
Nabin Hait
|
81f7a265bc
|
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
Remember last selected value for link field
|
2016-11-04 16:13:49 +05:30 |
|
Kanchan Chauhan
|
63dda84862
|
[Fix] Error in pulling in Salary Structure fixed
|
2016-11-04 12:58:05 +05:30 |
|
Rohit Waghchaure
|
0d2f7e62c0
|
set remember last selected value as true for company field
|
2016-11-03 16:19:34 +05:30 |
|