nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-19 11:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,227 Commits 636 Branches 1,812 Tags
32a9575f07ebfb8ec807f1a5133d063de132ea67
Commit Graph

260 Commits

Author SHA1 Message Date
Abhinav Raut
ef86b437cb fix: pending accrual entries 
(cherry picked from commit f2209045f8)
 2022-09-14 08:45:27 +00:00
Deepesh Garg
e78a7679a4 fix: Loan amount post write off 2022-09-13 11:53:11 +05:30
Deepesh Garg
ac320e4d55 feat: Ability to manually update loan amount in Salary Slips 2022-09-12 15:05:42 +05:30
Deepesh Garg
b7c94e38a6 chore: Add check for principal amount 
(cherry picked from commit a76d3827ec)
 2022-08-30 15:46:39 +00:00
Deepesh Garg
a3698524ca fix: Loan Interest accruals for 0 rated loans 
(cherry picked from commit eefc9b7172)
 2022-08-30 15:46:38 +00:00
Deepesh Garg
8217c6dd9f chore: Linting issues and test case fixes 2022-08-30 10:24:31 +05:30
Deepesh Garg
e64e812679 fix: Loan Write-off for term loans 2022-08-29 18:33:40 +05:30
Abhinav Raut
8dea238d12 fix: term loan interest calculation 
(cherry picked from commit 534d7ce64b)
 2022-08-11 10:18:04 +00:00
Abhinav Raut
acbed434c2 fix: process loan interest accrual 
(cherry picked from commit 9ef8d5c5c3)
 2022-08-11 10:18:04 +00:00
Deepesh Garg
fb3725752f chore: resolve conflicts 2022-08-08 11:53:49 +05:30
Abhinav Raut
16c94d292c fix: pending principal- amount 
(cherry picked from commit a272d73dd9)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.json
 2022-08-05 10:35:05 +00:00
Deepesh Garg
bdd15895ff chore: resolve conflicts 2022-07-14 17:06:01 +05:30
Deepesh Garg
0b3958d692 chore: Linting Issues 
(cherry picked from commit 0bac030ca7)
 2022-07-12 12:56:46 +00:00
Deepesh Garg
c2a7dc7754 chore: Linting Issues 
(cherry picked from commit d933ff5cf6)
 2022-07-12 12:56:46 +00:00
Abhinav Raut
8237d94b11 fix: on cancel for loan refund 
(cherry picked from commit 13b7ed1e2c)
 2022-07-12 12:56:45 +00:00
Labeeb Mattra
0713a240a7 Consider refund_amount in pending principal amount 
(cherry picked from commit 35f2717ad2)
 2022-07-12 12:56:45 +00:00
Labeeb Mattra
61b2a1c3cb fix excess amount calculation in loan refund 
(cherry picked from commit 9df1413adb)
 2022-07-12 12:56:44 +00:00
Labeeb Mattra
94be7a95f7 Update adjustment_type field options 
(cherry picked from commit 245b0c7818)
 2022-07-12 12:56:44 +00:00
Labeeb Mattra
7ba0326bdd fix adjustment amount field name 
(cherry picked from commit 6cc09ef3a2)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
86af1ef6ed fix indent and imports 
(cherry picked from commit 0ed6382ab6)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
b995338d0c fix lint 
(cherry picked from commit 8434ec09c3)
 2022-07-12 12:56:43 +00:00
Labeeb Mattra
0856e14c13 Use adjustment amounts in pending principal amnt 
(cherry picked from commit 1b5b2138ee)
 2022-07-12 12:56:42 +00:00
Labeeb Mattra
ff5ee2bbac Add ref no to balance adjustment remarks 
(cherry picked from commit a1a51ce1a6)
 2022-07-12 12:56:42 +00:00
Labeeb Mattra
a36e8a83d8 Add reference number to repayment remarks 
(cherry picked from commit 74dbf8c5d9)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-07-12 12:56:41 +00:00
Labeeb Mattra
d81e7e2421 Add NPA checkbox in Loan 
(cherry picked from commit 27a8e16b28)
 2022-07-12 12:56:41 +00:00
Labeeb Mattra
8181d61293 Update list view for Accrual and Shortfall 
(cherry picked from commit 7d6e4898c4)
 2022-07-12 12:56:40 +00:00
