Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50f0a99330
brotherton-erpnext/erpnext/hr/doctype
History
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
..
additional_salary Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
appraisal Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
appraisal_goal [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
appraisal_template [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
appraisal_template_goal [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
attendance perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
attendance_request Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
branch [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
compensatory_leave_request Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
daily_work_summary Compatibility with Py2 (#15653) 2018-10-11 16:48:38 +05:30
daily_work_summary_group Send daily work summary alert to only enabled users (#14175) 2018-05-23 10:32:55 +05:30
daily_work_summary_group_user [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
department perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
department_approver [Fix] Should not get approvers for disabled Departments (#14868) 2018-07-13 12:26:56 +05:30
designation [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
driver Fix 'transporter info' section in Delivery Note (#15565) 2018-10-10 14:51:26 +05:30
driving_license_category [New Feature] Delivery 2017-11-20 10:28:49 +08:00
employee fix: Checks for status in employee and for date range in upload attendance. (#16279) 2018-12-28 17:15:56 +05:30
employee_advance Merge branch 'master' into staging-fixes 2018-11-15 09:12:04 +00:00
employee_attendance_tool [Attendance-Tool] Filter employees based on date of joining (#15262) 2018-08-30 17:25:58 +05:30
employee_benefit_application Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_benefit_application_detail Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_benefit_claim fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) 2018-12-11 22:37:29 +05:30
employee_boarding_activity [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_education [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_external_work_history [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_grade [cleanup] bunch of UX fixes (#14787) 2018-07-05 15:19:28 +05:30
employee_health_insurance Renamed Health Insurance to Employee Health Insurance 2018-04-26 12:16:17 +05:30
employee_incentive Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_internal_work_history [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
employee_loan [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
employee_loan_application [Resolved] merge conflicts 2018-08-10 17:11:30 +05:30
employee_onboarding fix(assessment_result): student must be in group (#15255) 2018-08-31 16:12:49 +05:30
employee_onboarding_activity [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
employee_onboarding_template Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_promotion Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_property_history minor fixes 2018-05-07 16:11:35 +05:30
employee_separation fix: Remove date_of_joining from field list 2018-12-17 15:02:30 +05:30
employee_separation_template Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_tax_exemption_category HRA fix (#14589) 2018-06-20 11:10:56 +05:30
employee_tax_exemption_declaration Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_tax_exemption_declaration_category Tax Exemption Declaration - HRA Calculation 2018-05-30 13:37:15 +05:30
employee_tax_exemption_proof_submission Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_tax_exemption_proof_submission_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
employee_tax_exemption_sub_category Doctype Employee Tax Exemption Sub Category 2018-05-10 15:02:57 +05:30
employee_transfer Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_transfer_property New DocTypes for HR Module (#13650) 2018-04-26 12:10:13 +05:30
employment_type perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
expense_claim Fixed merge conflict 2018-10-15 15:43:21 +05:30
expense_claim_account [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
expense_claim_advance Employee advance (#11875) 2017-12-14 13:25:57 +05:30
expense_claim_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
expense_claim_type Various permission fixes (#15448) 2018-09-20 13:20:17 +05:30
holiday [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
holiday_list [Fix] New holiday list form is not working 2018-11-22 12:57:34 +05:30
hr_settings Fixed merge conflict 2018-05-05 12:19:14 +05:30
identification_document_type [rename] Photo ID -> Identification Document 2018-05-16 14:12:22 +05:30
interest [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
job_applicant Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
job_applicant_source Job Applicant Source (#14543) 2018-06-21 10:47:54 +05:30
job_offer fix(test): Fixed salary slip and sales analytics test cases 2018-11-26 11:05:28 +05:30
job_offer_term Rename Offer Letter to Job Offer (#12934) 2018-02-16 10:49:34 +05:30
job_opening optimize(various) 2018-08-08 16:37:31 +05:30
leave_allocation fix(assessment_result): student must be in group (#15255) 2018-08-31 16:12:49 +05:30
leave_application Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
leave_block_list [cleanup] bunch of UX fixes (#14787) 2018-07-05 15:19:28 +05:30
leave_block_list_allow [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
leave_block_list_date [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
leave_control_panel set query for department based on company 2018-05-14 16:07:28 +05:30
leave_encashment Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
leave_period fix(assessment_result): student must be in group (#15255) 2018-08-31 16:12:49 +05:30
leave_policy ux(hr): module listing and quick entry for employee 2018-08-30 09:21:54 +05:30
leave_policy_detail Removed employee table from Salary Structure and added employee name in all forms 2018-04-26 12:14:01 +05:30
leave_type [cleanup] bunch of UX fixes (#14787) 2018-07-05 15:19:28 +05:30
loan Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
loan_application Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
loan_type Minor fix for ui tests 2017-09-15 19:35:12 +05:30
offer_term [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
payroll_employee_detail [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
payroll_entry Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
payroll_period fix - Benefit Application query (#14767) 2018-07-01 16:44:37 +05:30
payroll_period_date New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
purpose_of_travel [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
repayment_schedule Loan Management for the Members (Non Profit Module) (#13149) 2018-04-24 12:19:36 +05:30
retention_bonus Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
salary_component Payroll fixes and more (#15475) 2018-09-26 18:01:00 +05:30
salary_detail Payroll fixes and more (#15475) 2018-09-26 18:01:00 +05:30
salary_slip fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) 2018-12-11 22:37:29 +05:30
salary_slip_loan Loan Management for the Members (Non Profit Module) (#13149) 2018-04-24 12:19:36 +05:30
salary_slip_timesheet [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
salary_structure [Fix] Salary structure not saving (#16275) 2018-12-25 13:58:20 +05:30
salary_structure_assignment Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
shift_assignment Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
shift_request Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
shift_type [Tests] Shift Planning (#14570) 2018-06-19 10:45:33 +05:30
staffing_plan optimize(various) 2018-08-08 16:37:31 +05:30
staffing_plan_detail Staffing Plan (#14346) 2018-06-05 11:40:58 +05:30
taxable_salary_slab Update tax calculation (#14564) 2018-06-20 12:33:02 +05:30
training_event [Fix] Filter on child table not working in Calendar (#11824) 2017-12-04 11:22:25 +05:30
training_event_employee [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
training_feedback Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
training_program [minor] Set Rename for Training Program (#11740) 2017-11-28 11:26:23 +05:30
training_result Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
training_result_employee [Enhance] Department added wherever applicable (#14121) 2018-05-23 11:11:36 +05:30
travel_itinerary [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
travel_request Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
travel_request_costing [feature] added travel request doctype in HR 2018-05-16 11:02:28 +05:30
upload_attendance fix: Checks for status in employee and for date range in upload attendance. (#16279) 2018-12-28 17:15:56 +05:30
vehicle [fix] Asset test cases and added make_sales_invoice (#11800) 2017-11-30 15:59:40 +05:30
vehicle_log Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
vehicle_service [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
__init__.py moved modules inside erpnext folder 2013-12-11 10:43:52 +05:30