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
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
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
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
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
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
