Gitiles
Code Review
Sign In
git.clicks.codes
/
Clicks
/
Forks
/
ERPNext
/
03f82240fa6ce90a7827f973beff6a8ce82bbee9
/
erpnext
/
hr
ba2a76c
Merge pull request #7453 from KanchanChauhan/salary-register-report
by Nabin Hait
· 8 years ago
007c87e
Merge pull request #7440 from nabinhait/gle_repost_optimization
by Nabin Hait
· 8 years ago
2f3ae91
Changes to Salary Register
by Kanchan Chauhan
· 8 years ago
7182de7
allowed rename salary structure
by RicardoJohann
· 8 years ago
51d45d8
Fixed merge conflict
by Nabin Hait
· 8 years ago
2b41f9d
[Fix] Payroll Frequency toggle fix
by Kanchan Chauhan
· 8 years ago
8b133ac
[minor] [tests] fix, tests will fail on the 5th of a month!
by Rushabh Mehta
· 8 years ago
b7cc393
Email ID renamed to Email Address
by Kanchan Chauhan
· 8 years ago
ab42fc0
Merge branch 'master' into develop
by Nabin Hait
· 8 years ago
5594050
[Fix] Attendance validation in Leave Application
by Kanchan Chauhan
· 8 years ago
4601fdd
Better Salary Slip logs in Process Payroll (#7322)
by KanchanChauhan
· 8 years ago
9784d27
Optimization to reduce GLE reposting time for future stock transactions
by Nabin Hait
· 8 years ago
e97d408
Merge branch 'master' into develop
by Nabin Hait
· 8 years ago
7b29dc7
[Fix] Monthly Salary Register Fix
by Kanchan Chauhan
· 8 years ago
58291c7
Fixed version conflict
by Nabin Hait
· 8 years ago
c2d66bd
Merge branch 'master' into develop
by Nabin Hait
· 8 years ago
1af1a43
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
by Rohit Waghchaure
· 8 years ago
58ed0c6
Create User button in Employee if no User ID selected
by Kanchan Chauhan
· 8 years ago
2a86c32
[minor] [patch] remove icon if present, fixes #6949
by Rushabh Mehta
· 8 years ago
827588a
[minor] fixes to job opening
by Rushabh Mehta
· 8 years ago
c3d8479
[minor] allow website user to be selected as employee
by Rushabh Mehta
· 8 years ago
61fb496
[Fix] Test case
by Rohit Waghchaure
· 8 years ago
f02f1bb
Added standard filters
by Nabin Hait
· 8 years ago
01fab2a
[minor] fix salary slip test
by Rushabh Mehta
· 8 years ago
e9d9b8e
[fix] demo and process payroll for demo (#7224)
by Rushabh Mehta
· 8 years ago
1ae8e2c
Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232)
by Nabin Hait
· 8 years ago
9b049ee
Revert "[Fixes]Payroll Fixes" (#7225)
by Rushabh Mehta
· 8 years ago
42b6e37
Merge pull request #7216 from KanchanChauhan/salary-fixes
by Nabin Hait
· 8 years ago
c292dd7
[Fixes]Payroll Fixes
by Kanchan Chauhan
· 8 years ago
36f5471
Merge pull request #6855 from neilLasrado/training
by Nabin Hait
· 8 years ago
44cdbbe
Merge pull request #7203 from KanchanChauhan/employee-permissions
by Nabin Hait
· 8 years ago
6a2fa29
Fixes for training Module
by Neil Trini Lasrado
· 8 years ago
984ee37
[new Feature] Added Training Module
by Neil Trini Lasrado
· 8 years ago
201af80
Fixed merge conflict
by Nabin Hait
· 8 years ago
b79aa1d
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
by Kanchan Chauhan
· 8 years ago
8ecc14b
Revert "email cc test fixes for frappe/frappe#2441"
by Nabin Hait
· 8 years ago
d917b66
[Fix] Salary Slip test cases fix
by Kanchan Chauhan
· 8 years ago
ee877fd
Merge pull request #7199 from RobertSchouten/email_cc_dev
by Nabin Hait
· 8 years ago
3d22eb1
email cc test fixes for frappe/frappe#2441
by robert schouten
· 8 years ago
f0b0db4
Added Is Active to Sales Person
by Kanchan Chauhan
· 8 years ago
0ece9e0
[Fix] Salary Slip Test cases fix
by Kanchan Chauhan
· 8 years ago
f7b25cb
[WIP] Payroll Updates
by Kanchan Chauhan
· 8 years ago
5c18bd9
Fixed merge conflict
by Nabin Hait
· 8 years ago
45fda8a
Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave
by Nabin Hait
· 8 years ago
67d226f
Merge pull request #7127 from KanchanChauhan/salary-slip-fix
by Nabin Hait
· 8 years ago
9313a74
Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue
by Nabin Hait
· 8 years ago
dc80b35
[Minor] Apply Salary Slip validation only if it is submitted
by Kanchan Chauhan
· 8 years ago
6f6a533
[fix] salary slip working days
by Rohit Waghchaure
· 8 years ago
36a01d3
[Enhancement] Total row added for report builder
by Rohit Waghchaure
· 8 years ago
323c06e
[minor] rename icons as per FontAwesome 4 (#7136)
by Rushabh Mehta
· 8 years ago
4a888b4
[Fix] lwp issue fixed for salary slip without salary structure
by Kanchan Chauhan
· 8 years ago
faa525e
[Fix] Fixed condition and formula issue in Salary Slip
by Kanchan Chauhan
· 8 years ago
4e61564
[minor] fixes to daily work summary formatting
by Rushabh Mehta
· 8 years ago
557e7f7
[minor] UX fixes for Daily Work Summary
by Rushabh Mehta
· 8 years ago
9dd58d4
[fix] test cases and final wiring for daily work summary
by Rushabh Mehta
· 8 years ago
c10d2a0
[wip] daily work summary
by Rushabh Mehta
· 8 years ago
fe816c3
[fix] [wip] daily work summary
by Rushabh Mehta
· 8 years ago
46753de
fixed merge conflict
by Nabin Hait
· 8 years ago
d4e8b29
Merge pull request #6784 from RobertSchouten/calendar_fix
by Nabin Hait
· 8 years ago
7652b85
[Fix] Filters to get employee in Payroll
by Kanchan Chauhan
· 8 years ago
6d04afc
fixed merge conflict
by Nabin Hait
· 8 years ago
00e841d
update missing salary component abbr
by Nabin Hait
· 8 years ago
4bfa074
[merge] master
by Rushabh Mehta
· 8 years ago
8dfbe7c
[fix] patch missing salary component type based on existing salary slips (#6955)
by Rushabh Mehta
· 8 years ago
95e6ccd
Merge branch 'master' into develop
by Nabin Hait
· 8 years ago
598a0c9
[fix] fixed student dashboard issue (#6897)
by Nabin Hait
· 8 years ago
a469e65
Fixed merge conflict
by Nabin Hait
· 8 years ago
13fc52d
[minor] added default standard filters (#6854)
by Rushabh Mehta
· 8 years ago
dd01bcc
Get employee details in Salary Slip (#6837)
by KanchanChauhan
· 8 years ago
f5d8dd3
Fixed merge conflict
by Nabin Hait
· 8 years ago
81f7a26
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
by Nabin Hait
· 8 years ago
63dda84
[Fix] Error in pulling in Salary Structure fixed
by Kanchan Chauhan
· 8 years ago
0d2f7e6
set remember last selected value as true for company field
by Rohit Waghchaure
· 8 years ago
3844d2c
Remember last selected value for link field
by Rohit Waghchaure
· 8 years ago
e855f53
[minor] fix ellipsis style
by Rushabh Mehta
· 8 years ago
bb79fc5
[fix] calendar range fixes
by robert schouten
· 8 years ago
df366a6
Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio
by Nabin Hait
· 8 years ago
a964db7
Add multiple emoloyee in salary structure (#6621)
by Mainul Islam
· 8 years ago
6ef8ede
Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip
by Nabin Hait
· 8 years ago
5ced4df
Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix
by Nabin Hait
· 8 years ago
8918dcf
Merge pull request #6678 from KanchanChauhan/total-leave-days-updated
by Nabin Hait
· 8 years ago
29ce0aa
Warning if there are mutliple active salary structures
by Kanchan Chauhan
· 8 years ago
c4c9666
[Fix] Make Bank Entry button depends_on fixed
by Kanchan Chauhan
· 8 years ago
a084405
Total leave days gets updated on date change
by Kanchan Chauhan
· 8 years ago
a1006c0
include_holiday being taken into consideration while calculating lwp
by Kanchan Chauhan
· 8 years ago
24d5802
[Fix] leave application days should be less than max days leave allowed
by Kanchan Chauhan
· 8 years ago
bc0783b
[fix] duplicate columns in monthly salary report #6623
by Saurabh
· 8 years ago
97fa119
Set prefered contact email in Employee
by Nabin Hait
· 8 years ago
0702fa2
Fixed version conflict
by Nabin Hait
· 8 years ago
ff183ee
Fixes for testcases
by Nabin Hait
· 8 years ago
fa1cdd5
Fixed merge conflict
by Nabin Hait
· 8 years ago
17f6874
[minor] [fix] doctype_dasboard.py files, move data to get_data
by Rushabh Mehta
· 8 years ago
dc86964
Patch fixed for Employee
by Kanchan Chauhan
· 8 years ago
b3b1219
Fixed merge conflict
by Nabin Hait
· 8 years ago
1a96cc1
Fixes 6171 (#6417)
by Pawan Mehta
· 8 years ago
81581c6
No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626)
by KanchanChauhan
· 8 years ago
395d757
Fixed merge conflict
by Nabin Hait
· 8 years ago
cd9c45f
Fixed merge conflict
by Nabin Hait
· 8 years ago
370e711
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
by Rohit Waghchaure
· 8 years ago
80499bb
Fixed merge conflict
by Nabin Hait
· 8 years ago
Next »