Commit Graph

69 Commits

Author SHA1 Message Date
Rushabh Mehta
2b87d100fa [fix] https://github.com/frappe/erpnext/issues/10956 2017-09-28 15:21:36 +05:30
Manas Solanki
a854ea00a5 mark holiday in the employee monthly attendance sheet (#10349) 2017-08-10 11:20:58 +05:30
Faris Ansari
5f27c94100 Merge pull request #9078 from netchampfaris/remove-globals
Lint and fix JS files
2017-06-06 11:35:42 +05:30
rohitwaghchaure
7f2513f7a1 [Fix] Employees working on a holiday report's date filter not working (#9108) 2017-06-01 18:57:34 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
Francisco Roldán
85bfc05efa Fix missing translations (#8871)
* Fix missing translations

* Fix
2017-05-17 19:42:04 +05:30
Rohit Waghchaure
1ff1368280 [fix] Vehicle expense report not working 2017-04-11 18:54:32 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
Kanchan Chauhan
e877ecfb7b [Fix] Permissions to view Leave Balance Report 2017-01-27 11:53:56 +05:30
Nabin Hait
7c7b3c0ab4 Merge pull request #7465 from KanchanChauhan/attendance-enhancement
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Kanchan Chauhan
f80c2b9606 Fleet management moved to HR 2017-01-16 14:38:24 +05:30
Kanchan Chauhan
7933eb685c [Enhancement] Attendance Module 2017-01-12 17:24:53 +05:30
Kanchan Chauhan
2f3ae914a6 Changes to Salary Register 2017-01-11 19:45:01 +05:30
Kanchan Chauhan
7b29dc7208 [Fix] Monthly Salary Register Fix 2016-12-30 12:36:00 +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
Kanchan Chauhan
dc80b35104 [Minor] Apply Salary Slip validation only if it is submitted 2016-12-06 15:37:24 +05:30
Rohit Waghchaure
36a01d3464 [Enhancement] Total row added for report builder 2016-12-05 18:59:59 +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
Saurabh
bc0783b527 [fix] duplicate columns in monthly salary report #6623 2016-10-20 12:55:23 +05:30
Nabin Hait
158ac5a844 Merge pull request #6416 from KanchanChauhan/minor-fix
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 18:14:00 +05:30
Kanchan Chauhan
77aaa70734 [Fix] filters_by_name changed to query_report_filters_by_name 2016-09-20 17:54:07 +05:30
robert schouten
32c366508a add print format and id to monthly salary register 2016-09-15 14:21:15 +08:00
RobertSchouten
2ecddf58d2 leave balance now fy not calendar
changed the default from_date and to_date of Leave Balance Report to FY
2016-09-09 10:48:34 +08:00
Kanchan Chauhan
7ff0c4eef4 Employee Attendance report renamed to Employees working on a holiday 2016-07-15 13:42:36 +05:30
Kanchan Chauhan
54860cd57d Added Holiday List filter 2016-07-11 15:16:47 +05:30
Kanchan Chauhan
d963b76a4b Salary component cleanup 2016-07-06 12:04:38 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Anand Doshi
c75c1d7e3e [fix] additional fixes after deprecating Fiscal Year 2016-03-11 14:56:19 +05:30
Valmik Jangla
d9cc14ddd5 Removed from Leave Block List and Monthly Attendance List 2016-03-11 13:07:49 +05:30
Valmik Jangla
7ae844f0a0 Minor fix 2016-02-17 15:06:30 +05:30
Valmik Jangla
b7ae1c1076 Inactive employees show up in report 2016-02-17 15:05:35 +05:30
Valmik Jangla
de7e760788 Employees with no attendance show up as blank 2016-02-05 17:46:14 +05:30
Valmik Jangla
235de6566e Minor fix 2016-02-05 15:07:16 +05:30
Valmik Jangla
8d0ed21c04 Added From and To date to Holiday Report
Changed HD to H in Monthly Attendance Report
2016-02-04 12:18:55 +05:30
Valmik Jangla
0a76b8b29a Fixed issue where no Holidays would cause the report to break 2016-01-30 10:59:40 +05:30
Anand Doshi
6e33d91443 [minor] fixes to attendance tool and employee holiday attendance 2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7 Added Employee Report Attendance Report
Made Holiday details mandatory
2016-01-29 16:57:54 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
58c4646199 [fix][cleanup] Leave allocation, application and balance report cleanup and fixes 2015-11-16 15:35:14 +05:30
Saurabh
a2c668cb77 [fixes] patch, test cases and validations 2015-10-29 14:27:57 +05:30
Nabin Hait
712b02593a [fix] Month issue fixed in Monthly Attendance Sheet 2015-10-01 12:35:54 +05:30
Nabin Hait
c9e4fbeda0 [fix][report] Show only active employee in Employee leave balance report 2015-07-20 12:57:48 +05:30
Tsutomu Mimori
5a0fbff1a3 #3402 2015-07-03 16:08:02 +09:00
Anand Doshi
885e074697 Changed company name from Web Notes to Frappe Technologies 2015-03-03 14:56:43 +05:30
Neil Trini Lasrado
71a651ec21 employee information report fix 2015-03-02 18:13:25 +05:30
Rushabh Mehta
c0bb453b88 [refactor] [frappe 5.0] 2014-09-16 15:10:54 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
Anand Doshi
26201a5828 [fix] Show Employee Name in Employee Birthday report 2014-08-08 12:49:11 +05:30