Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2528d5ee15
brotherton-erpnext/erpnext/hr/doctype
History
Afshan ccf5dc66e2
feat: multi-currency payroll (#23519) 
* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* Update asset_value_adjustment.py

* patch: update columns

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* patch: update columns

* Update asset_value_adjustment.py

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: Added company field in leave encashment and employee benefit

* refactor: Refactored multi-currency payroll patch

* fix: currency column in salary register

* refactor: Refactored code for making bank and return entry against employee advance

* fix: minor cleanup

* fix: fixed translation

* fix: removed salary component type

* fix: fixed sider issues

* fix: translation and slider

* style: formatted msg

* fix: fixed slider

* fix: travis

* fix: refactor

* fix: slider

* fix: slider

* fix: slider

* fix: travis

* fix: patch

* fix: patch

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: re-run travis

* fix: rerun travis

* fix: rerun travis

* fix: rerun travis

* fix: travis rerun

* fix: increased throttle_user_limit from 60 to 100

* fix: patch

* fix: patch

* fix: assign payroll payable account as default payroll payable account in SSA

* fix: removed debugger

* fix: slider

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
..
appointment_letter fix: conflicts 2020-02-27 13:16:53 +05:30
appointment_letter_content fix: conflicts 2020-02-27 13:16:53 +05:30
appointment_letter_template fix: conflicts 2020-02-27 13:16:53 +05:30
appraisal fix(HR): Appraisal form Enhancements (#23500) 2020-10-07 19:59:26 +05:30
appraisal_goal fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
appraisal_template fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
appraisal_template_goal fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
attendance fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
attendance_request fix: conflicts 2020-02-27 13:16:53 +05:30
branch
compensatory_leave_request Revert "fix: tests depending on global default company" 2020-05-30 11:38:04 +05:30
daily_work_summary fix: conflicts 2020-02-27 13:16:53 +05:30
daily_work_summary_group refactor(HR): Auto Attendance 2019-06-24 15:15:38 +05:30
daily_work_summary_group_user
department refactor: Shift Request 2020-08-13 14:17:47 +05:30
department_approver fix: clear error message when approval not available (#23971) 2020-11-24 08:01:19 +05:30
designation Enhancement(HR): hiring process (#18129) 2019-07-22 11:47:53 +05:30
designation_skill feat: Add employee training section to the employee skill map 2019-04-18 12:46:33 +05:30
driver fixes: internal issues (#19201) 2019-10-11 11:09:10 +05:30
driving_license_category fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI 2019-12-31 17:18:15 +05:30
employee feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
employee_advance feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
employee_attendance_tool fix: conflicts 2020-02-27 13:16:53 +05:30
employee_boarding_activity fix: set task weight from onboarding template (#17840) 2019-06-05 10:26:01 +05:30
employee_checkin fix: remove FE validation for log_type field 2020-07-16 13:33:38 +05:30
employee_education
employee_external_work_history
employee_grade feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
employee_group feat(Support): Service Level Agreements (#16828) 2019-03-19 16:47:56 +05:30
employee_group_table feat: Add user_id of employee to employee group 2019-06-06 14:47:40 +05:30
employee_health_insurance
employee_internal_work_history
employee_loan Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
employee_onboarding fix: Job offer is mandatory for employee onboarding (#22791) 2020-07-23 18:09:35 +05:30
employee_onboarding_activity
employee_onboarding_template feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
employee_promotion feat: New Payroll module (#21990) 2020-06-19 19:17:57 +05:30
employee_property_history
employee_separation Feat: Notify by email feature (#18587) 2019-08-05 10:07:05 +05:30
employee_separation_template feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
employee_skill feat: Add employee training section to the employee skill map 2019-04-18 12:46:33 +05:30
employee_skill_map fix: Atendance Request, Employee Skill Map, Leave Encashment form UI 2019-12-31 17:18:15 +05:30
employee_training feat: Add training date field 2019-04-22 23:35:36 +05:30
employee_transfer Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
employee_transfer_property
employment_type perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
expense_claim feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
expense_claim_account
expense_claim_advance fix: Multiple fixes based on testing on pre-release branch (#20301) 2020-01-16 13:37:25 +05:30
expense_claim_detail fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
expense_claim_type fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 2020-09-18 18:27:24 +05:30
expense_taxes_and_charges feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
holiday Feat: Monthly attendance sheet Enhancements and UI/UX Improvements (#21331) 2020-05-05 16:08:05 +05:30
holiday_list fix: Convert dates to datetime.date before comparing in Holiday List 2020-10-13 02:37:55 +05:30
hr_settings feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
identification_document_type
interest
job_applicant fix: job applicant fixes (#22448) 2020-07-23 12:22:42 +05:30
job_applicant_source
job_offer fix:Validate Job offer against vacancies (#23109) 2020-08-20 19:39:10 +05:30
job_offer_term
job_opening feat: dashboards for HR module 2019-06-14 14:10:47 +05:30
leave_allocation feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
leave_application Merge pull request #24005 from Anurag810/leave_ledger_patch 2020-11-30 13:26:47 +05:30
leave_block_list fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
leave_block_list_allow
leave_block_list_date
leave_control_panel fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI 2019-12-31 17:18:15 +05:30
leave_encashment feat: multi-currency payroll (#23519) 2020-12-01 09:11:05 +05:30
leave_ledger_entry feat: added transaction_type in leave ledger enter (#23258) 2020-09-07 11:50:24 +05:30
leave_period feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
leave_policy fix: Refactor dashboard links in leave policy (#22519) 2020-06-30 18:04:20 +05:30
leave_policy_assignment feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
leave_policy_detail
leave_type feat: Leave policy assignment (#23112) 2020-11-25 16:05:17 +05:30
offer_term
purpose_of_travel
shift_assignment Update shift_assignment.py 2020-09-08 10:14:04 +05:30
shift_request Fix: requested Changes 2020-08-13 14:17:47 +05:30
shift_type fix: changes Requested 2020-08-13 14:17:47 +05:30
skill feat: Add skill child table to designation doctype 2019-04-16 10:19:53 +05:30
staffing_plan fix: conflicts 2020-02-27 13:16:53 +05:30
staffing_plan_detail Enhancement(HR): hiring process (#18129) 2019-07-22 11:47:53 +05:30
training_event feat: New Payroll module (#21990) 2020-06-19 19:17:57 +05:30
training_event_employee fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
training_feedback fix(hr): Use event_status instead of status 2019-05-09 19:00:05 +05:30
training_program fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
training_result Refactor Naming Series (#15070) 2018-08-28 13:44:48 +05:30
training_result_employee fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
travel_itinerary
travel_request fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI 2019-12-31 17:18:15 +05:30
travel_request_costing
upload_attendance fix: Error handling in Upload Attendance (#23907) 2020-11-15 11:14:35 +05:30
vehicle fix: remove tab in code 2020-07-20 13:12:17 +05:30
vehicle_log fix: fuel expense amount of vehicle log (#23632) 2020-10-16 12:32:59 +05:30
vehicle_service fix: Merge branch 'develop' into healthcare_refactor 2020-03-25 02:08:42 +05:30
__init__.py