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
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
Vishal Dhayagude
2ae87876b6
fix: salary structure assignment filter employee based on company ( #20318 )
...
* fix: pick company from employee salary structure
* fix: Salary structure assignment fetch company from enmployee
* Revert "fix: Salary structure assignment fetch company from enmployee"
This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.
* fix: Salary structure assignment fetch company from enmployee
* fix: filter on company for salary structure assignment
* fix: minor changes
* fix: minor changes
* fix: added company to salary strucutre assignment
2020-01-17 11:44:11 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch ( #20301 )
...
* fix: Multiple fixes based on testing on pre-release branch
* fix: reload hr settings
2020-01-16 13:37:25 +05:30
Himanshu Warekar
c9f497d7c0
feat: move subject and sender fields to json
2020-01-13 16:26:40 +05:30
Himanshu Warekar
e5692e035a
Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to
2020-01-13 15:17:32 +05:30
Vishal Dhayagude
7ae11005c4
fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application ( #20211 )
2020-01-07 13:02:13 +05:30
Vishal Dhayagude
6b316cd7cb
feat: Backdated leave application ( #20201 )
...
* fix: only HR Managers can make backdated leave applications
* fix (leave application): error message changed and user check modified
* fix: Move hardcoded logic to HR Settings
* fix: added role as mandetory field on check restict field
* fix: minor changes
2020-01-07 11:48:38 +05:30
Anurag Mishra
8554304616
fix: set currency to company default currency ( #20157 )
2019-12-31 17:23:31 +05:30
Nabin Hait
5748cde54b
fix: minor field arrangements
2019-12-31 17:18:15 +05:30
Anurag Mishra
d2eae9fbcf
fix: Atendance Request, Employee Skill Map, Leave Encashment form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
b57ec65812
fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
52d280067b
fix: Leave Type form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
cfdbbcff70
fix: Employee incentive form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
39ecd6ee1e
fix: Expense calim form UI
2019-12-31 17:18:15 +05:30
Anurag Mishra
ec9000b6b9
fix: Employee form UI
2019-12-31 17:18:14 +05:30
Anurag Mishra
bd6e8b9cec
feat: Mark Unmarked Attendance ( #20062 )
...
* feat: Mark Unmarked Attendance
* Update shift_type.py
* Update attendance_list.js
* Update attendance.py
* Update attendance.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-31 17:09:56 +05:30
Rohan
b73b347697
feat: add job applicant's email in job offer ( #20153 )
2019-12-31 17:09:02 +05:30
thefalconx33
88de158378
feat: added provision to disable rounded total for salary slips
2019-12-31 15:27:30 +05:30
Saqib
8774c869d7
fix: first name not fetched from job offer applicant name ( #20093 )
2019-12-27 12:15:20 +05:30
thefalconx33
61bd6ccc2b
fix: travis failing for leave application test
2019-12-26 18:27:58 +05:30
Parth J. Kharwar
8c4cf12c93
Setting preferred driver email in delivery trip ( #19832 )
...
* fix: add driver's preferred contact email in delivery trip
* fix: modify driver's preferred email patch and blank field checks
* fix: patch file fix
* fix: patch changes to improve speed
* fix: removal of conflicts
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-25 15:14:52 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
cc62aad503
fix: Label for return amount
2019-12-24 11:51:39 +05:30
DeeMysterio
152c6be209
fix(employee onboarding): stop showing irrelevant job offer links for a job applicant ( #20053 )
2019-12-23 19:02:29 +05:30
Wolfram Schmidt
964cbc03ba
Update employee.json ( #20057 )
...
unnecessary description. Should be added by customer manually if needed individually.
2019-12-23 18:50:40 +05:30
Parth J. Kharwar
da5d5c4941
fix(hr): update leave application status on cancel ( #19883 )
2019-12-23 18:41:17 +05:30
Anurag Mishra
bd5f5dabbd
fix: Salary Structure Fixes ( #19923 )
2019-12-23 18:01:40 +05:30
Anurag Mishra
e6b3da0f59
feat: fixed party and party type in Accrual journal entry ( #20021 )
2019-12-23 15:50:29 +05:30
Mangesh-Khairnar
6edd3580d1
fix(expense-claim): update status ( #20030 )
...
* fix(expense-claim): update status
* fix(expense-claim): compare using grandtotal precision
2019-12-23 15:48:34 +05:30
Anurag Mishra
1202e64403
fix: Training Event Email Tenplate ( #19652 )
2019-12-18 11:43:16 +05:30
deepeshgarg007
b695fd31d6
fix: Remove trailing whitespace and add semicolon
2019-12-17 18:14:33 +05:30
deepeshgarg007
83ecaefd4c
feat: Custom button to create return entry from Employee Advance
2019-12-17 11:03:22 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2
fix: Dashboard for employee advance doctype
2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987
fix: Minor filter fix in expense claim type
2019-12-15 21:20:55 +05:30
Himanshu Warekar
c7feea830f
feat: Email Append To
2019-12-12 21:12:17 +05:30
Anurag Mishra
9046c13858
fix: added extra condition ( #19884 )
2019-12-10 21:37:27 +05:30
Anurag Mishra
9cc5c18f36
fix: removed only custom dashboard
2019-12-10 15:20:47 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense ( #19807 )
...
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* fix: copy cost center from other row
* patch: set cost center in children based on parent
* fix: test cases for expense claim
2019-12-10 08:40:10 +05:30
Mangesh-Khairnar
4350846f1e
fix(compensatory leave request): Create leave ledger entry on submit/cancel ( #19476 )
...
* fix: allow creation of leave ledger entry
* feat(compensatory-leave-request): create leave ledger entry on submit
* style: add descriptive comments
* test: allow creation of leave period based on company
* fix(leave-allocation): check name of leave allocation for determining overlap
* fix: validate new leaves allocated before updating leave allocation
* test: compensatory leave request creation
* fix: skip leave entries for non expired leave allocation
* test: creation of leave ledger entry on creation of compensatory leave request
* fix: minor changes
* fix: fetch leave approver defined in employee in leave application
* fix: attendance creation and leave balance calculation
* test: create leave period for the compensatory off
* style: add descriptive method name
* test: updation of leave allocation on submit
* fix: remove db_set from compensatory off
2019-12-09 14:27:38 +05:30
Khushal Trivedi
51f2131a41
fix: joining and relieving Date can be on same date as valid use case on emoloyee form ( #19798 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix: joining and relieving Date can be on same date as valid use case
* Update employee.py
2019-12-04 11:56:44 +05:30
Nabin Hait
a0f9db4b83
Update employee.py
2019-12-03 12:51:27 +05:30
Anurag Mishra
957a6f5bd5
fix: UX/UI ( #19753 )
2019-12-02 14:44:17 +05:30
Sammish Thundiyil
54694dd816
modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json ( #19470 )
2019-11-29 18:00:30 +05:30
Anurag Mishra
707bb2052c
fix: Employee dashboard disappear after switching from leave application form ( #19690 )
2019-11-27 16:27:50 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Anurag Mishra
763660b2e4
fix: set allocated amount in employee advance as per total amount ( #19626 )
2019-11-22 13:32:25 +05:30
Mangesh-Khairnar
1a92eb14ed
fix: Mark attendance from employee attendance tool ( #19627 )
2019-11-21 17:58:18 +05:30
Nabin Hait
9db9edca2c
fix(expense claim): fetch outstanding documents based on party account type
2019-11-19 18:44:54 +05:30
Mangesh-Khairnar
3f854fce2e
feat: fetch leave approver from both employee and department approvers ( #19613 )
...
* fix: fetch leave approvers from both department and employee master
* fix: creaate a set of approvers
2019-11-19 15:07:30 +05:30
Mangesh-Khairnar
f3ecfd8e58
fix: fetch leave approvers from both department and employee master ( #19611 )
...
* fix: fetch leave approvers from both department and employee master
* fix: creaate a set of approvers
2019-11-19 14:50:05 +05:30
Saqib
d995609ffa
Fixed asset refactor ( #19369 )
...
* refactor: Asset Movement with multiple assets using table
* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset
* feat: Auto create asset on Purchase checkbox
* refactor: LCV for asset created via PR/PI
* refactor: get asset category accounts from item master
* refactor: Purchase Receipt for asset purchasing
* refactor: Purchase Invoice for asset purchasing
* fix: post-refactor delete fixes
* refactor: moved asset validation from pr/pi on asset submission
* fix: Asset Category should be defined for auto purchasing assets
* fix: undo serial_no_update removal (for non asset item) from LCV
* fix: remove duplicate calls from item.js
* fix: args position of all occurrence of get_asset_category_account()
* fix: test cases
* fix: landed cost voucher validations
* refactor: test case for auto creation of asset
* fix: removed invalid assertions
* fix: patch errors on travis
* fix: codacy fixes
* fix: PI Items not fetching details from item
* fix: asset movement from list view having default purpose 'Receipt'
* chore: msgprint for selecting item code first while creating asset manually
* fix: alert messages
* minor: asset movement fixes
* fix: lcv was made against submitted assets
* minor: ux fixes
* refac: move specific asset validation to SINV
* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code
* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests
* fix: code review changes
* chore: remove unecessary asset movement updation
* refac: setting latest location while making asset movements
* Added extra validations
* fix: form dashboard make lcv button
* fix: auto asset movement creation validation
* fix: allow lcv against other items after removing submitted assets
* chore: remove unwanted condition
* fix: mismatch debit credit on purchase of asset with valuation tax
* chore: toggle required field based on movement type
* chore: fix lcv error message
* fix: travis failing
* fix: travis failing test
* fix: wrong conditions after merge
* fix: cannot cancel assets
* fix: travis failing* fix change in deletion of assets
* fix: codacy
* fix: process cancellation of assets
* refac: cancellation of pr only deletes auto created assets
* fix: incorrect query
2019-11-18 11:46:55 +05:30
Mangesh-Khairnar
d545f6fb6b
fix: fetch approver from employee
2019-11-14 19:26:49 +05:30
Mangesh-Khairnar
fc3b924d4d
fix: skip leave ledger entry creation for denied leaves ( #19556 )
...
* fix: skip leave ledger entry creation for denied leave application
* patch: remove incorrect leave ledger entries
* fix: create reverse ledger entry before setting status to cancel
2019-11-14 12:02:10 +05:30
Mangesh-Khairnar
af7fe1937e
fix: fetch leave approver defined in employee in leave application ( #19559 )
...
* fix: fetch leave approver defined in employee in leave application
* Update department_approver.py
2019-11-13 19:00:56 +05:30
Deepesh Garg
3cc3b57926
fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry ( #19427 )
...
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry
* fix: Codacy
* fix: Minor UX fixes
* fix: Also credit payable amount in case of advance payment
* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
Diksha
39152f935c
fix(employee): show only active employees in the error display while marking a reporting to employee as left
2019-11-11 19:22:51 +05:30
Mangesh-Khairnar
2f44480d69
enhancement: Item-wise sales history report ( #19500 )
...
* refactor(item-wise-sales-history): convert query report to script report
* refactor: add columns, fetch data
* refactor: shift company set func to utils
* fix: add filters
* fix: minor changes
* fix: fetch all the descendants
2019-11-11 10:54:12 +05:30
Saqib
01c19d3b93
internal issues ( #19496 )
...
* fix: user remark mandatory in quick entry but not in form
* fix: preview salary slip btn showing in draft and unsaved states
* minor: removed unecessay comma
* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Deepesh Garg
2ec7acb592
Merge pull request #19294 from vijaywm/duplicate-attendance
...
fix: Typo in attendance date filter
2019-10-31 16:46:52 +05:30
Mangesh-Khairnar
45c18b3184
fix: fetch employee department ( #19433 )
2019-10-31 16:00:52 +05:30
deepeshgarg007
4a1d000c33
fix: Test Case
2019-10-31 15:57:15 +05:30
Mangesh-Khairnar
7638788c2f
fix: calculate pending leaves ( #19411 )
2019-10-30 14:23:41 +05:30
Faris Ansari
e127d937f7
fix(ExpenseClaim): List filter config for Rejected and Unpaid ( #19434 )
2019-10-30 13:31:05 +05:30
ahmadRagheb
2a72d1fee4
Update salary_slip.py
...
getdate imported twice
2019-10-29 19:49:08 +02:00
Mangesh-Khairnar
cdf15222e1
fix: half day leave ( #19323 )
2019-10-21 13:33:46 +05:30
Vijaya Raghavan
adc1529567
fixed typo
...
fixes type in filter parameter
2019-10-13 21:41:02 +05:30
Saqib
66762380ed
fixes: internal issues ( #19201 )
...
* fix: Delivery Trip now has editable start address.
* fix: default party type not set in Journal Entry
* fix: maintainence visit purpose table not fetching item name
* fix: maintainence visit purpose table not fetching item name
2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
d5e9cd72df
Merge branch 'develop' into lwp_half_day_fix
2019-10-07 16:08:30 +05:30
Mangesh-Khairnar
75397b441f
style(salary-slip): fixed formatting
2019-10-07 16:08:15 +05:30
Nabin Hait
25e043766a
fix: Get leave approvers in Employee leave balance report ( #19211 )
2019-09-30 16:36:23 +05:30
Mangesh-Khairnar
f82ea857a0
feat(job-applicant): allow rename/merge with existing
2019-09-26 12:29:41 +05:30
Vijaya Raghavan
e9affd97ac
LWP for half day in multi day leave
2019-09-24 17:04:32 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Mangesh-Khairnar
a44e8afe71
feat: add bank account in payroll entry ( #19021 )
...
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
2019-09-20 18:19:47 +05:30
Rucha Mahabal
aeaf416d6d
fix: upload attendance template not marking attendance
2019-09-18 13:11:30 +05:30
Chinmay Pai
7e8e4783a1
fix: remove function call from kwarg ( #19072 )
...
this commit fixes mail not being sent for leave applications
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2019-09-16 19:14:42 +05:30
Suraj Shetty
6996c2d17d
fix: Fetch image from user if available ( #19030 )
2019-09-13 12:25:06 +05:30
Mangesh-Khairnar
755020843b
fix: leave balance reports ( #18984 )
...
* fix: process allocation expiry
* fix: leave balance summary filter
* fix: opening and closing balance
* fix: check for department leave approvers
* fix: minor changes
* fix: consider leave approver in employee
* Update employee_leave_balance_summary.py
2019-09-13 11:07:09 +05:30
Mangesh-Khairnar
cbcede79b1
Merge pull request #18964 from nabinhait/max_carry_forwarded_leaves
...
feat: Added input field for max carry forwarded leaves
2019-09-09 14:38:06 +05:30
Nabin Hait
632fc6af79
feat: Added input field for max carry forwarded leaves
2019-09-09 13:33:00 +05:30
Nabin Hait
fb7c7b53ba
feat: Added input field for max carry forwarded leaves
2019-09-09 12:08:58 +05:30
Suraj Shetty
5ae40a9500
fix: Use absolute import instead of relative import
...
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
2019-09-08 15:16:35 +05:30
Suraj Shetty
a14ee7f1fe
Merge branch 'develop' of github.com:frappe/erpnext into employee-leave-balance-summary
2019-09-07 22:02:02 +05:30
Suraj Shetty
c5588a9b93
fix: Column value and data indentation
2019-09-07 21:26:43 +05:30
Suraj Shetty
21a4f82f69
fix: Re-arrange filters
2019-09-07 20:21:56 +05:30
Nabin Hait
3b366c30a8
feat: Added default Leave Approver in Employee ( #18953 )
2019-09-07 12:31:07 +05:30
Karthikeyan S
1d1427de60
fix(auto attendance): handling None case for IN/OUT Logs ( #18867 )
2019-09-05 15:02:33 +05:30
Suraj Shetty
607a21e02a
feat: Init Employee Leave Balance Summary report
2019-09-05 12:42:29 +05:30
Rucha Mahabal
1e2dc2c8f1
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) ( #18647 )
...
* feat: employee incentive and retention bonus added in additional salary
* fix: added salary component field, logic improved
* fix: codacy review
2019-09-03 20:45:52 +05:30
Suraj Shetty
152360d999
Merge branch 'develop' into contacts-ref
2019-09-02 16:24:57 +05:30
Mangesh-Khairnar
e7c7a0e648
fix: loan application ( #18882 )
...
* fix: loan application
* Update loan_application.py
2019-09-02 15:59:44 +05:30
deepeshgarg007
402d82b4c5
fix: Remove delete_doc from tests
2019-09-02 14:37:18 +05:30
Mangesh-Khairnar
17d3de1821
fix: process allocation expiry
2019-08-27 22:37:12 +05:30
Tufan Kaynak
a7ab51c5ba
Update vehicle_expenses.py ( #18768 )
2019-08-23 12:50:52 +05:30
KanchanChauhan
23b5f4ec99
fix: Leave Application status filter ( #18770 )
...
When we click on Status Open in list view it throws an error.
After fix, it filters the results on Open status
2019-08-23 11:40:09 +05:30
Mangesh-Khairnar
c9b6c9bb61
fix: calculate opening leave balance
2019-08-20 19:18:45 +05:30
Mangesh-Khairnar
6d549b03f1
Merge branch 'develop' into fix-ledger-entry
2019-08-20 17:58:44 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
Mangesh-Khairnar
79414a8d36
fix: fetch employee name on leave ledger creation
2019-08-20 14:45:57 +05:30
Karthikeyan S
d5e5e22adb
Merge pull request #18523 from Vigneshsekar/attendance_grace_period
...
feat(Auto Attendance): Add grace period
2019-08-18 13:25:48 +05:30
Mangesh-Khairnar
ae2a0fb4c7
chore: remove unused code
2019-08-14 16:50:31 +05:30
Mangesh-Khairnar
3a42631e65
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-14 16:11:08 +05:30
Mangesh-Khairnar
107b2768fd
refactor: replace raw sql with orm
2019-08-14 16:09:16 +05:30
Mangesh-Khairnar
760b078dc9
fix(payroll-entry): commit submitted salary slip check on change ( #18694 )
...
* fix(payroll-entry): commit submitted salary slip check onchange
* fix: track submitted ss via flags
2019-08-14 14:40:00 +05:30
Vignesh S
4454630549
feat(Auto Attendance): Add grace period
...
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
2019-08-14 13:40:02 +05:30
Mangesh-Khairnar
dab5b1f319
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-13 13:33:26 +05:30
Mangesh-Khairnar
8b9b77959d
fix: fetch min date when carry forward expiry is greater than leave allocation expiry
2019-08-13 13:20:10 +05:30
Faris Ansari
9eda500dbc
Merge branch 'develop' into refactor-call-popup
2019-08-12 15:56:35 +05:30
Shivam Mishra
8363a6e585
refactor: remove from date and to date from standard filter ( #18696 )
2019-08-12 11:58:14 +05:30
Mangesh-Khairnar
e173d54054
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-08-09 13:37:51 +05:30
Mangesh-Khairnar
261d132f3a
fix: calculate earned leaves based on annual allocation
2019-08-09 13:18:52 +05:30
Mangesh-Khairnar
3662ed50d2
fix: multiple changes
2019-08-08 19:47:17 +05:30
Mangesh-Khairnar
bafc89f439
refactor: convert raw sql to orm
2019-08-08 17:43:23 +05:30
Mangesh-Khairnar
9bc4232af6
feat: calculate remaining leaves both multiple simultaneous allocation
2019-08-08 17:11:08 +05:30
Mangesh-Khairnar
5cbe6160ca
feat: consider carry forwarded leaves on creation of encashment
2019-08-08 17:06:15 +05:30
Suraj Shetty
9f4b270116
fix: prev_doc
2019-08-06 09:03:23 +05:30
Suraj Shetty
207f218db3
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
2019-08-06 05:44:28 +05:30
Suraj Shetty
89d8a0b6fd
fix: reset_employee_emails_cache method
2019-08-06 05:44:13 +05:30
Suraj Shetty
f6f849226e
Merge branch 'develop' into refactor-call-popup
2019-08-05 21:25:12 +05:30
Mangesh-Khairnar
314647572c
fix: check for old unexpired allocation
2019-08-05 15:35:19 +05:30
Mangesh-Khairnar
6bed870dfa
feat: pro-rata leave allocation
2019-08-05 14:47:53 +05:30
Mangesh-Khairnar
f281f00d43
feat: auto leave encashment
2019-08-05 14:47:53 +05:30
Suraj Shetty
0957480305
fix: Show popup to employees with same phone number
2019-08-05 11:32:51 +05:30
Mangesh-Khairnar
31c5c1e562
fix(payroll-entry): show make bank entry button ( #18497 )
...
* fix(payroll-entry): show make bank entry button when manually submitting salary slip
* Update payroll_entry.py
2019-08-05 10:21:19 +05:30
Mangesh-Khairnar
06a0afa039
Feat: Notify by email feature ( #18587 )
...
* feat: notify user by email in employee onboarding control
* fix: create task on update after submit
2019-08-05 10:07:05 +05:30
Nabin Hait
a813571c17
Update employee_advance.py
2019-08-05 10:05:28 +05:30
Mangesh-Khairnar
d66396f4e9
fix(employee-advance): update employee advance on change in expense claim ( #18588 )
...
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim
* fix(expense-claim): display appropriate buttons only if linked transactions are valid
* Update employee_advance.py
2019-08-05 10:04:05 +05:30
Mangesh-Khairnar
c92e823651
fix(employee-advance): update employee advance on change in expense claim ( #18590 )
...
* fix(employee-advance): update employee advance on rejection/cancellation of expense claim
* fix(expense-claim): display appropriate buttons only if linked transactions are valid
2019-08-05 10:02:32 +05:30
Mangesh-Khairnar
8fb600162e
fix: remove all leaves via scheduler
2019-07-31 19:31:26 +05:30
Mangesh-Khairnar
5eac8703da
fix: create reverse expiry for back dated leaves
2019-07-31 19:28:21 +05:30
Mangesh-Khairnar
f0f4dbd5f8
fix(payroll-entry): show make bank entry button when manually submitting salary slip ( #18498 )
2019-07-27 10:05:33 +05:30
Aditya Hase
d1bb274c22
perf(tests): Use country with lesser fixtures
2019-07-26 05:54:04 +05:30
Aditya Hase
0f072d7d40
perf(tests): Use country with lesser fixtures
2019-07-26 01:11:57 +05:30
Mangesh-Khairnar
bb1be2e2ee
chore: change fieldname for carried forward leave expiry
2019-07-23 13:18:40 +05:30
Mangesh-Khairnar
fd1d4c2927
chore: split expire allocation
2019-07-22 18:05:27 +05:30
Mangesh-Khairnar
f6cf58fa8c
fix: change get all to sql list
2019-07-22 15:32:41 +05:30
Mangesh-Khairnar
cbc22e6369
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-07-22 13:57:04 +05:30
Mangesh-Khairnar
29e9f14f95
fix: minor changes
2019-07-22 13:54:39 +05:30
Mangesh-Khairnar
270c44a556
Enhancement(HR): hiring process ( #18129 )
...
* feat: allow update of vacancies in staffing plan
* feat: update staffing plan on creation of job offer
* feat: update staffing plan after submit
* fix: change staffing plan on creation of employee
* fix: calculate vacancies based on job offers and staffing-plan
* test: job applicant creation
* feat: update job applicant on creation of job offer
* test: staffing plan creation
* fix: number of positions calculation
* test: job offer creation and update
* fix: update status of job applicant on change of job offer
* fix: linting
* fix: set number of positions
* fix: linting
* fix(job-offer): add a more descriptive message
* fix: translations in validation message
* Update validation message
2019-07-22 11:47:53 +05:30
Faris Ansari
7ed5919d5b
fix(LoanApplication): Repayment amount check ( #18376 )
...
* fix: Clickable Asset link
* fix(LoanApplication): Repayment amount check
2019-07-22 11:30:05 +05:30
Anurag Mishra
d1d8d24d0f
fix: filters conditions in loan repayment ( #18428 )
2019-07-20 06:31:22 +05:30
Karthikeyan S
fcdcfbf302
fix(loan): Loan Tenure Formula ( #18424 )
2019-07-20 00:18:44 +05:30
Himanshu
0a8816e053
feat(Google Maps): Google Maps Refactor [Unified Google API Settings] ( #18110 )
2019-07-19 14:38:04 +05:30
Suraj Shetty
f9c650f8e6
fix: Show submit after salary slip creation
2019-07-17 19:38:46 +05:30
sahil28297
39c3cfa25d
fix(hr_setting): fix translation method call ( #18328 )
2019-07-15 11:25:26 +00:00
Anurag Mishra
e37ff39836
fix: Validate loan repayment amount in Loan Application ( #18169 )
...
* fix: validate loan repayment amount
* fix: test for loan application
2019-07-15 14:16:52 +05:30
karthikeyan5
625ec43fc9
fix(auto attendance): Prevent marking attendance for the ongoing shift
2019-07-12 15:57:37 +05:30
Nabin Hait
bd055a858c
fix: UX fixes in loan ( #18220 )
...
* fix: UX fixes in loan
* Update loan.py
2019-07-11 17:18:00 +05:30
Rushabh Mehta
8309fcfbbc
BREAKING CHANGE: Remove anti-pattern "Project Task" ( #18059 )
...
* BREAKING CHANGE: Remove anti-pattern "Project Task"
* fix(tests): remove `tasks` from project/test_records.json
* fix(tests)
* fix(test): test_employee_onboarding.py
* fix(tests): test_expense_claim.py
* fix(refactor): cleanup project.py validate/update
* fix(refactor): cleanup project.py validate/update
* fix(test): test_expense_claim
* fix(test): test_expense_claim
* fix(test): test_expense_claim, try Test Company 4
* Update project.py
2019-07-08 10:39:30 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
Mangesh-Khairnar
100af0a635
fix(salary-slip): Nonetype error on amount calculation ( #18147 )
...
* fix: amount calculation
* Update salary_slip.py
2019-07-04 12:29:26 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Mangesh-Khairnar
80fb0bf520
fix: add employee leave balance report to the dashboard
2019-07-03 13:06:46 +05:30
Mangesh-Khairnar
8d19faa598
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-07-03 11:44:00 +05:30
Mangesh-Khairnar
0d4db95d99
fix: skip expired leaves on allocation end date
2019-07-03 11:35:51 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Suraj Shetty
19e4fde737
Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog
2019-06-30 15:30:59 +05:30
rohitwaghchaure
9dd7d3ebb3
fix: not able to make salary slip based on timesheet ( #18088 )
2019-06-28 12:40:52 +05:30
Anurag Mishra
322eca61e6
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
...
fix: Wrong Casual Leave Opening in Employee Leave Balance Report
2019-06-27 17:00:55 +05:30
Anurag Mishra
0181eb0652
fix: removed unused function
2019-06-26 13:26:50 +05:30
Anurag Mishra
8a6255078b
fix: wrong Casual Leave opening
2019-06-26 13:22:34 +05:30
Himanshu Warekar
d48b2ac126
fix: attendance gantt fix
2019-06-26 11:37:49 +05:30
Mangesh-Khairnar
07aae76bbf
fix: change the department to tree view ( #18057 )
2019-06-26 11:03:57 +05:30
rohitwaghchaure
2b6cb6160f
Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant
...
fix: Closed job opening disaplying in job applicant
2019-06-25 16:51:03 +05:30
Rohit Waghchaure
78d6086739
fix: Closed job opening disaplying in job applicant
2019-06-24 18:05:10 +05:30
karthikeyan5
eadc144477
fix(HR): fixing bug introduced during merge conflict resolution.
...
> while merging with https://github.com/frappe/erpnext/pull/17837
2019-06-24 15:15:38 +05:30
karthikeyan5
82256bc58b
fix(hr): Auto Attendance
...
> fixing minor bug in shift calculation
> adding 'Mark Auto Attendance' button in shift and related fixes
> changed employee checkin naming series
> added aditional validation for employee checkin
> added/updated dashboard for Attendance, Employee, Shift Type
2019-06-24 15:15:38 +05:30
karthikeyan5
32197355ad
rename(HR): Employee Attendance Log DocType to Employee Checkin
2019-06-24 15:15:38 +05:30
karthikeyan5
e0c5176383
refactor(HR): Auto Attendance
...
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
2019-06-24 15:15:38 +05:30
karthikeyan5
66e459b35d
fix(auto attendance): changes as requested in review
...
> removed unused field from shift assignment
> renamed 'biometric_rf_id' to 'attendance_device_id'
> added more test cases
> few other minor changes after demo
2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8
feat(HR): Auto Attendance
...
>Marking attendance based on Employee Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
ceea328542
fix(HR): validations and bug fixes for Attendance Log
2019-06-24 15:15:38 +05:30
karthikeyan5
a4d0ba222b
fix(HR): changes as per PR review
...
> renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType
> renamed biometric_id to biometric_rf_if
2019-06-24 15:15:38 +05:30
karthikeyan5
e4bbda6ff5
feat(HR): Added Employee CheckIn Log
...
> Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices.
>added biometric_id in the Employee Doctype
2019-06-24 15:15:38 +05:30
Mangesh-Khairnar
bd999b0908
fix: minor changes
2019-06-21 00:49:48 +05:30
rohitwaghchaure
8b7267eb60
Merge pull request #17921 from Mangesh-Khairnar/expense-claim
...
feat: Tax based expense claim
2019-06-20 22:02:52 +05:30
rohitwaghchaure
d2061b44dd
fix: could not find company all ( #17978 )
2019-06-20 19:13:54 +05:30
Mangesh-Khairnar
8619fc7413
fix: fetch rate only if field is empty
2019-06-20 12:02:47 +05:30
Mangesh-Khairnar
0ef1df72ad
refactor: fetch rate directly from the account head
2019-06-19 17:50:33 +05:30
Mangesh-Khairnar
439313e524
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
2019-06-19 13:10:53 +05:30
Mangesh-Khairnar
12a2b21465
fix: track status for pending leaves
2019-06-19 13:00:52 +05:30
Suraj Shetty
a367a85a78
Merge branch 'develop' into call-summary-dialog
2019-06-18 11:09:29 +05:30
Mangesh-Khairnar
7293a98a10
fix: change formatting
2019-06-17 19:03:46 +05:30
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
