Mainul Islam
a964db7821
Add multiple emoloyee in salary structure ( #6621 )
...
* Add multiple emoloyee in salary structure
* Added in Menu
* Remove Default Value from Company field
* Change Section Label
* Added Button in Salary Structure and set route_options
* Remove Single Doctype
* Add Dialog for Employee Add
* View Employee and Check or Uncheck
* Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees
* Employees View Section in Dialog Added Employe Name and set Employee Id as Title
* Delete SIngle Doctype
* Chagne to
* Remove checkbox
* Remove add button and set primary button
2016-10-24 11:22:00 +05:30
Nabin Hait
6ef8ede280
Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip
...
include_holiday being taken into consideration while calculating lwp
2016-10-24 11:19:43 +05:30
Nabin Hait
5ced4dfe34
Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix
...
[Fix] leave application days should be less than max days leave allowed
2016-10-24 11:18:44 +05:30
Nabin Hait
8918dcf54e
Merge pull request #6678 from KanchanChauhan/total-leave-days-updated
...
Total leave days gets updated on date change
2016-10-24 11:13:31 +05:30
Kanchan Chauhan
29ce0aab28
Warning if there are mutliple active salary structures
2016-10-22 20:48:44 +05:30
Kanchan Chauhan
c4c966691f
[Fix] Make Bank Entry button depends_on fixed
2016-10-22 18:04:48 +05:30
Kanchan Chauhan
a084405bca
Total leave days gets updated on date change
2016-10-22 11:55:51 +05:30
Kanchan Chauhan
a1006c0549
include_holiday being taken into consideration while calculating lwp
2016-10-21 17:53:15 +05:30
Kanchan Chauhan
24d580206a
[Fix] leave application days should be less than max days leave allowed
2016-10-21 13:01:33 +05:30
Saurabh
bc0783b527
[fix] duplicate columns in monthly salary report #6623
2016-10-20 12:55:23 +05:30
Nabin Hait
97fa119b37
Set prefered contact email in Employee
2016-10-19 18:26:01 +05:30
Nabin Hait
0702fa2fc6
Fixed version conflict
2016-10-19 16:49:36 +05:30
Nabin Hait
ff183eedb9
Fixes for testcases
2016-10-19 14:23:02 +05:30
Nabin Hait
fa1cdd5bf0
Fixed merge conflict
2016-10-18 15:37:33 +05:30
Rushabh Mehta
17f6874450
[minor] [fix] doctype_dasboard.py files, move data to get_data
2016-10-18 14:54:39 +05:30
Kanchan Chauhan
dc86964e91
Patch fixed for Employee
2016-10-18 11:29:41 +05:30
Nabin Hait
b3b1219109
Fixed merge conflict
2016-10-17 17:42:53 +05:30
Pawan Mehta
1a96cc1e8d
Fixes 6171 ( #6417 )
...
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
* [fix] #6171
2016-10-17 17:02:12 +05:30
KanchanChauhan
81581c669f
No Leave allocation for Leave Type for which Leave Without Pay is checked ( #6626 )
2016-10-17 17:01:29 +05:30
Nabin Hait
395d757c5a
Fixed merge conflict
2016-10-17 16:42:49 +05:30
Nabin Hait
cd9c45f816
Fixed merge conflict
2016-10-07 16:53:07 +05:30
Rohit Waghchaure
370e711f48
[Fix] Expense Claim, sanctioned amount not auto-populated from claim amount
2016-10-06 15:19:53 +05:30
Nabin Hait
80499bb657
Fixed merge conflict
2016-09-29 14:18:53 +05:30
Nabin Hait
2e31d7c7bf
[fix] Validate leave application period with salary slip only if leave type is LWP
2016-09-29 10:59:46 +05:30
Kanchan Chauhan
b40c0a917d
[WIP] Process Payroll Changes
2016-09-28 15:14:41 +05:30
Nabin Hait
1e97fc8687
Merge pull request #6460 from KanchanChauhan/salary-slip-fixes
...
[Fix]Salary Slip can be created without salary structure
2016-09-28 12:55:04 +05:30
Faris Ansari
70b7d3280b
added required fields in doctypes for gantt ( #6466 )
2016-09-26 18:20:14 +05:30
Kanchan Chauhan
273c5e71fd
[Fix]Salary Slip can be created without salary structure
2016-09-24 18:56:56 +05:30
robert schouten
147c727743
changed from label based to fieldname based
2016-09-22 08:32:54 +08:00
Nabin Hait
96d38eaac7
Merge pull request #6429 from rohitwaghchaure/minor_fix
...
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:40:47 +05:30
Rohit Waghchaure
a7e3d11077
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:13:16 +05:30
Kanchan Chauhan
2142a0ab37
[Fix] Indentation fixed
2016-09-21 17:28:42 +05:30
Nabin Hait
521b34c03b
Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition
...
Salary Slip fields in Condition and Formula
2016-09-21 12:55:27 +05:30
Nabin Hait
081eab147f
Update salary_slip.py
2016-09-21 12:55:16 +05:30
robert schouten
d7721a605d
preferred email for payroll
2016-09-21 11:36:01 +08:00
Nabin Hait
9f4ca1fb9e
set posting date in salalry slip
2016-09-20 18:19:59 +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
Kanchan Chauhan
e5057c8c35
Salary Slip fields in Condition and Formula
2016-09-20 14:59:42 +05:30
Nabin Hait
b8eef64e5d
Merge pull request #6325 from RobertSchouten/patch-26
...
fix allow negatives in leave type check
2016-09-20 11:00:31 +05:30
Nabin Hait
79fe1fad5d
Merge pull request #6374 from RobertSchouten/salary_register
...
print formatting for monthly Salary register
2016-09-20 10:58:53 +05:30
Nabin Hait
33ea19d616
Merge pull request #6395 from RobertSchouten/payroll_date
...
[minor] adding Payroll date field to process payroll and salary slip
2016-09-20 10:57:32 +05:30
robert schouten
5c41c77c7e
added posting date to process payroll and salary slip
2016-09-20 08:19:05 +08:00
Nabin Hait
56700ae148
Merge pull request #6356 from KanchanChauhan/job-application-webform
...
Job Application web form
2016-09-15 17:20:43 +05:30
Neil Trini Lasrado
83d81203b2
Added Student Admissions ( #6359 )
...
* Added Student Admissions
* Fixes for Student Application
2016-09-15 14:48:13 +05:30
robert schouten
32c366508a
add print format and id to monthly salary register
2016-09-15 14:21:15 +08:00
Kanchan Chauhan
122d0791a3
Job Application web form
2016-09-13 14:29:02 +05:30
Nabin Hait
fcbb7692fa
Merge pull request #6322 from RobertSchouten/patch-23
...
leave balance now fy not calendar
2016-09-12 18:53:16 +05:30
Nabin Hait
b7c5b76ed1
Merge pull request #6321 from RobertSchouten/patch-22
...
allow users without employee with hr permission to view all calendars
2016-09-12 18:52:45 +05:30
RobertSchouten
f4498307c6
fix allow negatives in leave type check
2016-09-09 11:35:51 +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
RobertSchouten
93c095bf16
allow users without employee with hr permission to view all calendars
2016-09-09 10:15:56 +08:00
RobertSchouten
e4d3809c87
allow users without employee with hr permission to view all calendars
2016-09-09 10:14:07 +08:00
pawan
7b2bd20a09
[fix] #6254
2016-09-06 18:28:41 +05:30
pawan
bd9a275d5f
[fix] #6254
2016-09-02 16:51:22 +05:30
Nabin Hait
d260602cae
Merge pull request #6202 from KanchanChauhan/component-type-added
...
'Type' field added to Salary Component
2016-08-29 16:19:05 +05:30
Kanchan Chauhan
145f87c068
'Type' field added to Salary Component
2016-08-29 15:26:57 +05:30
Nabin Hait
338e63c448
Fixed version conflict
2016-08-29 11:47:50 +05:30
Rushabh Mehta
9d1b56f423
[minor] validate permission in Process Payroll and all products fix for home page
2016-08-29 11:03:10 +05:30
Kanchan Chauhan
22073f3a7f
Layout changes in Salary Structure
2016-08-23 16:14:04 +05:30
Nabin Hait
c95a3180c2
Merge pull request #6127 from KanchanChauhan/demo-fixes-salary
...
Demo updated for new salary structure
2016-08-22 15:22:41 +05:30
Kanchan Chauhan
681a86d70e
[Minor]Fixes
2016-08-22 00:28:20 +05:30
Kanchan Chauhan
db197d593a
Demo updated for new salary structure
2016-08-20 00:30:59 +05:30
Nabin Hait
b5951b72f3
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
...
Formula based Salary Structure
2016-08-18 16:39:58 +05:30
Kanchan Chauhan
bccf0fa041
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
2016-08-18 13:02:39 +05:30
Abdulla P I
23a6d05622
Update employee_list.js
2016-08-18 12:43:19 +05:30
Rohit Waghchaure
fe913c9969
[Fix] lwp salary structure
2016-08-16 15:43:50 +05:30
Kanchan Chauhan
705384d8fe
Leave Application Validation for processed salary
2016-08-06 13:42:18 +05:30
Neil Trini Lasrado
3e78558357
Moved Intrest to HR module
2016-08-01 15:18:36 +05:30
Nabin Hait
dfcf55d010
Merge pull request #5948 from nabinhait/department_role
...
Assigned permissions for Academic User role in Department
2016-08-01 13:07:02 +05:30
Nabin Hait
86a477d07e
Assigned permissions for Academic User role in Department
2016-08-01 12:51:04 +05:30
Nabin Hait
feed313a66
Delete old salary earning and deduction doctypes
2016-08-01 11:54:19 +05:30
Ben Cornwell-Mott
07e5758a94
Timesheets update on date changes in Salary Slip
2016-07-26 21:00:43 -07:00
Ben Cornwell-Mott
d4d1f1b036
Added date filters for the Timesheet query in Salary Slip
2016-07-26 03:33:38 -07:00
Rushabh Mehta
6c3ac9587e
[fix] quick entry
2016-07-25 15:03:39 +05:30
Rushabh Mehta
e7399dff2d
[fix] homepage patch
2016-07-22 21:01:39 +05:30
Saurabh
9cba6e1f25
[fix] test case fix for expense claim
2016-07-19 11:38:16 +05:30
Saurabh
718d835f45
[enhance] Add Accounts table in to mention expense account based on company #5777
2016-07-19 11:38:16 +05:30
Saurabh
f589c82d68
[enhance] demo for expense claim #5731
2016-07-19 11:38:15 +05:30
Nabin Hait
530b86b9b2
Merge pull request #5752 from KanchanChauhan/employee-holiday-attendance-report-renamed
...
Employee Attendance report renamed to Employees working on a holiday
2016-07-16 10:58:52 +05:30
Rushabh Mehta
55ea7b1f61
[minor] set applicant name automatically
2016-07-15 16:43:25 +05:30
Kanchan Chauhan
9846b945d9
Patch to delete previous report
2016-07-15 14:06:20 +05:30
Kanchan Chauhan
7ff0c4eef4
Employee Attendance report renamed to Employees working on a holiday
2016-07-15 13:42:36 +05:30
Rohit Waghchaure
3bc6a958c7
[Fix] Timesheet overlap issue
2016-07-14 18:27:49 +05:30
Rushabh Mehta
176b63b354
[fix] remove first row on mapping, fixes #5707
2016-07-14 17:43:48 +05:30
Rushabh Mehta
4beba3aff9
Merge pull request #5705 from KanchanChauhan/fixed-employee-holiday-attendance-report
...
Added Holiday List filter
2016-07-12 11:11:43 +05:30
Kanchan Chauhan
54860cd57d
Added Holiday List filter
2016-07-11 15:16:47 +05:30
Rushabh Mehta
391c0efcee
[fix] make grids editable
2016-07-11 13:01:58 +05:30
Nabin Hait
12e8277b6b
Merge pull request #5681 from nabinhait/sal_slip_print
...
Print formats for salary slip
2016-07-08 08:35:31 +05:30
Rohit Waghchaure
0d4a9c225f
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
2016-07-07 17:04:54 +05:30
Rushabh Mehta
964ad0fcae
[cleanup] rename "links" to "dashboard"
2016-07-07 14:28:05 +05:30
Nabin Hait
027acde4f4
Print formats for salary slip
2016-07-07 13:17:21 +05:30
Rohit Waghchaure
e94d18b4cd
Rename Time Sheet doctype
2016-07-06 20:38:50 +05:30
Rohit Waghchaure
3188b56694
[Fixes] Time sheet fixes
2016-07-06 14:31:14 +05:30
Kanchan Chauhan
d963b76a4b
Salary component cleanup
2016-07-06 12:04:38 +05:30
Saurabh
c2934ba9da
[minor][fix] holiday list exception message fix
2016-07-04 13:06:29 +05:30
Nabin Hait
13093b4b68
Make payment entry aginst order, payment request and patch to rename advance table fields
2016-07-04 11:42:24 +05:30
Rushabh Mehta
b33df4afe8
[cleanup] link methods made common
2016-07-04 11:39:25 +05:30
Rushabh Mehta
8c2e79cf0d
[minor] fixes
2016-07-04 11:39:25 +05:30
Rohit Waghchaure
3fa0b51e5e
[Fixes] Time sheet fixes and changed timesheets to time_logs
2016-06-29 19:04:16 +05:30
