Rushabh Mehta
|
e3c117e32c
|
[fix] validate preferred email if set in employee.py
|
2017-04-15 16:59:39 +05:30 |
|
Nabin Hait
|
f6149f1507
|
Merge pull request #8429 from ckosiegbu/payroll_updates
Statistical Components for Salary Structure
|
2017-04-13 18:48:47 +05:30 |
|
Nabin Hait
|
2f3585f949
|
Update salary_slip.js
|
2017-04-13 18:47:25 +05:30 |
|
ckosiegbu
|
a236f4e586
|
Space to Tabs on salary_slip.py
|
2017-04-13 10:28:10 +01:00 |
|
ckosiegbu
|
64f29f819a
|
Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.
|
2017-04-13 00:00:37 +01:00 |
|
Khairil Zhafri
|
417145bec5
|
Update employee.json
Less binary gender options for Employee
|
2017-04-11 18:55:20 +05:30 |
|
Rohit Waghchaure
|
1ff1368280
|
[fix] Vehicle expense report not working
|
2017-04-11 18:54:32 +05:30 |
|
mbauskar
|
236f7aac7f
|
[minor] track changes for transaction documents
|
2017-04-10 14:48:54 +05:30 |
|
Rushabh Mehta
|
9365641777
|
[added] frappe.safe_eval
|
2017-04-06 18:24:34 +05:30 |
|
Kanchan Chauhan
|
aa6f00c403
|
Added default 'All' option to filters to differentiate all and empty filter
|
2017-04-06 15:22:18 +05:30 |
|
Rushabh Mehta
|
08a42e00ae
|
[fix] salary slip eval, remove access to globals, #8313
|
2017-04-05 14:52:22 +05:30 |
|
Rushabh Mehta
|
cc8b2b2fdb
|
[fix] [refactor] demo for v8 and remove purchase common
|
2017-03-31 17:36:48 +05:30 |
|
Rushabh Mehta
|
dc89916aa9
|
[fix] salary component fix for abbr
|
2017-03-31 17:20:57 +05:30 |
|
Nabin Hait
|
eb6fa5b70c
|
Update attendance.py
|
2017-03-30 14:11:47 +05:30 |
|
Nabin Hait
|
1f6bd0ad37
|
Fixed merge conflict
|
2017-03-30 13:15:22 +05:30 |
|
Nabin Hait
|
a24f8dbb8f
|
Merge branch 'develop' into update-disbursment-date
|
2017-03-30 13:06:28 +05:30 |
|
Kanchan Chauhan
|
37d8f643cc
|
Read permissions to Employee on Employee Loan and Loan Type
|
2017-03-30 13:05:49 +05:30 |
|
Kanchan Chauhan
|
400c6f5aef
|
Disbursement Date fetched from JV - Employee Loan
|
2017-03-30 13:04:05 +05:30 |
|
mbauskar
|
07e6bdd4f2
|
[minor] check employee date of joining before marking the employee attendance
|
2017-03-30 12:52:29 +05:30 |
|
Kanchan Chauhan
|
b87c174898
|
Employee Loan Dashboard
|
2017-03-30 12:51:46 +05:30 |
|
Kanchan Chauhan
|
5ac740b3cb
|
[Fix] From Date and To Date not to be auto calculated for Timesheet Salary
|
2017-03-30 12:44:28 +05:30 |
|
Kanchan Chauhan
|
35b12e2ea6
|
Company in Leave Control Panel
|
2017-03-29 17:30:56 +05:30 |
|
Nabin Hait
|
8de911b5b4
|
Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
[Minor] Guest should have read permissions on Job Openings
|
2017-03-23 16:50:45 +05:30 |
|
Kanchan Chauhan
|
076e9d6af8
|
[Minor] From date, To date based on Payroll Frequency
|
2017-03-22 16:07:03 +05:30 |
|
Kanchan Chauhan
|
730ad5a507
|
[Minor] Guest should have read permissions on Job Openings
|
2017-03-22 12:37:38 +05:30 |
|
Nabin Hait
|
ee7b4f2882
|
Merge pull request #8016 from rmehta/posting-date-option
[feature] posting date, time is always current unless explicitly set
|
2017-03-15 11:22:04 +05:30 |
|
Nabin Hait
|
3d731df7e3
|
Field order changed for 'Qty as per Stock UOM'
|
2017-03-14 17:24:57 +05:30 |
|
Rushabh Mehta
|
6d4a52562b
|
[fix] posting date, time is always current unless explicitly set
|
2017-03-14 17:06:51 +05:30 |
|
Nabin Hait
|
6923397ef6
|
Show net total in salary slip log in Process Payroll. Fixed #7986
|
2017-03-12 16:55:05 +05:30 |
|
Nabin Hait
|
c5204f56e2
|
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
JV on submitting Employee Loan
|
2017-03-12 16:50:48 +05:30 |
|
Nabin Hait
|
132193309c
|
Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
Multiple Salary Fixes
|
2017-03-12 16:48:11 +05:30 |
|
Kanchan Chauhan
|
37a57813fa
|
Multiple Salary Fixes
|
2017-03-09 13:00:35 +05:30 |
|
Kanchan Chauhan
|
ffd1f112e6
|
JV on submitting Employee Loan
|
2017-03-09 12:21:37 +05:30 |
|
Kanchan Chauhan
|
a64f53801b
|
[Minor] Label change in Expense Claim
|
2017-03-08 16:59:49 +05:30 |
|
Abdulla P I
|
cbe035b08a
|
Only enabled user to be fetched
|
2017-03-07 13:34:08 +05:30 |
|
Nabin Hait
|
b3ffd6b282
|
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
Changed userrole to has role, commonify role editor of the user
|
2017-03-06 18:44:53 +05:30 |
|
Kanchan Chauhan
|
8411be7720
|
[Fix] Candidate can apply to multiple jobs
|
2017-03-06 14:40:43 +05:30 |
|
Rohit Waghchaure
|
e7485150a1
|
added roles in the report
|
2017-03-06 14:26:09 +05:30 |
|
Rohit Waghchaure
|
312498060f
|
changed doctype name userrole to has role
|
2017-03-06 14:24:39 +05:30 |
|
Rohit Waghchaure
|
d59f8b32cd
|
changed user_roles to roles
|
2017-03-06 14:24:39 +05:30 |
|
Rohit Waghchaure
|
f8aa6ed46b
|
removed fiscal year and month from the print
|
2017-03-02 17:51:15 +05:30 |
|
Nabin Hait
|
a0fb3e5128
|
Merge pull request #7888 from KanchanChauhan/payroll-fix
[Fix] JV entry for Employee Loan only if Loan exists
|
2017-03-02 14:15:59 +05:30 |
|
Kanchan Chauhan
|
cfb0adff98
|
[Minor] Removed Paid status from Salary Slip
|
2017-03-02 12:59:35 +05:30 |
|
Kanchan Chauhan
|
e6254b96c4
|
[Fix] JV entry for Loan only if Loan exists
|
2017-02-28 17:42:09 +05:30 |
|
Nabin Hait
|
631ecad985
|
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
[Fix] Multiple fixes in Employee Loan
|
2017-02-27 17:28:20 +05:30 |
|
Nabin Hait
|
3ddc26060a
|
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
[Fix] Update totals on salary component deletion
|
2017-02-27 17:26:39 +05:30 |
|
Kanchan Chauhan
|
c02745c826
|
[Fix] Update totals on salary component deletion
|
2017-02-27 17:21:41 +05:30 |
|
Kanchan Chauhan
|
a13adc0e6b
|
[Fix] Multiple fixes in Employee Loan
|
2017-02-27 16:56:00 +05:30 |
|
Nabin Hait
|
c642f76a4d
|
Fixed merge conflict
|
2017-02-27 14:40:53 +05:30 |
|
Nabin Hait
|
697150f339
|
Leave application overlap validation for half day and test cases
|
2017-02-24 18:53:34 +05:30 |
|