Labeeb Mattra
548aac5b11 Remove loan account field from doctype 
(cherry picked from commit 6febcd529b)
 2022-07-12 12:56:40 +00:00
Labeeb Mattra
de69fee6aa Use new adjustment amount fields 
(cherry picked from commit 7d468a8778)
 2022-07-12 12:56:39 +00:00
Labeeb Mattra
c3e6d7ba29 Seperate credit and debit adjust amount fields in Loan 
(cherry picked from commit d6f632a770)
 2022-07-12 12:56:38 +00:00
Abhinav Raut
d5ce780e87 feat: add adjustment amount to loan 
- fix: bugs in loan balance adjustment

(cherry picked from commit 5c0a25012c)
 2022-07-12 12:56:38 +00:00
Labeeb Mattra
a2125e694d Add Loan Balance Adjustment doctype 
(cherry picked from commit 2e8f056514)
 2022-07-12 12:56:37 +00:00
Labeeb Mattra
0d94653c5b Add Loan Refund doctype 
(cherry picked from commit e1682965c5)
 2022-07-12 12:56:36 +00:00
Labeeb Mattra
d9723a12c4 Add refund amount to loan 
(cherry picked from commit 88cd780ca1)
 2022-07-12 12:56:36 +00:00
Labeeb Mattra
d24cb01a9d Add more loan interest accrual types 
(cherry picked from commit a81da2ea85)
 2022-07-12 12:56:35 +00:00
Labeeb Mattra
ab214bcdfc update loan interest accrual types 
(cherry picked from commit 900c878e03)
 2022-07-12 12:56:35 +00:00
Deepesh Garg
9e0cb2a467 Merge pull request #31262 from frappe/mergify/bp/version-13-hotfix/pr-30155 
fix: Add cost center in loan document (backport #30155)
 2022-06-10 13:16:33 +05:30
Deepesh Garg
4c9422fb1b chore: resolve conflicts 2022-06-10 12:39:12 +05:30
Deepesh Garg
c19dfbe98a fix: Add cost center in loan document 
(cherry picked from commit 5d66cc4c4a)

# Conflicts:
#	erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
#	erpnext/patches.txt
 2022-06-07 08:40:48 +00:00
Deepesh Garg
ef8483d2ea chore: Resolve conflicts 2022-06-07 14:10:44 +05:30
Deepesh Garg
d6d1d79ba0 fix: Close unsecured terms loans 
(cherry picked from commit 815141bf57)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.py
 2022-06-07 08:24:23 +00:00
Deepesh Garg
89c4d518e1 feat: Auto accrue loan interest for backdated term loans 
(cherry picked from commit 96d8b1ef3c)
 2022-05-31 04:28:29 +00:00
Deepesh Garg
ea6d754f73 fix: Loan repayment entries for payroll payable account 
(cherry picked from commit 3128f9603e)
 2022-05-25 05:54:08 +00:00
Abhinav Raut
ad21853b01 fix: precision of total penalty paid 
(cherry picked from commit 589dd17e58)
 2022-05-15 15:21:09 +00:00
Abhinav Raut
5c45737a8f fix: precision of total penalty paid 
(cherry picked from commit 9a86885c0a)
 2022-05-15 15:21:09 +00:00
Abhinav Raut
e958ef26e0 fix: gl entry validation for miniscule loan penalty 
(cherry picked from commit aef65e7417)
 2022-05-15 15:21:08 +00:00
Deepesh Garg
d7af8e1dfe fix: Issues on loan repayment 
(cherry picked from commit 194605823e)
 2022-04-06 06:07:34 +00:00
Deepesh Garg
7bf6de1883 fix: Resolve conflicts 2022-04-02 20:33:46 +05:30
Deepesh Garg
3fc43cb259 fix: Code cleanup 
(cherry picked from commit 1b2c6a5b78)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:50 +00:00
Abhinav Raut
1d9a6efb1b fix: incorrect payable amount for loan closure 
(cherry picked from commit 8c76a76154)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:50 +00:00
Abhinav Raut
c44a4e559b fix: incorrect payable amount for loan closure 
- Add penalty amount to payable amount for loan closure

(cherry picked from commit 4e92926a52)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
 2022-04-02 14:23:49 +00:00