Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,975 Commits 3 Branches 0 Tags 1 GiB
759632c025
Commit Graph

1871 Commits

Author SHA1 Message Date
Anurag Mishra
759632c025 fix: requested Changes 2020-08-14 12:26:04 +05:30
Anurag Mishra
95984fd921 fix: Not able to cancel application,allocation nad encashments 2020-08-10 12:36:00 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
e0ff0cfcb9
fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570) 
* fix:fetch "Employee Leave Policy" from "Employee Grade" if available

* fix: checked "Fetch IF Empty" checkbox

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:40:22 +05:30
Marica
3f05a2692e
Merge branch 'develop' into employee_tree 2020-07-08 14:04:49 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
rohitwaghchaure
be9f8dc5db
Merge pull request #22522 from Anurag810/leave_application_fixes 
fix: set half day date None if half day is unchecked
 2020-07-08 12:40:30 +05:30
rohitwaghchaure
1fce8b7475
Update leave_application.js 2020-07-08 12:40:01 +05:30
Afshan
70b3edd502 fix: format according to cordacy 2020-07-07 00:03:45 +05:30
Afshan
3819c0bf28 fix: cost center should only show option of selectedcompany 2020-07-06 23:52:11 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Deepesh Garg
d7adacd3e2 feat: Added all companies option in employee tree to view employee accress all companies 2020-07-03 18:39:51 +05:30
Michelle Alva
ec84afa86d
fix: Refactor dashboard links in leave policy (#22519) 
* fix: refactor dashboard links in leave policy

* fx: code fix

* fix: add labels to links

* fix: code change
 2020-06-30 18:04:20 +05:30
Anurag Mishra
8f2cb0beb6 fix: set half day date None if half day is unchecked 2020-06-30 12:11:03 +05:30
Anurag Mishra
343651fc39
fix: job offer validation fix (#22504) 2020-06-29 18:23:22 +05:30
Anurag Mishra
ba5f571b0d
fix: take parent cost center for child if no cost center at child (#22496) 2020-06-29 17:35:27 +05:30
rohitwaghchaure
81af2235f4
Merge branch 'develop' into dev-job-offer-list-view 2020-06-28 15:25:32 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs (#22432) 
* fix: Add view ledger button for cancelled docs

* fix: Add moddified to date in Stock Ledger
 2020-06-25 15:34:01 +05:30
Rohan Bansal
e7c91917aa fix: setup status indicators for Job Offer and Job Applicant 2020-06-25 13:40:18 +05:30
Anurag Mishra
36560c8406
fix: staffing Plan validation (#22379) 2020-06-23 10:44:33 +05:30
Deepesh Garg
62897d3878 fix: Unable to cancel employee advance 2020-06-22 14:54:01 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation (#22244) 
* feat: added Expense approver for employee nad validation

* fix: requested changes
 2020-06-18 19:13:01 +05:30
rohitwaghchaure
75366ebaec
Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix 
fix: added some standard filters in expense claim
 2020-06-15 15:36:37 +05:30
Anurag Mishra
45b6fed029 fix: added some standard filters in expense cliam 2020-06-15 12:44:55 +05:30
Anurag Mishra
a2cf79da0f fix: allow to enter Releaving date if status = Left 2020-06-15 12:28:31 +05:30
Anurag Mishra
7558e64d6d
fix: set_query in leave application (#22197) 2020-06-12 17:37:59 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount (#22123) 
* rename 'Due Advance Amount' field to 'Pending Amount'

* changed fieldname and references for easier debugging

* added patch for moving data

* added newline added

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-12 13:13:14 +05:30
Vignesh S
90957b7f74
feat(Attendance): Add In and Out time to attendance (#21547) 
* feat(Attendance): Add In and Out time to attendance

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>

* fix:add depends in attendance IN time and OUT time

Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
 2020-06-12 12:32:55 +05:30
Anurag Mishra
402c347f83 fix: set cost center in child table 2020-06-10 12:27:59 +05:30
rohitwaghchaure
c6d4c2afb6
Merge pull request #22113 from Anurag810/leave_application-fixes 
fix: Wrong filters
 2020-06-08 10:43:22 +05:30
Abhishek Balam
328a55749d
fix(HR): Fix half day error when only 1 day is selected (#22122) 
* fix half day error when only 1 day is selected

* adding validation fix for half day on serverside
 2020-06-05 16:46:57 +05:30
Anurag Mishra
94582a89c7 fix: Wrong filters 2020-06-04 17:50:47 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd Revert 'fix: tests depending on global default company' 2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Abhishek Balam
40694c98aa
fix(HR) : Filter Leave Type based on allocation for a particular employee (#22050) 
* table was showing empty with just headers when no leaves allocated, fixed template code

* added filters on Leave Type based on leave allocation for a particular employee and to/from dates
 2020-05-30 01:02:06 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Anurag Mishra
ef0026c06f fix: addtional salary date validation (#21952) 2020-05-27 12:28:11 +05:30
Anurag Mishra
56357fafeb
fix: Added column Expired Leave (#21857) 2020-05-26 18:08:22 +05:30
Anurag Mishra
8a1cf45473
fix: Validation for dates (#21886) 2020-05-25 18:39:19 +05:30
Anurag Mishra
c07265ea3f
fix: convert goals point to flt (#21844) 2020-05-21 18:47:39 +05:30
Marica
82f639da59
fix: Employee Advance Return not working (#21812) 2020-05-21 11:35:00 +05:30
Nabin Hait
9d04c06c62 fix: HR dashboard and onboarding 2020-05-20 12:05:03 +05:30
Anurag Mishra
57bfee8ea9 fix: dashboard changes 2020-05-18 13:27:15 +05:30
Nabin Hait
1862f5f29a
feat: Payroll based on employee cost center (#21609) 2020-05-18 07:37:04 +05:30
Anurag Mishra
779fc898b1
fix: Future date half day validation (#21718) 
* fix: Future date half day validation

* fix: Allow half day attendance only via leave application

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-17 20:18:30 +05:30
Deepesh Garg
5ee8327415
Merge pull request #21729 from nabinhait/basic-hra-comp 
fix: Submit perm for other income and removed caching while getting hra and basic from company
 2020-05-15 14:44:37 +05:30