Nabin Hait
a8efe8eb5f
Merge branch 'develop' into version-13-beta-pre-release
2020-07-24 11:15:13 +05:30
Rohit Waghchaure
2cbf598b4b
fix: travis
2020-07-03 20:15:18 +05:30
Deepesh Garg
30d9101cbf
fix: Remove loan security field from loan
2020-07-02 23:39:12 +05:30
Deepesh Garg
1d8b13c943
Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes
...
fix: Loan security shortfall fixes
2020-06-27 18:57:14 +05:30
Deepesh Garg
589364856c
fix: Syntax Error
2020-06-27 18:44:36 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs ( #22433 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:37:04 +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
Nabin Hait
b90194970d
fix: Merge conflict
2020-06-23 20:01:24 +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
a66ce050ff
fix: Minor fixes in loan
2020-06-15 16:03:12 +05:30
Deepesh Garg
221076c258
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into loan_amount_precision_v13
2020-06-07 21:32:50 +05:30
Deepesh Garg
df93589032
fix: Ignore GL Entry on cancel
2020-06-07 21:29:25 +05:30
Deepesh Garg
3fed098f16
fix: Precision in loan amount calculation
2020-06-07 21:28:32 +05:30
Deepesh Garg
0bc163c230
fix: Ignore GL Entry on cancel
2020-06-07 21:23:55 +05:30
Deepesh Garg
e5ac8cc430
fix: Precision in loan amount calculation
2020-06-07 21:18:47 +05:30
Shivam Mishra
fa0b73ce25
refactor: clean up desk pages ( #22004 ) ( #22007 )
...
* refactor: clean up desk pages
* refactor: update label for CRM
2020-05-28 15:20:22 +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
Shivam Mishra
29742e4cbe
feat: rename loan management to loan on Desk Page
...
(cherry picked from commit 5cf90baf16
2020-05-22 10:40:33 +00:00
Shivam Mishra
5cf90baf16
feat: rename loan management to loan on Desk Page
2020-05-22 15:09:57 +05:30
Abhishek Balam
673e704bb5
typo in error message in loan_security_pledge.py
2020-05-12 19:09:27 +05:30
Deepesh Garg
dd340c15de
fix: Loan Security Unpledge fixes
2020-05-07 15:35:54 +05:30
Deepesh Garg
af27c5142f
fix: Loan securiyt unpledge fixes
2020-05-05 16:54:48 +05:30
Deepesh Garg
2a0de58f3d
fix: Use grace period in days for calculation of due date
2020-05-04 13:45:43 +05:30
Deepesh Garg
1b35873743
Merge branch 'develop' into loan_closure_fixes
2020-05-01 14:18:36 +05:30
Deepesh Garg
779815a035
fix: Loan Repayment Test
2020-05-01 11:04:12 +05:30
Deepesh Garg
61363d2ced
fix: Initialize interest_paid as zero
2020-04-30 22:22:44 +05:30
Deepesh Garg
4226191ec7
fix: Loan Closure without loan interest accrual
2020-04-30 22:11:57 +05:30
Deepesh Garg
91e94587b6
fix: Autoname for loan security
2020-04-29 13:43:26 +05:30
Deepesh Garg
7b14721e2f
fix: Allow rename for Loan Security
2020-04-28 14:25:36 +05:30
Deepesh Garg
c20de8ac8d
fix: Loan Disbursement against account
2020-04-25 13:15:45 +05:30
Deepesh Garg
2daf6dad2e
fix: Allow creation of loan security pledge from Loan Application for old prices
2020-04-23 13:51:29 +05:30
Deepesh Garg
bf78ed6947
fix: Loan Repayment code clean up and other fixes
2020-04-16 22:53:47 +05:30
Deepesh Garg
9e9d44d139
fix: Loan topup test
2020-04-15 11:20:24 +05:30
Deepesh Garg
40dcfd148b
fix: Import Error
2020-04-13 16:29:58 +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
baa7521d02
fix: Allow repayment from Salary only for term loans
2020-04-13 13:18:11 +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
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Deepesh Garg
88898abe6c
fix: Randomly failing loan repayment test
2020-03-27 10:27:15 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Shivam Mishra
05d74bbcf9
feat: added loan management page
2020-03-12 16:38:49 +05:30
Deepesh Garg
09188e4a21
fix: Remove fetch from loan_application.json
2020-03-01 22:16:27 +05:30
Deepesh Garg
eee7f77d47
fix: Add loan to value ratio in loan security type
2020-02-29 08:58:15 +05:30
Deepesh Garg
c88a7f8317
fix: User permission for Loan repayment doctype
2020-02-26 16:49:58 +05:30
Deepesh Garg
b5c5bdd671
fix: API fix for loan security pledge creation
2020-02-26 12:57:05 +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
