Prssanna Desai
d50502ca40
fix: fix get_employee_details query ( #21623 )
2020-05-06 17:36:48 +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
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
Deepesh Garg
0a6450115f
fix: get_period_list API change fixes
2020-04-29 22:14:45 +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
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
Rohan Bansal
d64f92cf99
fix: show WFH in monthly attendance sheet report
2020-02-06 17:30:57 +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
Mangesh-Khairnar
45c18b3184
fix: fetch employee department ( #19433 )
2019-10-31 16:00:52 +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
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53: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
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
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
Suraj Shetty
607a21e02a
feat: Init Employee Leave Balance Summary report
2019-09-05 12:42:29 +05:30
Tufan Kaynak
a7ab51c5ba
Update vehicle_expenses.py ( #18768 )
2019-08-23 12:50:52 +05:30
Mangesh-Khairnar
c9b6c9bb61
fix: calculate opening leave balance
2019-08-20 19:18:45 +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
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
3662ed50d2
fix: multiple changes
2019-08-08 19:47:17 +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
Anurag Mishra
d1d8d24d0f
fix: filters conditions in loan repayment ( #18428 )
2019-07-20 06:31:22 +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
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
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
Mangesh-Khairnar
050f65beb4
feat: fetch leave allocation from ledger entry
2019-06-06 20:32:01 +05:30
Mangesh-Khairnar
351f4d53a0
feat: add employee filter to employee leave balance
2019-06-05 21:22:07 +05:30
Mangesh-Khairnar
91e62f575e
fix: department filters in employee leave balance
2019-05-30 13:38:35 +05:30
Mangesh-Khairnar
7cc6a67c18
add department filter to employee leave balance
2019-05-29 15:59:20 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report
...
feat: Loan repayment report
2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json
2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
513e3f97e5
fix(salary-register): track doj for non active employee
2019-04-29 12:17:49 +05:30
Nabin Hait
0908907ae1
Merge branch 'develop' into aahi_loan_report
2019-04-24 09:37:52 +05:30
Mangesh-Khairnar
e7d53540de
feat: add doj column in salary register
2019-04-05 12:56:11 +05:30
Anurag Mishra
5402451b35
feat: Loan repayment report
...
Co-authored-by: crescent28 <mitali@erpnext.com>
2019-04-01 10:57:36 +05:30
Saurabh
84a18f5b18
Merge branch 'master' into develop
2019-03-28 13:54:34 +05:30
Himanshu
e43b6beff0
fix(Leave Balance Report): total allocated leaves not calculated properly ( #16969 )
...
* fix: total alloted leaves not calculated properly
* fix: Possible SQL injection
* typo fix in sql query
* prevent sql injection again ?
* Use ORM for query
2019-03-26 21:42:12 +05:30
Tropicalrambler
3a88bc43dc
fix: typo in salary register report field name ( #16670 )
...
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
2019-02-15 13:40:44 +05:30
Suraj Shetty
b2965001d1
Replace 'Make' with 'Create'
2018-12-23 13:25:58 +05:30
Faris Ansari
4809f86035
fix(report): field -> fieldname, dateutil -> frappe.datetime ( #15106 )
2018-08-14 10:56:18 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Saurabh
d7897f1c53
Resolved merge conflicts
2018-07-18 17:08:16 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Shreya Shah
fbeab5bf73
Show opening balance of leaves ( #14925 )
...
* Show opening balance of leaves
* Update employee_leave_balance.py
2018-07-17 11:59:51 +05:30
Saurabh
db7324890f
Merge branch 'master' into develop
2018-07-09 15:53:51 +05:30
