Kanchan Chauhan
|
29ce0aab28
|
Warning if there are mutliple active salary structures
|
2016-10-22 20:48:44 +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 |
|
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
|
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 |
|
Neil Trini Lasrado
|
83d81203b2
|
Added Student Admissions (#6359)
* Added Student Admissions
* Fixes for Student Application
|
2016-09-15 14:48:13 +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
|
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 |
|