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

1448 Commits

Author SHA1 Message Date
Jamsheer
a1bb94e59d Pro-rata component consistency for monthly Salary slip (#14595) 
* Pro-rata component consistency for monthly Salary slip

* Resolve merge conflict
 2018-06-20 12:41:32 +05:30
Ranjith Kurungadam
05d00397d0 Update tax calculation (#14564) 
* Tax Slab remove to_amt mandatory, condition data type Code

* Salary Slip - consider condition in tax slab

* Payroll Period - help text for tax slab condition
 2018-06-20 12:33:02 +05:30
Ranjith Kurungadam
4f9744a56d HRA fix (#14589) 
* hra - fix var ref before assignment

* Tax Exemption Category - remove deduction component
 2018-06-20 11:10:56 +05:30
Jamsheer
55a2f4da71 Employee Benefit (#14571) 
* Rename - filed is_pro_rata_applicable to pay_against_benefit_claim

* Employee Benefit Application - Validate previous benefit claim

* Employee Benefit Claim - Code refactor

* Salary Slip - additional salary - fix
 2018-06-20 11:04:21 +05:30
Jamsheer
c526cad183 [Fix] Additional Salary Component and tax calculation (#14581) 
* Additional salary not include in tax calculation

* Additional salary get doubled in salary slip via Payroll Entry - Fix

* Salary Component - if is_additional_component hide flexi
 2018-06-20 10:52:20 +05:30
Shreya Shah
0cb0c0b642 [Tests] Staffing Plan (#14585) 
* Add test case for Staffing Plan

* Fix codacy
 2018-06-20 10:50:54 +05:30
Ranjith Kurungadam
f972e7b259 Staffing Plan - remove department filter, query by dates (#14590) 2018-06-20 10:48:40 +05:30
Shreya Shah
b0575265fb Test case for Attendance Request (#14566) 
* Add test case for Attendance Request

* Add a message if attendance not submitted

* Add test for cancelled document
 2018-06-19 10:47:40 +05:30
Shreya Shah
cbff30f718 [Tests] Shift Planning (#14570) 
* Cancel shift assignment on cancellation of shift request

* [minor] Fix shift type test

* Modify test for shift request

* Add test case for shift assignment

* Fix syntax

* Fix codacy
 2018-06-19 10:45:33 +05:30
Ranjith Kurungadam
6cca03195f fix- Salary Structure filter (#14558) 2018-06-18 15:42:38 +05:30
Manas Solanki
efa191c72e [minor fix] change the unicode/str to the datetime obejct (#14534) 2018-06-15 18:04:12 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00
Nabin Hait
380a74732c salary structure related test case fixes 2018-06-15 14:42:12 +05:30
Nabin Hait
2f89a04511 create user permissions on save of employee 2018-06-15 13:16:44 +05:30
Nabin Hait
fcaeea70d2
Update employee.py 2018-06-15 12:47:45 +05:30
Nabin Hait
5bc533f65d Test case fixes 2018-06-15 11:59:58 +05:30
Ranjith Kurungadam
0e5c8283fa Salary Slip - update period factor for tax calc (#14527) 2018-06-15 10:03:57 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional (#14520) 
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
 2018-06-14 17:56:16 +05:30
Nabin Hait
b2d3c0f040 Update ordered qty in blanket order 2018-06-14 15:56:29 +05:30
Rushabh Mehta
1198d94904 [rename] Email Alert -> Notification 2018-06-14 13:18:21 +05:30
Zarrar
6ffdf94003 [Fixes] Defaults and User-Permission based fixes in treeview (#14501) 
* utility function added for treeview
function to distinguish defaults from user permission and return appropriate data

* make use of utility function for treeview
 2018-06-14 12:24:16 +05:30
Shreya Shah
06ef4270f2
Merge pull request #14447 from zerodhatech/loan_application 
[Enhancement] toggle required fields on select of repayment option in loan application
 2018-06-14 12:05:46 +05:30
Jamsheer
c7743932ab [Fix] HR Fixes (#14511) 
* Payroll Entry - fix in db query

* Salary Structure Assignment - Company read_only = 1

* Fixes in hr util and benefit claim

* Employee Benefit Application - Late application - fix
 2018-06-14 11:55:17 +05:30
Saurabh
8e74df09a4 [fix] On deletion of salary slip decrease the series count (#14508) 2018-06-14 11:47:21 +05:30
Shreya Shah
a2056a39bd Fix patch (#14503) 
* Modify patch to move leave approvers from Employee master to Department master

* Rename child table names

- Rename leave approver to leave approvers
- Rename expense approver to expense approvers

* Import cstr

* Fix a condition
 2018-06-13 17:11:17 +05:30
Manas Solanki
aa17294979
Update utils.py 2018-06-13 16:47:41 +05:30
Jamsheer
30f37b2eb1 Payroll Entry - Separate JE for flexi salary component (#14502) 
* Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry

* Journal Entry - validate cheque info on submit

* Payroll Entry - Make Bamk Entry - Separate JE for benefit component
 2018-06-13 15:29:38 +05:30
Jamsheer
cc25eb00b5 Employee benefit application depends on lwp (#14494) 
* Employee benefit - pro-rata amount - depends on lwp and working days

* HR Util - get holidays for employee

* Employee Benefit Application - calculate remainig on max benefit

* Employee benefit - late application - depends on lwp

* missing semicolon
 2018-06-13 15:14:24 +05:30
rohitwaghchaure
93e8bbac84 [Fix] Travis for employee_tax_exemption_declaration (#14500) 2018-06-13 15:12:32 +05:30
Shreya Shah
4fe2a91b9f Remove docstatus=1 to show pending leaves as well (#14498) 2018-06-13 15:11:43 +05:30
Jamsheer
f6d7b5d0c8 Salary slip - additional salary - deductions (#14476) 2018-06-13 11:36:43 +05:30
Manas Solanki
176e7c5ce2 fix the test case for the payroll (#14480) 
* fix the test case for the payroll

* fix the shopify and stock entry

* more structured test cases for payroll
 2018-06-13 11:13:01 +05:30
Nabin Hait
76c51b3068 minor ux fix 2018-06-12 16:29:10 +05:30
Ranjith Kurungadam
138e6abaff Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428) 2018-06-12 12:19:36 +05:30
Suraj Shetty
e06ecd2494 Check if user permission for employee exists (#14474) 
- Also check if user has permission to
add user permission to avoid insufficient
permission error while updating user profile
 2018-06-12 12:06:41 +05:30
Jamsheer
8d66f1e45d Employee benefit - Late employee benefit application (#14465) 
* HR Utils - get salary slip total benefit given for a payroll period

* Late employee benefit application

* Additional Salary - code refactor - get_amount

* new line in salary detail json

* Employee benefit late application - validation refactor

* Codacy fix
 2018-06-12 11:30:59 +05:30
Manas Solanki
65b55a53a6
Update test_leave_application.py 2018-06-12 11:18:01 +05:30
Manas Solanki
d7f6d45e28
Merge pull request #14468 from manassolanki/fix-travis-1 
fix the salary slip test cases
 2018-06-11 19:29:28 +05:30
Manas Solanki
f226b50d6d fix the salary slip test cases 2018-06-11 19:27:46 +05:30
Shridhar Patil
c3f5849ac0 typo fixed 2018-06-11 18:26:45 +05:30
Manas Solanki
e832aa4fe2
Merge pull request #14436 from shreyashah115/fix-trav 
Travis again
 2018-06-11 17:45:11 +05:30
Shridhar Patil
6a00a17c14 toggle required fields on select of repayment option in loan application 2018-06-11 12:48:31 +05:30
Ranjith Kurungadam
e46639f47c Employee Transfer allow same company, update internal work history (#14430) 2018-06-11 11:24:44 +05:30
Shreya
83d5dc119b Fix Employee tax declaration test case 2018-06-11 10:31:40 +05:30
Shreya
956277b121 Fix tests 2018-06-11 10:31:39 +05:30
Doridel Cahanap
ebb530385a Add Employee Status Temporary Leave (#14423) 2018-06-08 14:54:31 +05:30
Zarrar
7ab70ca2d7 [ Fixes ] v11 Tree based doctype testing (#14419) 
* location tree fixes
validate if child present while deleting, filter lists down only group enabled node

* department tree fixes
Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash

* Company tree fix
Check if child exist while deleting a node validation added.

* Supplier Group tree fixes
on_trash validation added if child node present

* Cost Center tree fixes
Adding child to root node throws error because parent_cost_center picks up root name
 2018-06-08 14:33:15 +05:30
Shreya Shah
b9399d8781 Cancel attendance if leave application is cancelled (#14372) 
* Cancel attendance if leave application is cancelled

* Fix as per review
 2018-06-08 11:24:08 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav 
Some more travis fixes
 2018-06-07 14:14:33 +05:30
Shreya
88591314b0 Fix Leave Application test cases 2018-06-07 13:56:27 +05:30
Shreya
88fe0d59d9 Fix daily work summary test 2018-06-07 11:22:26 +05:30
Saurabh
eb579a11e1 Fix demo (#14365) 
* fix demo

* Update asset.json
 2018-06-06 15:05:31 +05:30
Ranjith Kurungadam
cff14793d8 Salary Structure, Slip - make fields readonly (#14358) 
* Salary Structure, Slip - make fields readonly

* codacy fixes

* Salary Component - reorder fields, removed is_group for flexi

* Update salary_structure.js
 2018-06-06 12:04:25 +05:30
Ameya Shenoy
873e28d9b8
Merge branch 'master' into develop 2018-06-06 05:53:19 +00:00
Nabin Hait
2f273e73b2 minor fixes 2018-06-05 14:40:48 +05:30
Nabin Hait
e0a2ea64c0 Merge branch 'develop' of https://github.com/mnaim-cloude8/erpnext into mnaim-cloude8-develop 2018-06-05 14:21:57 +05:30
Shreya Shah
630721aacc Travis (#14354) 
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
 2018-06-05 12:56:10 +05:30
Ranjith Kurungadam
d580c92377 Staffing Plan (#14346) 
* validate staffing plan

* staffing plan docs

* get_active_staffing_plan_and_vacancies now returns dict, mandatory fields set

* validate with parent and child company plans, plan now considers open job openings

* Failure details in validate error messages

* Fixed sql injection
 2018-06-05 11:40:58 +05:30
Nabin Hait
c4eec99bc4 minor fix 2018-06-05 09:06:30 +05:30
Ranjith Kurungadam
f576c570c9 Salary Slip - fix when no pyroll period found for tax calc (#14335) 2018-06-04 12:53:23 +05:30
Nabin Hait
8c7af497a0 Fixed merge conflict 2018-06-04 11:23:36 +05:30
Ranjith Kurungadam
ed4e49c6b2 Salary Slip - Deduct Tax (#14255) 
* Salary Slip - Deduct Tax For Unclaimed Employee Benefits, Unsubmitted Tax Exemption Proof

* fix - missing return statement
 2018-06-04 11:17:55 +05:30
Nabin Hait
a55090dc88 Fixed merge conflict 2018-06-04 11:14:50 +05:30
Jamsheer
398f15754d Rename - Additional Salary Component to Additional Salary (#14302) 
* Rename Doctype Additional Salary Component to Additional Salary

* Remove unused import
 2018-06-04 11:02:53 +05:30
Nabin Hait
953ea93f7b
Update leave_type.json 2018-06-03 15:31:35 +05:30
Ranjith Kurungadam
375db6181d Earned Leave (#14143) 
* Earned Leave Allocations will be initially zero, escaped validation in leave allocation to allow this

* Earned Leave monthly scheduler method, test

* remove whitelist of method
 2018-06-01 16:09:28 +05:30
rohitwaghchaure
2fa057e4ad [Fix] Expense claim showing status as Unpaid even if Total Advance Amount and Total Sanctioned Amount is same (#14311) 2018-06-01 15:10:55 +05:30
Ranjith
590bf4ce3a codacy fixes 2018-05-31 12:08:14 +05:30
Ranjith
0cb2684130 Tax Exemption Proof Submission - validations, eligible hra calc 2018-05-30 20:51:37 +05:30
Ranjith
793f8e8caa Tax Exemption Declaration - update fields, move generic methods to utils 2018-05-30 20:50:48 +05:30
Ranjith
806cd93791 Merge remote-tracking branch 'frappe/develop' into dev_hra 2018-05-30 13:37:47 +05:30
Ranjith
155ecc1b4a Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Vladyslav Baidak
13d4391e70 Fixed SQL syntax error in Get Loan Details (#14265) 2018-05-29 15:22:05 +05:30
Ranjith
7bb621d2bf Tax Exemption Declaration, Proof Submission HRA fields 2018-05-29 13:58:31 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Rohit Waghchaure
81302a8b12 [Fix] Leave application, leave approver not fetching 2018-05-28 15:10:19 +05:30
Solufyin
64d02f917a [ADD] Department Analytics Bar Chart Feature (#14217) 2018-05-26 09:26:03 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Suraj Shetty
aadfaa4493 Minor fixes (#14231) 
* Parse date using getdate to avoid TypeError

* Fix alignment of application dashboard table text

* Use `user` instead of `email` to get value from user table
 2018-05-26 09:10:47 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Jamsheer
e6eef3085c Remove unused imports 2018-05-25 15:20:50 +05:30
Jamsheer
9416ac4ad4 Leave Priod - fix - grant leave allocation filter by grade 2018-05-25 14:46:31 +05:30
Manas Solanki
730cb3b547
Update employee.py 2018-05-25 14:46:21 +05:30
Jamsheer
fca88a6b22 Employee benefits - get_assigned_salary_structure 2018-05-25 14:35:02 +05:30
Jamsheer
79a6b42353 Salary Slip - options to fetch from migration 2018-05-25 12:56:22 +05:30
Jamsheer
ce89199abb taxable salary slabs remove from Salary Component and add to Payroll Period 2018-05-25 12:52:23 +05:30
Jamsheer
f1d10bf286 Salary Component - remove flexi_default 2018-05-25 12:52:23 +05:30
Jamsheer
620c3a872c Employee Benefit Claim - non pro-rata claim validation updated 2018-05-25 12:52:23 +05:30
Jamsheer
dc698a891d options to fetch from migration 2018-05-25 12:52:23 +05:30
Jamsheer
8eec40cb8a Employee Benefits in Salary Slip - Application and Claim 2018-05-25 12:46:31 +05:30
Jamsheer
16e924333e get payroll period days - fix 2018-05-25 12:46:31 +05:30
Jamsheer
47d865baa0 Calculate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
8a953ba516 Validate remaining benefit amount in Employee Benefit Application 2018-05-25 12:46:31 +05:30
Jamsheer
772f257ff3 Employee Benefit Claim - date default to Today 2018-05-25 12:46:31 +05:30
Jamsheer
eacaad3aec Max benefit amount in Employee Benefit Application Detail 2018-05-25 12:42:21 +05:30
Jamsheer
c1ae88ba02 Employee Benefit Calim - earning component filter updated 2018-05-25 12:42:20 +05:30
Jamsheer
c5629efe0e Employee Benefit Application - refactor validation 2018-05-25 12:42:20 +05:30
Jamsheer
9d5d328a4f Salary Structure - validate flexi with max benefit 2018-05-25 12:42:20 +05:30
Jamsheer
65a5e47e68 Payroll Period - validate dates and overlap 2018-05-25 12:37:36 +05:30
Jamsheer
cf414cc499 Payroll Period - fields refactor 2018-05-25 12:37:36 +05:30
Jamsheer
2ee211ad21 Salary Structure - validate max benefits with flexi 2018-05-25 12:37:36 +05:30
Jamsheer
ce7310255e Salary Structure - filter for earnings 2018-05-25 12:37:36 +05:30
Jamsheer
43e191289c Employee Benefit Application - earning component filter by salary structure flexi component 2018-05-25 12:37:36 +05:30
Jamsheer
77a91f0d01 Salary Component - account mandatory for separate payment entry 2018-05-25 12:37:36 +05:30
Jamsheer
1248f6a752 Codacy fix 2018-05-25 12:37:36 +05:30
Jamsheer
0493c22f3c Additional Salary Component - filter updated - salary_component 2018-05-25 12:37:35 +05:30
Jamsheer
f647aa15af Salary Component - fields - refactor fields behaviour 2018-05-25 12:37:35 +05:30
Jamsheer
334bd189a7 Employee Benefit Application - filter updated - earning component 2018-05-25 12:37:35 +05:30
Jamsheer
da24722beb Employee Benefit Claim - filter for earning component 2018-05-25 12:37:35 +05:30
Jamsheer
ce88bdf005 Employee Benefit Claim - Validation Updated - Code refactor 2018-05-25 12:37:35 +05:30
Nabin Hait
d5cb4c10a1 Set parent department if missing and not root itself 2018-05-23 18:36:18 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121) 
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
 2018-05-23 11:11:36 +05:30
Suraj Shetty
e03937fd6a Send daily work summary alert to only enabled users (#14175) 
* Send daily work summary alert to only enabled users

* Fix import
 2018-05-23 10:32:55 +05:30
Faris Ansari
26eb513274 Rename occurences of max_days_allowed to max_continuous allowed (#14180) 2018-05-23 10:31:39 +05:30
Ameya Shenoy
1cc7500be9
Merge branch 'master' into develop 2018-05-22 09:18:38 +00:00
Rohit Waghchaure
8e12a59d9b [Fix] Patch 2018-05-21 18:52:07 +05:30
Ameya Shenoy
35984daf72 relieving_date wasnt of type datetime 2018-05-21 16:37:27 +05:30
Rohit Waghchaure
11e2a9ac90 [Fix] Permission issue while saving leave application 2018-05-21 15:39:38 +05:30
rohitwaghchaure
1275ea5123
Merge pull request #14154 from rohitwaghchaure/set_default_leave_approver 
Set leave approver in the leave application
 2018-05-21 11:58:41 +05:30
Shridhar Patil
4c790488ea job opening designation made mandatory (#14153) 2018-05-21 10:30:17 +05:30
Rohit Waghchaure
812224e56e Set leave approver in the leave application 2018-05-20 21:21:33 +05:30
Zarrar
1f3f18534b [Fix] Leave Application & Expense Claim query fix | Leave Balance Report fix (#14149) 
* move set_query to setup function

* rectify leave balance report according to deparmtent changes
 2018-05-20 10:45:14 +05:30
Manas Solanki
d976c04b69
Merge pull request #14134 from manassolanki/fix-salary-patch 
[fix] patch for the salary structure assignment for old employees
 2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8 [fix] patch for the salary structure assignment for old employees 2018-05-18 15:46:35 +05:30
Shreya
65dd1f6b4c Mark attendance only if to_date <= nowdate in Leave Application 2018-05-17 17:13:56 +05:30
rohitwaghchaure
8c6b7557db
Merge branch 'develop' into jam_enterprise_emp_benefit 2018-05-17 14:08:06 +05:30
rohitwaghchaure
4444430200
Merge pull request #14108 from ESS-LLP/tax_deduction 
Variable tax deduction
 2018-05-17 13:55:52 +05:30
Ranjith
58363e6bbd get_payroll_period return name, fix hard coded leave period 2018-05-17 10:00:33 +05:30
Zlash65
e3f7e8b101 typo in frappe.throw in employee_transfer 2018-05-17 01:34:35 +05:30
Ranjith
31eeff00f7 merge frappe/develop 2018-05-16 23:24:34 +05:30
Ranjith
b485b1ef80 Salary Slip calc tax, except for flexi benefits 2018-05-16 23:01:40 +05:30
Ranjith
c6b2575a9c fields in salary detail, copy data from salary component on change 2018-05-16 22:59:21 +05:30
Rohit Waghchaure
8e4f676c8c [Fix] onload set default employee, leave approver, company 2018-05-16 19:55:52 +05:30
Jamsheer
8b86d18f73 Remove unused imports 2018-05-16 19:50:30 +05:30
Jamsheer
3434aabc28 Employee Benefit Claim in Salary Slip 2018-05-16 19:50:30 +05:30
Jamsheer
3abae9c1ba Employee Benefit Application - whitlist method get_max_benefits 2018-05-16 19:50:30 +05:30
Jamsheer
3e64297a3d Employee Benefit Application - validate maximun benefit 2018-05-16 19:50:30 +05:30
Jamsheer
3cd0ad4c98 Codacy fixes 2018-05-16 19:50:30 +05:30
Jamsheer
c9287b5b88 Manage grouping of salary component for flexible benefit 2018-05-16 19:50:30 +05:30
Jamsheer
6410022cab minor fixes 2018-05-16 19:49:39 +05:30
Jamsheer
c678d037e7 Salary slip - throw if no default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
5f6e274505 Salary slip - default flexi component 2018-05-16 19:49:39 +05:30
Jamsheer
43740a6511 Employee Benefit Application - employee benefit in salary slip 2018-05-16 19:49:39 +05:30
Jamsheer
0bc665c0a5 Salary Copmonent - Default flexible componnent 2018-05-16 19:49:39 +05:30
Jamsheer
15613e46ad Salary Copmonent - Defualt flexible componnent 2018-05-16 19:48:47 +05:30
Jamsheer
d63c39a514 Payroll Period - get payroll period days 2018-05-16 19:47:18 +05:30
Jamsheer
d66fb842c1 Employee Benefit Application - validate max benefit for employee 2018-05-16 19:47:18 +05:30
Jamsheer
2d6901d5dc Employee Benefit Application - validate max benefit amount for component 2018-05-16 19:47:18 +05:30
Jamsheer
9cb2fc2766 Employee Benefit Application - calcluate benefit amount 2018-05-16 19:47:18 +05:30
Jamsheer
d48998bae1 Employee Benefit Application - Calculate benefit amounts 2018-05-16 19:47:18 +05:30
Jamsheer
779f8ebbb3 Employee Benefit Application - get max benefit 2018-05-16 19:47:18 +05:30
Jamsheer
41616de9cc Employee Benefit Application - validate duplicate 2018-05-16 19:47:18 +05:30
Jamsheer
9cd292b187 Employee Benefit Application - filter updated 2018-05-16 19:47:18 +05:30
Jamsheer
4d93d339f7 Employee benefit - filters fro earning component 2018-05-16 19:47:18 +05:30
Ranjith
29e0ed3da1 Exemption Declaration - field total_amount 2018-05-16 19:10:35 +05:30
Manas Solanki
5b34c00ba6 Added the travel request on the config page 2018-05-16 18:09:43 +05:30
Shreya
fda15702bc Fix error 2018-05-16 16:14:34 +05:30
Manas Solanki
4534df36a9
Merge pull request #14078 from manassolanki/pos-fix 
[enterprise] minor fixes
 2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220 [enterprise] minor fixes 
make the employee name mandatory in the employee onboarding
added the retention bonus amount
 2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37
Merge pull request #14077 from manassolanki/travel-request 
[rename] Photo ID -> Identification Document
 2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd [rename] Photo ID -> Identification Document 2018-05-16 14:12:22 +05:30
rohitwaghchaure
9ad0ac9557
Merge pull request #14068 from manassolanki/travel-request 
[feature] added travel request doctype in HR
 2018-05-16 14:05:26 +05:30
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
Ranjith Kurungadam
cdd4704485 Fixes, fields in Salary Component (#14071) 
* remove duplicate fields

* Salary Component - fields is_tax_applicable, is_payable

* fix intendation
 2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514 fix for tests 2018-05-16 13:05:13 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Ranjith
db120fb0bc Salary Component - fields is_tax_applicable, is_payable 2018-05-16 12:17:16 +05:30
Ranjith
447f0e495a remove duplicate fields 2018-05-16 12:13:46 +05:30
Rushabh Mehta
b56f3d0689 [fix] syntax errors 2018-05-16 12:03:39 +05:30
Shreya
2a1bcf285b [minor] Fix typo 2018-05-16 11:06:02 +05:30
Manas Solanki
d11b5d398d [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
Rushabh Mehta
bc5c04f438
Update job_offer.js 
cur_frm is deprecated
 2018-05-16 10:51:15 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) 
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
 2018-05-16 10:44:38 +05:30
Shreya Shah
11f3e8155b Import nowdate (#14064) 2018-05-16 10:42:09 +05:30
Rohit Waghchaure
d3e84a6944 [Fix] Issue, local variable 'leaves_encashed' referenced before assignment 2018-05-16 09:39:44 +05:30
rohitwaghchaure
4671c53eb0
Merge pull request #14056 from ESS-LLP/retention_bonus 
Retention bonus
 2018-05-15 22:27:04 +05:30
rohitwaghchaure
41b457076d
Merge branch 'develop' into enterprise_fix 2018-05-15 22:26:11 +05:30
Ranjith
d43e068a5b fix Leave Encashment unlink additional component, readonly encashed days 2018-05-15 20:11:30 +05:30
Ranjith
c60c6981a5 Merge remote-tracking branch 'frappe/develop' into encash 2018-05-15 20:00:26 +05:30
Jamsheer
3beeb7255f Compensatory Leave Request - add link to leave allocation 2018-05-15 19:42:27 +05:30
Jamsheer
ebb68afecb Leave Allocation - remove link to compensatory leave request 2018-05-15 19:41:25 +05:30
Jamsheer
a46ce11af9 Additional Salary Component - naming and date fix 2018-05-15 19:20:51 +05:30
Ranjith
819c3b1bf6 Retention Bonus - menu, validate 2018-05-15 19:17:31 +05:30
Ranjith
7d394c14ce Email Alert for Retention Bonus 2018-05-15 19:15:58 +05:30
Manas Solanki
70899f5a60
Update utils.py 2018-05-15 18:52:14 +05:30
anoop
bb629de49b doctype retention bonus 2018-05-15 18:41:46 +05:30
Zlash65
b8bd6644fd remove unused module import and error classes 2018-05-15 18:23:41 +05:30
anoop
504855e1a0 on submit: create additional salary component, revert on cancel 2018-05-15 18:11:49 +05:30
Ranjith
4c721cbe0f Leave Encashment - submit, cancel Additional Salary Component 2018-05-15 16:39:20 +05:30
Rohit Waghchaure
e0b515066e [Fix] Employee mandatory validation issue 2018-05-15 16:18:05 +05:30
rohitwaghchaure
66ece67d41
Merge pull request #14044 from shreyashah115/fix-promotion-doc 
[Fix] Updation of new values in Employee Property History
 2018-05-15 15:27:16 +05:30
Shreya
14069c9395 Fix updation of new values 
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
 2018-05-15 15:19:24 +05:30
Manas Solanki
183dc731c2
Update employee_onboarding.py 2018-05-15 14:32:37 +05:30
Zlash65
99e72af089 skip abbr, reload doc, disable edit for root department node' 2018-05-15 13:53:40 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Rohit Waghchaure
4a126947f5 Code cleaup 2018-05-15 12:43:21 +05:30
anoop
6119b7337c updated get_leave_balance_on to consider encashed leaves by default. 2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f 13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending 2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b helper method to get employees assigned salary structure 2018-05-15 12:36:42 +05:30