Nabin Hait
2afc0bd87b
Merge branch 'develop' into naming-series-proj
2020-11-19 08:24:32 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Afshan
c72b693223
fix: Handle the "no leave_allocation found" case ( #23922 )
...
* fix: Handle the "no leave_allocation found" case
* fix: format of error msg
2020-11-17 12:08:31 +05:30
Marica
06f522cb27
Merge branch 'develop' into naming-series-proj
2020-11-16 13:32:24 +05:30
marination
d51c953c22
chore: Fix Tests, use project name instead of project_name field
2020-11-16 12:48:40 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Anurag Mishra
69be37f88d
fix: Error handling in Upload Attendance ( #23907 )
2020-11-15 11:14:35 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Marica
9d94f785e9
fix: Hide Ex-Employees from Employee Tree and minor message UX ( #23711 )
...
* fix: Hide Ex-Employees from Employee Tree and minor message UX
* fix: translation syntax
2020-10-23 18:15:55 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Saqib
2f71927af8
fix: fuel expense amount of vehicle log ( #23632 )
...
* fix: fuel expense amount of vehicle log
* fix: undefined var employee_id in test
* fix: test
2020-10-16 12:32:59 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
marination
5b790a0095
fix: Convert dates to datetime.date before comparing in Holiday List
2020-10-13 02:37:55 +05:30
rohitwaghchaure
a060f8c00b
Merge pull request #23524 from michellealva/employee_exit
...
fix(Employee): Field level change in Exit section
2020-10-12 16:23:54 +05:30
Abhishek Balam
ebf53a7f25
fix(HR): Appraisal form Enhancements ( #23500 )
...
* fix: remove total score button
* Removing conflicts
2020-10-07 19:59:26 +05:30
michellealva
203585f292
fix(Employee): Field level change in Exit section
2020-10-06 16:00:39 +05:30
Sun Howwrongbum
72a596971c
fix: also update employee field when renamed ( #23482 )
2020-10-05 20:48:53 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator ( #23350 )
...
* fix: reset owner values in doctype to Administrator
* fix: updated modified value
* fix: also fixed modified by
* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Suraj Shetty
67095d239f
fix: Custom dashboard sections
2020-09-10 17:15:52 +05:30
rohitwaghchaure
900d0e3ae2
Merge pull request #23245 from Anurag810/attendance_calendar_map
...
fix: Attendance calendar map fix
2020-09-08 10:14:37 +05:30
rohitwaghchaure
842cb6d1d6
Update shift_assignment.py
2020-09-08 10:14:04 +05:30
Anupam Kumar
209f7c76c9
feat: added transaction_type in leave ledger enter ( #23258 )
2020-09-07 11:50:24 +05:30
Anurag Mishra
e5b7cb0c15
fix: data was not properly maped
2020-09-03 16:59:21 +05:30
Suraj Shetty
f39bb116cc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-27 19:27:49 +05:30
Suraj Shetty
b6ebcd7559
refactor: Replace darkgray indicator with gray indicator
2020-08-27 18:57:18 +05:30
prssanna
744169833c
fix: replace indicator color darkgrey with darkgray
2020-08-27 17:06:10 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition
2020-08-26 12:44:20 +05:30
Suraj Shetty
6f9f40992c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-23 16:33:50 +05:30
Nabin Hait
1ba62c9732
fix:Validate Job offer against vacancies ( #23109 )
2020-08-20 19:39:10 +05:30
Marica
2d767debf1
Merge branch 'develop' into shift_management
2020-08-18 13:27:15 +05:30
Deepesh Garg
38cabbd4b8
Merge pull request #23007 from prssanna/expense-claim-list-currency
...
fix: add company in list fields to fetch for Expense Claim
2020-08-17 23:07:51 +05:30
Marica
39c97bfbe9
Merge branch 'develop' into shift_management
2020-08-17 13:46:51 +05:30
Afshan
084de5f0b2
fix: handled condition if staffing isn't created ( #22992 )
...
* fix: handled condition if staffing isn't created
* style: reformated code for redability
* Update erpnext/hr/doctype/job_offer/job_offer.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-17 13:14:09 +05:30
Suraj Shetty
cab5918244
Merge branch 'develop' into HR-fix
2020-08-14 16:12:28 +05:30
Anurag Mishra
759632c025
fix: requested Changes
2020-08-14 12:26:04 +05:30
Anurag Mishra
c2710e05ce
fix: showing on_going shift on calendar
2020-08-13 14:17:47 +05:30
Anurag Mishra
74f0a1ab7c
fix: changes Requested
2020-08-13 14:17:47 +05:30
Anurag Mishra
00a8081aba
Fix: button label
2020-08-13 14:17:47 +05:30
Anurag Mishra
dcf598dc2d
Fix: requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
d5c921e358
Fix: Requested Changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
b48110caf1
Update erpnext/hr/doctype/shift_assignment/shift_assignment.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-08-13 14:17:47 +05:30
Anurag Mishra
3aa1101d5e
fix: requested changes
2020-08-13 14:17:47 +05:30
Anurag Mishra
17e6d0918b
feat: Employee level Shift Request Approver
2020-08-13 14:17:47 +05:30
Anurag Mishra
43ba7dd4c8
feat: don't allow to request for default shift
2020-08-13 14:17:47 +05:30
Anurag Mishra
feef4a6c1e
test: employee checkin
2020-08-13 14:17:47 +05:30
Anurag Mishra
b3e00de0ae
refactor: Shift Request
2020-08-13 14:17:47 +05:30
Anurag Mishra
a6ec7e31d2
test: shift assignment
2020-08-13 14:17:47 +05:30
Anurag Mishra
dd46d19765
feat: map event calendar to show ongoing shift assignment and fixed period assigment
2020-08-13 14:17:47 +05:30
Anurag Mishra
afa98bb39b
feat: Assign shift for period or create ongoing assignment
2020-08-13 14:17:47 +05:30
Anurag Mishra
ed6e9550ca
fix: removed payroll from HR. ( #22991 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 18:04:42 +05:30
prssanna
5a7618d8ec
fix: add company in list fields to fetch for Expense Claim
2020-08-11 16:50:31 +05:30
Anurag Mishra
95984fd921
fix: Not able to cancel application,allocation nad encashments
2020-08-10 12:36:00 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. ( #22913 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Shivam Mishra
de80553d89
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-03 12:34:05 +05:30
Anurag Mishra
ba52dd8ba6
fix: minor payroll_dashboard fixes ( #22832 )
...
* fix: minor payroll_dashboard fixes
* Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-03 08:57:49 +05:30
Anurag Mishra
2a4c90302b
fix: minor recritment analytics fixes ( #22830 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-07-31 17:59:30 +05:30
Shivam Mishra
11111cd9a9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-07-30 21:29:02 +05:30
Shivam Mishra
48be7d37b8
fix: add order_by explicitly for lead ( #22820 )
2020-07-28 09:00:09 +05:30
Nabin Hait
8712ac6d39
fix: Job offer is mandatory for employee onboarding ( #22791 )
2020-07-23 18:09:35 +05:30
Shivam Mishra
1358efe896
feat: update icons
2020-07-23 17:02:32 +05:30
Anurag Mishra
453325fbc9
fix: job applicant fixes ( #22448 )
...
* fix(validation): not two job offer should be allowed for single job_applicant
* fix: don't allow to create employee_onboarding without job offer
* fix: server side validation
* fix: requested changes
2020-07-23 12:22:42 +05:30
Anurag Mishra
9aa0602065
Fix: HR and Payroll Dashboard ( #22771 )
...
* Fix: HR and Payroll Dashboard
* fix: requested changes
2020-07-23 12:10:48 +05:30
Anurag Mishra
ce5b490f66
feat : Recruitment analytics ( #21732 )
...
* feat: recruitment_anlytics
* fix: filters
* feat: added missing column designation
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:04:58 +05:30
michellealva
8c7d8ba917
fix: remove tab in code
2020-07-20 13:12:17 +05:30
michellealva
37cd1b8021
fix: Heatmap in Vehicle
2020-07-20 13:04:46 +05:30
Deepesh Garg
f6c70bca0a
Merge pull request #22615 from aerele/fix_mandatory_error
...
fix: log type mandatory error while exposing api call to employee checkin.
2020-07-17 17:38:21 +05:30
Karthikeyan S
ff6ba25386
fix: remove FE validation for log_type field
2020-07-16 13:33:38 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Karthikeyan S
183ebb237e
Merge branch 'develop' into fix_mandatory_error
2020-07-10 18:05:18 +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
b78dc75456
Merge pull request #22573 from deepeshgarg007/employee_tree
...
feat: Added all companies option in employee tree to view employee ac…
2020-07-08 14:34:33 +05:30
rohitwaghchaure
0cd39e3a38
Merge pull request #22611 from frappe/hrms-dashboard-fix
...
fix: HR dashboard number card filter
2020-07-08 14:33:45 +05:30
Marica
9e73fdd866
Merge branch 'develop' into employee_tree
2020-07-08 14:33:10 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding ( #22580 )
...
* fix: grammatical fixes in module onboarding
* fix: more grammatical changes for consistency
* fix: Reorder Stock Onboarding
* fix: update success message
* fix: change order of stock onboarding steps
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +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
Kaviya Periyasamy
923ed8a741
fix: log type mandatory error while exposing api call to employee checkin
2020-07-08 11:15:04 +05:30
Anupam K
6669f7457a
hr dashboard number card filter fix
2020-07-08 01:24:53 +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
Anurag Mishra
58831ecc7d
fix(HR): wrong shortcut in desk page ( #22269 )
2020-06-16 19:23:52 +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
rohitwaghchaure
63e8f2c430
Merge pull request #22175 from Anurag810/expense_claim_cost_center_fix
...
fix: set cost center in child table
2020-06-10 13:40:51 +05:30
Anurag Mishra
452b7760df
fix: dependency for leave Period in Desk page
2020-06-10 12:48:21 +05:30
rohitwaghchaure
904e0f4eda
Merge pull request #22106 from Anurag810/employee_onboarding_fix
...
fix: problem during assigning
2020-06-10 12:30:15 +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
Anurag Mishra
225802e3a0
fix: problem during assigning
2020-06-04 14:15:55 +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
cf0168668f
fix: Correct filters ( #22022 )
2020-05-29 10:19:33 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages ( #22004 )
...
* refactor: clean up desk pages
* refactor: update label for CRM
2020-05-28 14:48:50 +05:30
Anurag Mishra
d6d84a3c15
fix: Module Onboarding for HR ( #21963 )
2020-05-27 20:21:15 +05:30
Anurag Mishra
ef0026c06f
fix: addtional salary date validation ( #21952 )
2020-05-27 12:28:11 +05:30
Anurag Mishra
01bced8c67
fix Report not working on parameter Grade ( #21951 )
2020-05-27 12:26:54 +05:30
Anurag Mishra
56357fafeb
fix: Added column Expired Leave ( #21857 )
2020-05-26 18:08:22 +05:30
Anurag Mishra
752ca63fea
fix: Was showing opening on date not remaimning leave ( #21899 )
2020-05-26 18:01:03 +05:30
Anurag Mishra
93e15c5f5c
fix: showing Wrong balance on allocation boundary dates ( #21904 )
2020-05-26 18:00:37 +05:30
Anurag Mishra
a7f42f7256
fix: showing wrong record ( #21884 )
2020-05-25 19:23:17 +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
Anurag Mishra
2346353a22
fix: missing parameter ( #21802 )
2020-05-20 16:14:09 +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
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries ( #21689 )
...
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Mangesh-Khairnar
f984bee5f9
fix: duplicate leave expiry creation ( #21505 )
...
* fix: validate existing ledger entries to avoid duplicates
* patch: remove duplicate ledger entries created
* fix: consider only submitted ledger entries
* fix: delete duplicate leaves from the ledger
* fix: check if duplicate ledger entry exists
* chore: formatting changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-15 11:55:42 +05:30
Nabin Hait
200f80c3d3
fix: Added submit permission in employee other income
2020-05-14 17:18:29 +05:30
Anurag Mishra
36aea71fd7
fix: new dashboard and report
2020-05-13 10:47:36 +05:30
Nabin Hait
6e5952fa69
fix: Changed label for payroll working days based on field
2020-05-11 16:11:43 +05:30
Prssanna Desai
d50502ca40
fix: fix get_employee_details query ( #21623 )
2020-05-06 17:36:48 +05:30
Anurag Mishra
2596c8bbe7
fix: upload attendance ( #21620 )
2020-05-06 17:06:53 +05:30
Nabin Hait
a4567a446f
fix: Test for payroll entry
2020-05-05 18:36:12 +05:30
Anurag Mishra
ddcc4fa9b9
Feat: Monthly attendance sheet Enhancements and UI/UX Improvements ( #21331 )
...
* refactor: Employee attendance sheet redesign
* feat: Added weekly off status in monthly Attendance sheet
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 16:08:05 +05:30
Nabin Hait
672b74d89c
fix: Patch and tests
2020-05-05 15:58:52 +05:30
Nabin Hait
5a1a765ebf
Update test_leave_encashment.py
2020-05-05 15:37:17 +05:30
Anurag Mishra
94719e7e81
fix: tests
2020-05-04 18:54:06 +05:30
Anurag Mishra
09572d9892
patch: to link additional salary with salary slip and leave encashment, incentive with additional salary
2020-05-04 17:07:15 +05:30
Anurag Mishra
e15f0da011
fix: conflicts
2020-05-04 13:56:07 +05:30
Anurag Mishra
f453a1c13f
Fix: requested Changes
2020-05-04 12:36:01 +05:30
Nabin Hait
ddf90b29f2
Update salary_slip.py
2020-05-01 22:34:28 +05:30
Nabin Hait
a67fb31f67
Merge branch 'develop' into refactor-addiional-salary
2020-05-01 19:04:20 +05:30
Nabin Hait
fdacc50e78
Update salary_detail.json
2020-05-01 19:04:00 +05:30
Nabin Hait
a1ffc44f0c
fix: removed unwanted comma from json
2020-05-01 18:55:57 +05:30
Vishal Dhayagude
2e082affc7
fix(HR): Leave application company field made read-only and filter in Monthly attendance sheet ( #20912 )
...
* fix(HR): Leave application company field made Readonly
* fix: in monthly report attandance employee filter based on company
* fix: minor typo
* fix: Fetch company from employee
* Update monthly_attendance_sheet.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-01 18:11:43 +05:30
Michelle Alva
95b186268c
fix: only check for payment_account on bank entry ( #21445 )
...
* fix: only check for payment_account on bank entry
Since all the fields (company, start and end date are mandatory before form submission, there is no need to check for them again after submission.
* fix: cur_frm to frm
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 16:24:51 +05:30
Nabin Hait
b8d633cb4a
fix: Desk links for Income Tax Slab and Employee Other Income ( #21510 )
2020-04-30 11:03:49 +05:30
Nabin Hait
62394d7762
fix: Tax calcualtion based on slab ( #21496 )
...
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-04-30 11:02:53 +05:30
Nabin Hait
691f69c731
fix: Consider any kind of exemptions only if tax exemptions are allowed on tax slab ( #21474 )
2020-04-30 11:02:28 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Deepesh Garg
0a6450115f
fix: get_period_list API change fixes
2020-04-29 22:14:45 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption ( #21490 )
2020-04-29 11:48:41 +05:30
Raffael Meyer
49bb8ccd2e
feat: add Bank Account to dashboards
2020-04-28 18:56:47 +02:00
Nabin Hait
1bd6de41e6
Merge branch 'develop' into refactor-addiional-salary
2020-04-28 13:15:18 +05:30
rohitwaghchaure
daf37e7570
fix: better validation message for the expense claim and set default cost center in the expenses table ( #21454 )
2020-04-28 12:48:22 +05:30
Ahmad
f34faa9181
Module Import Fix ( #21433 )
2020-04-27 10:57:02 +05:30
Nabin Hait
2305d00e0b
fix: Procurement tracker report ( #21421 )
...
* fix: procurement report data was not coming
* fix: leave allocation minor issue
2020-04-26 23:29:13 +05:30
Anurag Mishra
ded418e31d
feat: employee leave balance reports ( #20754 )
...
* feat: Employee leave balance summary report new design
* feat: Employee leave balance report new design
* fix: leave based on multiple holiday list
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 21:04:58 +05:30
Nabin Hait
ba70e7e8bc
Payroll based on attendance ( #21258 )
...
* feat: Payroll based on attendance and leave
* test: salary slip based 0n attendance
* feat: Payroll based on attendance
* fix: Codacy issues
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 20:17:48 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Saqib
7e73473a65
fix: (ux) set jv voucher type depending on mode of payment ( #21411 )
2020-04-26 09:40:57 +05:30
Anurag Mishra
92b933f4ac
feat: Upload Attendance ( #20947 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:15:18 +05:30
Deepesh Garg
bf78ed6947
fix: Loan Repayment code clean up and other fixes
2020-04-16 22:53:47 +05:30
Saqib Ansari
55410e03e4
fix: tests depending on global default company
2020-04-15 12:57:55 +05:30
Saqib Ansari
1f20c99ecf
fix: tests depending on global default company
2020-04-14 19:40:25 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry ( #21257 )
2020-04-14 09:34:39 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Deepesh Garg
03166fab56
Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes
2020-04-13 13:20:02 +05:30
Deepesh Garg
af27d61bee
fix: Employee loan test case and other fixes
2020-04-13 12:29:00 +05:30
Deepesh Garg
f7e216e285
fix: Employee loan fixes
2020-04-10 20:03:11 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields ( #21199 )
2020-04-08 12:59:15 +05:30
Nabin Hait
04870ae23a
fix: Replace newlines with spaces before evaluation of condition and formula ( #21165 )
2020-04-08 09:34:46 +05:30
Suraj Shetty
da6806e6bc
fix: Translation strings with trailing spaces ( #21192 )
2020-04-08 09:32:41 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Himanshu Warekar
c207c457a5
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-04-06 11:34:27 +05:30
Nabin Hait
75ef458b34
fix: update attendace from leave application ( #21155 )
2020-04-06 10:15:38 +05:30
Nabin Hait
a0018eed63
Merge branch 'develop' into refactor-addiional-salary
2020-03-31 20:30:52 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment ( #20949 )
2020-03-16 16:53:03 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges ( #20901 )
2020-03-16 15:52:25 +05:30
Himanshu Warekar
841be6713b
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-03-13 19:40:00 +05:30
Anurag Mishra
3ced42f302
feat: reverse linking and multiple additonal salaries in salary slip
2020-03-13 19:14:56 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Anurag Mishra
d319feee9e
fix: reverse linking
2020-03-06 15:01:10 +05:30
Anurag Mishra
1663f66e6d
test: Recurring Additional salary
2020-03-06 15:00:41 +05:30
Anurag Mishra
885ab5dc66
fix: requested changes
2020-03-06 15:00:40 +05:30
Anurag Mishra
2d7fcab2c9
feat: Recurring Addtional Salary
2020-03-06 14:59:56 +05:30
Anurag Mishra
943457abd3
fix: reverse linking for employee advance
2020-03-06 13:37:24 +05:30
Anurag Mishra
59a0bce3a9
feat: Repay advance from salary
2020-03-05 16:13:52 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Rucha Mahabal
5eb42409c7
Merge branch 'develop' into healthcare_refactor
2020-03-03 09:22:11 +05:30
Anurag Mishra
cf04b3c680
fix: added standard filters ( #20807 )
2020-03-02 19:25:01 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Karthikeyan S
0db423ed5f
fix(auto attendance): bug in marking absent ( #20759 )
...
This bug was introduces in the commit bd6e8b9cec
i.e. The mark_absent function was renamed to mark_attendance, but there is a miss match in the order of the parameters.
2020-02-28 12:27:21 +05:30
Anurag Mishra
d42a4a6234
fix: deductions calculation based on gross pay ( #20727 )
...
* fix: deductions calculation based on gross pay
* test: salary structure deduction based on gross pay
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:31:18 +05:30
Rucha Mahabal
99321cd538
fix: conflicts
2020-02-27 13:16:53 +05:30
Anurag Mishra
773e7debb9
fix: validated leave allocation ( #20636 )
...
* fix: validated leave allocation
* fix: changes requested
* Update erpnext/hr/doctype/leave_encashment/leave_encashment.py
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 14:50:57 +05:30
Mangesh-Khairnar
99d89d6cb8
fix(HR): show correct closing leave balance ( #20723 )
2020-02-26 11:26:07 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Mangesh-Khairnar
1db8ea317d
Merge pull request #20687 from Anurag810/additional_salary_fixes_v13
...
fix: Additional salary can be created only for active employee
2020-02-20 16:07:35 +05:30
Anurag Mishra
3f0c01199d
fix: Additional salary can be created only for active employee
2020-02-20 15:40:37 +05:30
Mangesh-Khairnar
5d5f5b4f8e
fix(HR): skip earned leaves check for max leaves set to zero or less ( #20535 )
...
* fix: skip earned leaves check for max leaves set to zero or less
* test: earned leaves creation
2020-02-20 13:25:55 +05:30
Deepesh Garg
2c1da897c5
Merge pull request #20450 from Anurag810/fleet-management
...
fix: odometer value was not syncing properly
2020-02-20 13:19:54 +05:30
Anurag Mishra
51cf0eb159
fix: changed field type which was affecting filters ( #20671 )
2020-02-20 12:52:56 +05:30
Anurag Mishra
1a11cb5a07
test: syncing of odometer value
2020-02-19 16:46:00 +05:30
anil pise
7c474130ea
fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed.
2020-02-15 15:58:57 +05:30
anil pise
21b1a00f61
Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599
2020-02-15 15:23:15 +05:30
Rohan Bansal
d64f92cf99
fix: show WFH in monthly attendance sheet report
2020-02-06 17:30:57 +05:30
Parth J. Kharwar
830b316543
fix: full day leaves not tagged as half day in attendance ( #20487 )
...
* fix: full day leaves not tagged as half day in attendance
* chore: code cleanup for half day date value set
2020-02-05 15:01:13 +05:30
Anurag Mishra
eacc1bc2dc
fix: requested changes
2020-02-05 12:45:43 +05:30
Anurag Mishra
1f6cc2b6ec
feat: appointment Letter ( #20104 )
...
* feat: appointment Letter
* fix: requested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-03 17:52:42 +05:30
Rucha Mahabal
0a35b2207e
refactor: Healthcare masters
2020-02-02 23:21:18 +05:30
Deepesh Garg
c3f28db5b7
Merge pull request #20475 from ParthKharwar/dev-work-from-home-application
...
feat: request for work from home marked in attendance
2020-02-01 19:06:40 +05:30
Parth Kharwar
823964f3a6
fix: test added to check work from home application
2020-01-31 14:30:38 +05:30
Parth Kharwar
5342c846d2
feat: request for work from home marked in attendance
2020-01-30 13:12:56 +05:30
Suraj Shetty
082020184a
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-30 10:46:11 +05:30
Diksha
480d52c6f3
feat(attendance): add work from home option in status
2020-01-29 17:46:27 +05:30
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Anurag Mishra
3496104ebe
fix: odometer value was not syncing properly
2020-01-28 13:11:49 +05:30
Deepesh Garg
cd8d667861
fix: Parent company defaulting on creation of new company ( #20422 )
...
* fix: Parent company defaulting on creation of new company
* fix: Test Cases
* fix: Test Cases
* fix: Test Cases for staffing plan
2020-01-28 12:54:45 +05:30
Parth J. Kharwar
011c13b3cc
fix: employee checkin doctype time permissions ( #20403 )
2020-01-27 16:03:24 +05:30
Anurag Mishra
ce00f6cf70
fix: Duplicate Attendance Due Wrong Date format ( #20390 )
2020-01-24 16:14:50 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation
2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067
fix: nonetype issue in the total leaves calculation
2020-01-20 18:02:23 +05:30
Himanshu Warekar
303f085499
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-19 11:45:24 +05:30
Mangesh-Khairnar
2ac8473abf
fix: calculate remaining leave balance
2020-01-17 22:46:26 +05:30
Parth Kharwar
0a581c096b
chore: changed employee contact field name
2020-01-17 11:50:35 +05:30