Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,586 Commits 3 Branches 0 Tags 1 GiB
c33e96f860
Commit Graph

403 Commits

Author SHA1 Message Date
Valmik Jangla
c33e96f860 Leave Allocation Fix 2016-04-07 12:02:31 +05:30
Anand Doshi
ca95384f05 [fix] Salary Slip: use accounts.utils.get_fiscal_year 2016-04-06 12:31:01 +05:30
Rushabh Mehta
1b5edcbbd8 [fix] holiday_list issues in maintenance schedule too 2016-03-25 11:22:15 +05:30
Rushabh Mehta
51135a1522 [fix] fix get holidays in leave application 2016-03-25 11:13:11 +05:30
Saurabh
6a277e244c [fixes] set todays date on employee attendance tool 2016-03-20 19:00:26 +05:30
rohitwaghchaure
277b7fa641 [Enhancement]Fetch default letter head of company on salary structure and salary slip 2016-03-18 16:33:18 +05:30
Valmik Jangla
15343be386 Commonified functions for retrieving Leave Approvers 2016-03-17 11:47:30 +05:30
Valmik Jangla
33cc081c3b Improved Leave Application / Approver feature 2016-03-17 11:47:30 +05:30
Nabin Hait
89301863e5 minot fixes 2016-03-15 15:20:49 +05:30
Anand Doshi
4284fcf2a6 [fix] additional fixes for removal of Fiscal Year form Holiday List 2016-03-11 17:16:30 +05:30
Valmik Jangla
e2b8af16ed Fixed Salary Slip to work with new Holiday List 2016-03-11 14:58:55 +05:30
Valmik Jangla
ba54a43e32 Fixed Maintenance Schedule to work wit new Holiday List 
Improved code in Holiday List for speed
 2016-03-11 14:58:55 +05:30
Valmik Jangla
3427c939bd Removed unused code 2016-03-11 14:58:55 +05:30
Valmik Jangla
c666030f34 Get Weekly Off dates now gets dates dynamically 
Fixed Holiday List test records
 2016-03-11 14:58:55 +05:30
Valmik Jangla
3085186182 Removed Fiscal Year from Holiday List and Calendar 2016-03-11 14:58:55 +05:30
Valmik Jangla
d9cc14ddd5 Removed from Leave Block List and Monthly Attendance List 2016-03-11 13:07:49 +05:30
Valmik Jangla
13bb2ba779 Removed fiscal year related things from, Recurrent Document, Leave Application, Upload attendance, Stock Reconciliation and Stock Balance 2016-03-11 13:07:49 +05:30
Valmik Jangla
d89dcf60e6 Removed from Delivery Note and Appraisal 
Added back in Stock Ledger Entry
Added validation in GL Entry and SL Entry
Stock Controller sets Fiscal Year using Posting Date
 2016-03-11 13:07:48 +05:30
Valmik Jangla
98ec1164fc Removed from Attendance, Upload Attendance, and Sales Order 2016-03-11 13:07:16 +05:30
Valmik Jangla
c4c603dcd2 Removed from Expense Claim 2016-03-11 13:05:19 +05:30
Anand Doshi
22ef68945d [minor] comment about hack 2016-03-11 12:47:14 +05:30
Javier Wong
102f9062e8 Whitelist get_month_details 
This is useful when manually pulling the salary structure in custom scripts for processing of other customized deductables or perhaps contributions.
 2016-03-08 17:39:58 +05:30
Rushabh Mehta
fe6eadfe22 [cleanup] job opening and job applicant 2016-03-02 12:53:19 +05:30
Rushabh Mehta
ae7dc31d14 Merge pull request #4846 from KanchanChauhan/job-applicant 
Added feature to allow people to apply for job from website
 2016-02-29 17:22:01 +05:30
Rushabh Mehta
a4decc2c59 [minor] [test] fix for leap year 2016-02-29 14:44:20 +05:30
Kanchan Chauhan
2e8cc89e34 Added webform for Job Opening 2016-02-19 17:31:13 +05:30
Anand Doshi
6e8eaf097a [fix] test case of Leave Application 2016-02-19 00:27:02 +05:30
Neil Trini Lasrado
25ab93a881 Changed image in employee from Attach to Attach Image, removed image view 2016-02-17 13:00:37 +05:30
Anand Doshi
870d0441a8 [minor] moved make_employee from Employee to Offer Letter 2016-02-16 15:53:09 +05:30
Valmik Jangla
5e771c5678 Changed doclist to doc 2016-02-16 15:33:35 +05:30
Valmik Jangla
93b1072cba Improved code 2016-02-16 15:33:35 +05:30
Valmik Jangla
bddc80bc66 Make Employee from Offer Letter 2016-02-16 15:33:35 +05:30
Anand Doshi
5f72504de1 [enhancement] Expense Claim - View Bank Entries 2016-02-15 18:02:38 +05:30
Rushabh Mehta
c403ce3b4f Merge pull request #4763 from rmehta/leave-app-cleanup 
[cleanup] leave application
 2016-02-08 18:51:29 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Rushabh Mehta
57fb74f262 Merge pull request #4742 from nabinhait/multifixes1 
Multi fixes
 2016-02-08 10:55:48 +05:30
Rushabh Mehta
cde997edfa [cleanup] leave application 2016-02-08 10:53:22 +05:30
Nabin Hait
3110c4a772 [fix] Make bank entry from expense claim 2016-02-04 17:22:57 +05:30
ShashaQin
995a71c854 Update leave_application.py 
fix half day leave issue
 2016-02-03 13:10:15 +08:00
Anand Doshi
6e33d91443 [minor] fixes to attendance tool and employee holiday attendance 2016-01-29 16:57:54 +05:30
Valmik Jangla
07364f5ece Feature - Employee Attendance Tool 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
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Anand Doshi
03e7e581d8 [minor] removed Communication table 2016-01-06 13:23:45 +05:30
Rushabh Mehta
969d48a554 [translations] fixes #4534-38 2016-01-04 16:09:40 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Nabin Hait
533aba02c5 [fix] Payment days calculation in salary slip 2015-12-10 10:50:42 +05:30
Nabin Hait
9421e9873a [fix] Allowed import for Expense Claim 2015-12-07 10:40:13 +05:30
Nabin Hait
d53e780fb8 [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period 2015-12-05 12:15:49 +05:30
Nabin Hait
a4eeb919e6 [fix] Set payment days considering joinging date, reliving date and applicable holidays 2015-12-03 15:10:30 +05:30