Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,963 Commits 3 Branches 0 Tags 1 GiB
5632712d00
Commit Graph

1889 Commits

Author SHA1 Message Date
Mangesh-Khairnar
9ee5c8a4c6 fix(employee-benefit-application): remove query from setup 2019-06-17 18:07:10 +05:30
Mangesh-Khairnar
fefdac432c refactor: add json changes 2019-06-14 15:39:50 +05:30
Mangesh-Khairnar
24fbe23c8d fix: add indicators for expire in the leave allocation list 2019-06-14 15:36:26 +05:30
Anurag Mishra
e87ebcaf04 fix: upadated employee dashboard 2019-06-14 14:10:48 +05:30
Anurag Mishra
0ae6cbdd01 fix: requested Changes 2019-06-14 14:10:48 +05:30
Anurag Mishra
e6dd55d9f2 feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
Saurabh
0d50523723
Merge pull request #17941 from nabinhait/salary-slip-amount-dev 
fix: salary slip amount calculation based on formula
 2019-06-14 11:19:31 +05:30
Mangesh-Khairnar
6726dea88b style: change formatting 2019-06-14 11:17:17 +05:30
Mangesh-Khairnar
4e1b60d401 style: change formatting 2019-06-14 11:15:54 +05:30
Nabin Hait
a2caf884fe fix: salary slip amount calculation based on formula 2019-06-13 19:44:21 +05:30
Mangesh-Khairnar
f8bf57c956 fix: remove transaction section head 2019-06-13 18:09:23 +05:30
Mangesh-Khairnar
0a3ed374cd test: validate tax based expense claim gl entries 2019-06-12 20:03:22 +05:30
Mangesh-Khairnar
a1d354e147 feat: add grand total field 2019-06-12 18:18:38 +05:30
Suraj Shetty
a7ac218584
Merge branch 'develop' into call-summary-dialog 2019-06-12 13:28:41 +05:30
Mangesh-Khairnar
444313bdfc feat: change the claim amount in expenses to amount 2019-06-12 12:52:02 +05:30
Kenneth Sequeira
add002bb0f fix: Make Travel Request Document Submittable (#17874) 
* make travel request submittable

* add patch

* remove patch
 2019-06-12 12:25:48 +05:30
Mangesh-Khairnar
283d2c5ca2 fix: only create leave application ledger on intermediate allocation expiry 2019-06-11 16:35:29 +05:30
Mangesh-Khairnar
ac9a4fe03c feat: add tax and charges in expense claim 2019-06-11 14:25:44 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
rohitwaghchaure
74d45f40a8
Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop 
fix: Not able to save salary slip
 2019-06-07 12:58:25 +05:30
Rohit Waghchaure
72264697be fix: Not able to save salary slip 2019-06-07 11:46:27 +05:30
Mangesh-Khairnar
e4d03bf0d0 fix: consider expiry in leaves 2019-06-07 11:30:27 +05:30
Mangesh-Khairnar
368a974368 style: change formatting 2019-06-06 20:43:32 +05:30
Mangesh-Khairnar
86e0f4c617 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-06 20:41:28 +05:30
Mangesh-Khairnar
c7b9ae9c5e fix: get leave balance based on the ledger entries 2019-06-06 20:38:59 +05:30
Mangesh-Khairnar
b840ba4407 feat: show dashboard on submit 2019-06-06 20:38:23 +05:30
Mangesh-Khairnar
00c607116b fix: handle negative leaves without allocation 2019-06-06 20:37:34 +05:30
Mangesh-Khairnar
f13243a92e feat: fetch annual allocation based on leave policy 2019-06-06 20:35:10 +05:30
Mangesh-Khairnar
3863fc5fb2 feat: create ledger entry for each earned leave 2019-06-06 20:34:10 +05:30
Mangesh-Khairnar
050f65beb4 feat: fetch leave allocation from ledger entry 2019-06-06 20:32:01 +05:30
Suraj Shetty
c0a640c462 feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
Mangesh-Khairnar
351f4d53a0 feat: add employee filter to employee leave balance 2019-06-05 21:22:07 +05:30
Mangesh-Khairnar
62011c9dc4 feat: add link to policy 2019-06-05 21:16:27 +05:30
Mangesh-Khairnar
2bd211cc05 fix(attendance): fetch employee name (#17857) 2019-06-05 20:24:15 +05:30
Nabin Hait
3f97fac8e1
feat: Salary rounding based on settings on salary component (#17852) 2019-06-05 13:20:08 +05:30
Himanshu
4cb1a1e2e3 fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
Mangesh-Khairnar
afa1dc4ffa feat: expire current allocation 2019-06-03 20:09:22 +05:30
deepeshgarg007
55b894bfef Merge branch develop into dimensions 2019-06-01 23:13:36 +05:30
abhijitkumbharIND
39d6cf38fc fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
abhijitkumbharIND
302bce355f fix: Vehicle Master - Last carbon check accepting future date.(#17821) 2019-05-31 14:19:04 +05:30
Mangesh-Khairnar
c5385e141b fix: add mandatory reason fields in leave application 2019-05-31 00:53:28 +05:30
Mangesh-Khairnar
95e5d812fe fix: UX changes 2019-05-30 22:22:15 +05:30
Mangesh-Khairnar
91e62f575e fix: department filters in employee leave balance 2019-05-30 13:38:35 +05:30
Mangesh-Khairnar
2124d9884b fix: pass positional arguments on creation of leave application 2019-05-30 13:21:34 +05:30
Mangesh-Khairnar
aafb5cb6f6 fix: ignore expired non-carry forwarded allocation on calculating leaves taken 2019-05-30 13:13:14 +05:30
Mangesh-Khairnar
ded33a7e2e fix: ledger entries creation 2019-05-29 19:12:19 +05:30
Mangesh-Khairnar
7cc6a67c18 add department filter to employee leave balance 2019-05-29 15:59:20 +05:30
deepeshgarg007
acc2422167 Merge branch develop into dimensions 2019-05-28 12:18:32 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev 
fix: Tax calculation on salary slip
 2019-05-28 11:16:31 +05:30
Mangesh-Khairnar
c6d6adcbf3 fix: ledger entry creation for encashment 2019-05-28 09:44:38 +05:30
Mangesh-Khairnar
61bb236cfa test: delete ledger entry after each test to maintain balance 2019-05-27 19:36:40 +05:30
Nabin Hait
7f375d209c fix: Tax calculation on salary slip 2019-05-27 18:42:53 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress 
fix(UX): Upload Attendance
 2019-05-27 17:17:03 +05:30
Mangesh-Khairnar
35786c0067 Merge branch 'leave-management' of https://github.com/Mangesh-Khairnar/erpnext into leave-management 2019-05-27 15:42:11 +05:30
Mangesh-Khairnar
6f69bbe1d7 test: leave ledger balance 2019-05-27 15:40:36 +05:30
Mangesh-Khairnar
7fbaef5de3 fix: expiry ledger creation 2019-05-27 15:39:48 +05:30
Nabin Hait
c9a4111f4d
Merge branch 'develop' into leave-management 2019-05-27 13:59:27 +05:30
Mitchy25
a8f6938556 Fix: Precision in Appraisals (#17673) 
* Update appraisal.js

This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.

* fix: score based on field's precisin
 2019-05-27 13:57:56 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress 2019-05-27 13:47:36 +05:30
Anurag Mishra
9d9440277c fix: holidays was showing on same date in calendar view (#17754) 2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress 2019-05-27 11:59:16 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim (#17729) 
* fix: payment reconciliation against expense claim

* feat: Added dashboard for expense claim
 2019-05-27 11:44:06 +05:30
Mangesh-Khairnar
705b7dc9c2 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-05-27 11:21:06 +05:30
Mangesh-Khairnar
71cdcb3593 style: add a more descriptive method name 2019-05-27 11:00:04 +05:30
Mangesh-Khairnar
45197965d7 fix: give cancellation permission to hr manager 2019-05-27 03:26:48 +05:30
Mangesh-Khairnar
d751281fa7 fix: application and leave encashment test cases 2019-05-27 03:23:58 +05:30
Mangesh-Khairnar
e7d307e6bf fix: only expire carry forwarded allocation via scheduler 2019-05-27 03:21:32 +05:30
Mangesh-Khairnar
2417c93d0e feat: create expiry and carry forward calculation on leave allocation creation 2019-05-27 03:20:10 +05:30
Mangesh-Khairnar
c99f644ffe test: carry forward and expiry allocation 2019-05-27 03:13:47 +05:30
Mangesh-Khairnar
7a7f4bd822 fix: leave balance calculation 2019-05-27 03:12:57 +05:30
Mangesh-Khairnar
9e3b688333 test: create leave policy 2019-05-27 03:10:39 +05:30
deepeshgarg007
6f6636abfe fix: Add dimension section in multiple doctypes 2019-05-26 12:31:01 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress 2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js 
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
 2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61 fix(minor): after manual testing 2019-05-24 11:22:31 +05:30
Mangesh-Khairnar
45cf02308e fix: prevent manual creation of ledger entries 2019-05-23 20:29:18 +05:30
Mangesh-Khairnar
8ef81870bb test: create leave ledger entry for encashment 2019-05-23 20:28:16 +05:30
Faris Ansari
8f784c8555
fix: Remove console statement 2019-05-23 14:39:38 +05:30
Mangesh-Khairnar
5ba17c87e5 feat: remove update allocation after submit 2019-05-22 18:29:22 +05:30
Rushabh Mehta
04e89ce808 refactor: deprecate old API 2019-05-22 16:52:36 +05:30
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress 2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225 fix(UX): Upload Attendance 
Enqueue import if rows more than 200. Show import progress in dashboard.
 2019-05-21 17:58:55 +05:30
Rushabh Mehta
98a80407f8
Merge pull request #17538 from adityahase/fix-training-feedback 
fix(hr): Use event_status instead of status
 2019-05-21 12:19:03 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev 
fix: Multiple small fixes
 2019-05-16 15:21:15 +05:30
Nabin Hait
b90fc7fc0d fix: Get bank account on selection of payment mode in Loan 2019-05-16 13:45:54 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation (#17617) 
* refactor: Payroll processing and tax calculation

* fix: payroll test cases

* fix: Codacy fixes

* fix: payroll test cases

* fix: removed unwanted code
 2019-05-16 11:23:04 +05:30
Himanshu
0e31089af6 validate: if additional salary exists (#17529) 2019-05-16 10:35:02 +05:30
Mangesh-Khairnar
afb0c4aa43 fix: delete entry on cancellation of transaction 2019-05-15 21:50:34 +05:30
Mangesh-Khairnar
f8f02c508d feat: create leave ledger entry on leave encashment creation 2019-05-15 21:50:06 +05:30
Mangesh-Khairnar
50037f8609 fix: consider min days remaining as remaining leaves 2019-05-15 21:49:27 +05:30
Mangesh-Khairnar
6ba9a128e7 feat: calculate leave balance using ledger entries 2019-05-15 15:53:54 +05:30
Mangesh-Khairnar
964deaca96 test: creation of ledger entries on application submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
201aeeb20d test: creation of ledger entries on allocation submit 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
170b8dded8 fix: expiry logic for carry forwarded allocation 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
9bb4b8e8b2 feat: create expiry ledger entry on allocation period completion 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
cf8f4bda8f fix: skip application fetch for non allocation records 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
783bd89413 feat: handle cancellation workflow for leave application 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5448edff2c feat: delete cancelled allocation from ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
01490f1560 feat: add cancellation workflow for leave allocation ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5ad83c06c2 feat: add ledger entries on leave addition 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
679371e397 feat: get carry forwarded leaves via ledger entries 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
2b421c39b5 feat: add transaction details in ledger 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
1de990b2ac feat: create leave ledger entry 2019-05-15 15:53:53 +05:30
Mangesh-Khairnar
5e2b067107 feat: display carry forwarded allocation days and total leaves allocated 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0abf5d340c fix: carry forwarded allocation period validation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d01863707c test: pass leave type as params 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
70cf4a6796 feat: validate leave allocation period to be within expiry limits 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
99c9cfaaed feat: generate leave allocation for carry forwarded leaves 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
4badca54af feat: validate leave expiry days 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
0c0bfb1ef0 feat: calculate carry forward leaves allocation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
d6c5b6320f feat: add a field for conditionally displaying carry forwarded leave 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
e46d3a87ea feat: set carry forwarded leave allocation 2019-05-15 15:53:52 +05:30
Mangesh-Khairnar
c28d2e4b2a test: create leave allocation check 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
bd3b3ea12c test: create leave type 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
7c6b6eae5b feat: set leave allocation on carry forward check 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
1208ca6a36 feat: add old leaves to track carry forward leave allocation 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
c182a5687e feat: add validation for carry forward leave expiry 2019-05-15 15:53:51 +05:30
Mangesh-Khairnar
fd53c64d5d feat: create carried forward leave expiry option 2019-05-15 15:53:51 +05:30
Karthikeyan S
c3779851e4 fix(HR Settings): Unable to save HR Settings (#17608) 2019-05-15 11:38:20 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions (#17013) 
* feat: Bank remittance report for tracking payroll-entry transactions

* feat: show Company bank account and bank name

* feat: Added Permissions to view report

* feat: Validated report only if debit account is present

* fix: query optimisation

* feat: Added From date and To date filters

* fix: code optimisation

* fix: requested changes

* fix: requested changes and refactor

* style: indentation

* style: Formatting

* fix: added parameter filters
 2019-05-13 19:03:21 +05:30
Mangesh-Khairnar
b4e8128fdb feat: validate training event period 2019-05-11 23:26:47 +05:30
Aditya Hase
5f1632cf1f fix(hr): Use event_status instead of status 
Training Feedback DocType has event_status field (not status)
This was broken since PR #10379, PR #17197 made this failure explicit.
 2019-05-09 19:00:05 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips (#17380) 
* feat: Added check for encrypting salary slips and password policy field

* feat: make password policy mandatory if encrypt option is selected

* feat: added password logic to email_salary_slip

* fix: import error

* chore: Minor enhancement to validations in salary slip

* fix: travis patch

* feat: Modified email body for password protected salary slips
 2019-05-08 17:30:08 +05:30
Nabin Hait
5762a5d8b6 fix: Null handling 2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86 fix: a few fixes in payroll 2019-05-01 12:17:47 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report 
feat: Loan repayment report
 2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json 2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
513e3f97e5 fix(salary-register): track doj for non active employee 2019-04-29 12:17:49 +05:30
Nabin Hait
ec7a18737b fix: test cases 2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d fix: test cases 2019-04-25 21:42:26 +05:30
Nabin Hait
49446ba760 fix: test cases 2019-04-25 19:54:49 +05:30
Nabin Hait
04e7bf464f refactor: Employee Tax Exemption 2019-04-25 18:53:39 +05:30
Nabin Hait
0908907ae1
Merge branch 'develop' into aahi_loan_report 2019-04-24 09:37:52 +05:30
Nabin Hait
08da372ae5
Merge branch 'develop' into income-tax-period-factor-dev 2019-04-24 09:19:21 +05:30
Nabin Hait
8d3644d826
Merge pull request #17351 from nabinhait/rounded-salary-tax 
fix: Rounded tax amount in salary slip
 2019-04-24 09:19:00 +05:30
Deepesh Garg
12af1c3837
Merge branch 'develop' into employee-skill-map 2019-04-24 00:03:04 +05:30
Nabin Hait
6592a6bcd4
Merge branch 'develop' into income-tax-period-factor-dev 2019-04-23 18:38:54 +05:30
Nabin Hait
24b4a8722e fix: Rounded tax amount in salary slip 2019-04-23 15:54:32 +05:30
Suraj Shetty
df59c1573d feat: Add training date field 2019-04-22 23:35:36 +05:30
Nabin Hait
7f4e7b63d7 fix: Income tax period factor considering joining and relieving date 2019-04-22 17:39:36 +05:30
Nabin Hait
d3cd98c45e fix: Renamed depends_on_lwp to depends_on_payment_days 2019-04-22 13:45:45 +05:30
Suraj Shetty
2a9b17efd4 Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map 2019-04-21 23:53:54 +05:30
Suraj Shetty
98390dae49 fix: Do not create employee user permission if already exists 2019-04-19 21:52:08 +05:30
Suraj Shetty
3aa5e125bd feat: Add employee training section to the employee skill map 2019-04-18 12:46:33 +05:30
Faris Ansari
1cf9fa9662 fix: Refactor Upload Attendance (#17241) 
New API frappe.ui.FileUploader
https://github.com/frappe/frappe/pull/7253
 2019-04-17 09:45:46 +05:30
Nabin Hait
d2044c0f23
Merge pull request #17184 from frappe/akurungadam-patch-1 
fix: misleading condition example in field options
 2019-04-16 12:44:17 +05:30
Suraj Shetty
006c3dccf9 feat: Add logic to auto fetch skill from designation doc 
- Set today as default evaluation date
 2019-04-16 12:14:44 +05:30
Suraj Shetty
354c70a0e7 feat: Init employee skill map doctype 2019-04-16 10:20:32 +05:30
Suraj Shetty
a0f7656ffc feat: Add skill child table to designation doctype 
- To record skills required of a particular designation
 2019-04-16 10:19:53 +05:30
Nabin Hait
6ecc83aaf0
Merge pull request #17182 from hrwX/revert_salary_slip 
Revert(Salary Slip): Wrong Formula
 2019-04-15 10:08:53 +05:30
Suraj Shetty
c90364f94d feat: Add task weight for employee onboarding activity (#17216) 
This activity weight will be used to update the task weight
 2019-04-12 14:12:03 +05:30
Nabin Hait
851acc30b3
Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue 
fix: Fixed Sanctioned Amount Update Issue in Expense Claim
 2019-04-12 11:06:02 +05:30
Basawaraj Savalagi
9ce8c3061f Fixed Sanctioned Amount Update Issue in Expense Claim 2019-04-11 16:30:11 +05:30
Nabin Hait
89206e74d0 fixed merge conflict 2019-04-11 12:31:14 +05:30
Nabin Hait
c8c678f747 fix: training feedback code cleanup 2019-04-10 15:56:16 +05:30
Anoop
cb278975f3
fix: misleading condition example in field options 
condition example corrected -

gender=\"Male\"
to 
gender==\"Male\"
 2019-04-09 18:10:41 +05:30
Himanshu Warekar
5632dbdd18 revert: wrong formula 2019-04-09 16:53:54 +05:30
Mangesh-Khairnar
e7d53540de feat: add doj column in salary register 2019-04-05 12:56:11 +05:30
Nabin Hait
4873875c1c
Merge pull request #17038 from netchampfaris/fix-leave-application-condition 
fix: Missing "and" in filter conditions
 2019-04-01 11:15:36 +05:30
Anurag Mishra
5402451b35 feat: Loan repayment report 
Co-authored-by: crescent28 <mitali@erpnext.com>
 2019-04-01 10:57:36 +05:30
Rohit Waghchaure
70b996af73 fix: test cases 2019-03-31 20:34:52 +05:30
Himanshu
6343a697a2 fix(Salary Slip): Consider Leave without Pay for calculation (#16926) 
while net salary calculation, it was not considering actual days worked but now it will consider it
 2019-03-29 18:48:56 +05:30
Himanshu
6b54649bfe fix(Salary Slip): Consider Leave without Pay for calculation (#17023) 
Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
 2019-03-29 18:32:23 +05:30
Faris Ansari
f04988a02f fix: Missing "and" in filter conditions 2019-03-28 15:42:07 +05:30
Saurabh
84a18f5b18 Merge branch 'master' into develop 2019-03-28 13:54:34 +05:30
Himanshu
e43b6beff0 fix(Leave Balance Report): total allocated leaves not calculated properly (#16969) 
* fix: total alloted leaves not calculated properly

* fix: Possible SQL injection

* typo fix in sql query

* prevent sql injection again ?

* Use ORM for query
 2019-03-26 21:42:12 +05:30
Rushabh Mehta
b0a7cbb591
Merge pull request #16905 from frappe/netchampfaris-patch-1 
fix: Update Training Level
 2019-03-22 12:43:00 +05:30
Rushabh Mehta
fc4eefcb22
Merge pull request #16871 from rmehta/attendance-from-leave 
feat: Pre mark attendance for Leave Application
 2019-03-22 12:41:47 +05:30
Saurabh
3c95387926 Merge branch 'master' into develop 2019-03-20 14:39:49 +05:30
Mangesh-Khairnar
7fc1bc0b27 fix: handle an empty match query condition in leave application (#16931) 2019-03-19 18:14:02 +05:30
Himanshu
f3e5213190 feat(Support): Service Level Agreements (#16828) 
* init SLA

* Added more inputs to the forms

* set priority of issue

* Removed UOM in favor of hours for tracking

* updated js to autofill values

* Removed unwanted fields

* timer functionality

* code refactor

* parenthesis fix

* fixed typo

* added new fields

* Updated fields

* Updated fields for issue doctype

* Updated fields for issue doctype

* changed doctype structure

* added new fields to issue

* code refactor

* new function to set criticality level

* changed dropdown options

* set timer for sla

* calculation of resolution and response time

* stopwatch counter

* dashboard changes

* renamed sla to support contract

* countdown timer section

* issue doctype changes

* removed unwanted imports

* fixed wrong response time and resolution time

* update response and resolution time

* calculate time to respond and resolve

* feature enhancements

* probable scheduling bug fix

* fixed scheduling issue support sent out of support time

* removed issue criticality link from support

* Changed day order

* skip date validation when support contract is default

* removed mandatory field

* fix scheduling conditions for now

* code refactor

* removed duplicate doctypes

* fixed day inserted twice in service level

* check to not add another default contract

* default support contracts

* removed commented code

* removed unused imports

* fix sla for non-listed days

* reduced redundant code and optimized it and starting unit tests

* added condition check to compute days correctly

* renamed doc as per guidelines and added conditions for scheduling

* removed per day support timings

* added response and resolution time to support contract

* scheduling based on hours kinda fix

* set sla before_update and finally fixed time scheduling out of support time

* DocType Issue removed test_records and rewrote test cases

* test cases and codacy fixes

* Doctype SLA instead of Support Contract to avoid confusion with Contract

* fixed tests failing due to change in options for time period

* change naming to Prompt

* remove unknown doctype from help_desk

* revert unwanted changes to default

* refactor get_list for fetching service_level_agreement

* change datatypes

* fix tests

* refactored tests

* remove unused imports

* code and comments refactor for better understandability

* removed and renamed doctype to service days and minor fixes

* Refactor test cases for response and resolution time for issue

* add validation to check if response time < resolution time

* minor fix for checking if current day is start day

* calculate time in js rather than python

* fix: parenthesis fixing customer dashboard

* json changes to rename sections

* refactor: alignment

* refactor: beautify code

* fix: use frm api to get the element

* fix: replace '__' with '_'

* refactor: remove pointless test
 2019-03-19 16:47:56 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
Rohit Waghchaure
d4e4316d0b fix: test cases and codacy 2019-03-18 14:18:49 +05:30
Mangesh-Khairnar
b343407236 refactor: change validate email add to validate email address 2019-03-16 13:40:58 +05:30
Rushabh Mehta
b7abdf1222
Merge pull request #16851 from JoyceBabu/develop 
fix: Add 'Half-Yearly' option to Earned Leave Frequency
 2019-03-15 09:02:43 +05:30
Faris Ansari
47f1080f1e
fix: Update modified 2019-03-12 10:57:35 +05:30
Faris Ansari
175709ed50
fix: Update Training Level 
- Rename Expert to Intermediate, since it was ambiguous with Advance
 2019-03-12 10:55:39 +05:30
Faris Ansari
2221151132
fix: Update Training Level 2019-03-12 10:55:11 +05:30
Rushabh Mehta
96842c9de6 fix(typo): leave_application.py 2019-03-08 12:36:43 +05:30
Rushabh Mehta
701c0b792c feat: Pre mark attendance for Leave Application 2019-03-08 12:30:42 +05:30
deepeshgarg007
78a32ae172 fix: Remove validation for relieving date from additional salary 2019-03-07 20:00:07 +05:30
Joyce Babu
3d0121369f Add 'Half-Yearly' option to Earned Leave Frequency 
in addition to the current values of Monthly, Quarterly and Yearly
 2019-03-06 13:04:45 +05:30
Himanshu Warekar
219b9f4150 Salary Component can be equal to zero 2019-03-05 17:44:07 +05:30
Himanshu Warekar
acb7238ad6 Allow zero amount in additional salary 2019-03-05 12:20:19 +05:30
Rushabh Mehta
fcd0556119
Merge pull request #16709 from rmehta/project-template 
feat: Project Template
 2019-02-27 09:22:12 +05:30
Sagar Vora
e0eafb1c2c Merge branch 'master' into develop 2019-02-26 17:08:59 +05:30
Rushabh Mehta
b94c8b1c77 fix(tests): add test for bulk complete / cancellation of project 2019-02-26 14:30:38 +05:30
Rushabh Mehta
e2de8e0fa5 fix: expense claim type (#16760) 2019-02-25 11:56:30 +05:30
Saurabh
3dd7ddd838 Merge branch 'master' into develop 2019-02-21 18:25:29 +05:30
Nabin Hait
40c15d2e74 fix: Calendar events for leaves considering user permissions 2019-02-20 18:55:38 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
deepeshgarg007
de0f59b818 fix: Removed precision from multiple doctypes 2019-02-19 08:40:16 +05:30
Tropicalrambler
3a88bc43dc fix: typo in salary register report field name (#16670) 
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled.  The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
 2019-02-15 13:40:44 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes 
Multiple fixes
 2019-02-12 13:56:06 +05:30
Zlash65
fd3998cfc9 fix: make branch as link field 2019-02-12 11:27:23 +05:30
Nabin Hait
e3b0f4f9f6 fix: removed account type filter on employee advance account 2019-02-08 16:56:26 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Nabin Hait
38b05a1296 fix: Set default cost center in payroll entry 2019-02-05 10:46:41 +05:30
Nabin Hait
294319e71b fix: Don't force fetch cost center from company in payroll entry 2019-02-05 10:37:41 +05:30
Nabin Hait
ff05ee50e0 fix: Allow-on-submit enabled for formula and condition in salary structure 2019-02-04 14:42:57 +05:30
Sagar Vora
56cbfe4bb0 Merge branch 'master' into develop 2019-01-31 13:34:32 +05:30
Sagar Vora
7ea2497b9a
Fix salary patch (#16531) 
fix: salary structure assignment patch, add .vscode to gitignore
 2019-01-31 09:17:29 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
51a27b3524 fix: unsaved merge conflict 2019-01-29 17:52:47 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Navdeep Ghai
ec570026e1
Merge branch 'hotfix' into salary-slip-net-pay-fixes 2019-01-29 09:12:37 +04:00
Nabin Hait
385e3bb284
Merge pull request #16446 from Zlash65/jv-fix 
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
 2019-01-29 10:41:15 +05:30
navdeepghai1
92bb84aa70
Changed static precision(2) value to system setting currency_precision value 2019-01-28 16:54:58 +04:00
navdeepghai1
aac404a155
Fixed net_pay calculation issue 2019-01-28 10:42:16 +04:00
Nabin Hait
06607fda4e
fix: removed print statement 2019-01-23 12:15:48 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Zlash65
c8d632ddff fix: add set query for payroll entry in JV 2019-01-22 12:46:13 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Rohit Waghchaure
425dff93d7 fix: Project update status code and design refactored 2019-01-17 19:21:44 +05:30
Nabin Hait
c13b0562ba
Merge pull request #16337 from Anurag810/Employee 
fix: Employee Onboarding/Seperation task Assignment
 2019-01-08 20:27:43 +05:30
scmmishra
e2762df90b Fix: Naming series not reflecting in leave application 2019-01-08 17:38:28 +05:30
Saurabh
afec3ca89a Merge branch 'staging' into develop 2019-01-08 17:09:36 +05:30
Sagar Vora
26e5c9480b
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd 2019-01-07 14:30:23 +05:30
Sagar Vora
3c74266763
fix: PEP8 recommended whitspace 2019-01-07 13:13:16 +05:30
Sagar Vora
23a1b98957
fix: remove unnecessary code 2019-01-07 13:10:18 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Sahil Khan
3ac57c756b fix: remove print statement from test case 2019-01-04 12:57:34 +05:30
Anurag Mishra
bb6a7eb9d3 refractor 2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3 Fix: Employee Onboarding/Seperation task Assignment 2019-01-04 11:36:30 +05:30
Rohit Waghchaure
8bac5b6e73 [minor] Employee is reqd to preview salary slip from salary structure 2019-01-03 16:20:35 +05:30
Sagar Vora
c14c7c84e3 fix: leave application and timesheet tests 2019-01-02 21:28:11 +05:30
Rohit Waghchaure
c186f153ff Added test cases 2019-01-01 15:03:56 +05:30
sahil28297
50f0a99330 fix: Checks for status in employee and for date range in upload attendance. (#16279) 
* fix: checks for status in employee and for date range in upload attendance.

1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.

* remove "import erpnext"

* fix: replace frappe.db.sql with frappe.db.get_all

* fix: refactored using list comprehension

* fix: query refactoring

* fix: combining list comprehensions

* travis debugging

* fix: doc.save
 2018-12-28 17:15:56 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes 
Fix user permission checks
 2018-12-26 14:49:01 +05:30
rohitwaghchaure
deb96dab3e [Fix] Salary structure not saving (#16275) 2018-12-25 13:58:20 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Navdeep Ghai
c4d38c0afc Fix the disappears of image bug after uploading and saving the employee (#16217) 
* Fix image disappears of image after uploading and saving the employee

* Fix the codacy issue
 2018-12-24 14:53:19 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
shreyashah115@gmail.com
0543f03b58 fix: Remove date_of_joining from field list 2018-12-17 15:02:30 +05:30
Zlash65
c8337c6d83 fix check for leave on holiday for half day 2018-12-15 21:15:45 +05:30
Saurabh
e165fc0e1b Merge branch 'staging' into develop 2018-12-13 10:45:32 +05:30
Rushabh Mehta
eeab3ee5d3
fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) 
* debug(test): test_payroll_entry

* debug(test): test_payroll_entry

* debug(test): use frappe.db.rollback to undelete fixture data
 2018-12-11 22:37:29 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
dde952d591
Merge pull request #16092 from deepeshgarg007/salary_slip 
Salary slip earnings and deductions table bug fix
 2018-11-27 11:39:10 +05:30
Nabin Hait
9a06543453
Merge branch 'staging-fixes' into indicators-in-leave-applications 2018-11-27 11:38:29 +05:30