nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 05:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,287 Commits 483 Branches 1,768 Tags
v14.58.1
Commit Graph

292 Commits

Author SHA1 Message Date
Anand Baburajan
008400d287 fix: calc monthly_repayment_amount correctly in regenerate_repayment_schedule (#38636) 2023-12-08 16:34:29 +05:30
Anand Baburajan
922ace4076 fix: close employee loan on write off (#37638) 
* fix: exclude written off amount while calculating loan repayment

* fix: revert exclude written off amount while calculating loan repayment

* fix: close employee loan on write off
 2023-10-24 09:38:08 +05:30
Anand Baburajan
480a0ca7a8 fix: fetch logic for repay_from_salary in loan_repayment [v14] (#37135) 
* fix: fetch logic for repay_from_salary in loan_repayment

* chore: only fetch repay_from_salary if field exists
 2023-09-19 15:18:35 +05:30
Deepesh Garg
43d9a10093 Merge pull request #36985 from deepeshgarg007/employee_loan_repayment 
fix: Update party type for payroll payable account
 2023-09-07 10:17:19 +05:30
Deepesh Garg
1894371b68 chore: Update function 2023-09-06 16:29:12 +05:30
Deepesh Garg
f251d6cb69 fix: Update party type for payroll payable account 2023-09-06 15:18:21 +05:30
Anand Baburajan
09e2f24329 fix: allow payment_account of loan repayment to be edited (#36948) 2023-09-05 12:44:14 +05:30
Deepesh Garg
e5bc888798 Merge pull request #36614 from deepeshgarg007/loan_repayment_cancel_v14 
fix: Allow backdated repayment cancels for term loans
 2023-08-13 11:57:49 +05:30
Deepesh Garg
1377cf4cf1 fix: Allow backdated repayment cancels for term loans 2023-08-12 20:01:04 +05:30
Anand Baburajan
8abc0adb18 chore: add warning for lending separation (#36569) 2023-08-09 15:07:40 +00:00
mergify[bot]
070df97663 fix: loan interest accrual date (#35695) 
fix: loan interest accrual date (#35695)

fix: loan interest accrual date

---------

Co-authored-by: Abhinav Raut <abhinav.raut@zerodha.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 2a24423ad2)

Co-authored-by: Abhinav Raut <abhinavrautcs@gmail.com>
 2023-06-19 09:14:21 +05:30
mergify[bot]
6140f13f3a fix: Interest Accrual on Loan Topup (#35555) 
fix: Interest Accrual on Loan Topup (#35555)

* fix: Interest Accrual on Loan Topup

* chore: CI

* chore: Ignore test

(cherry picked from commit 2ffcca6f10)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-07 10:12:12 +05:30
mergify[bot]
841d2e4b2c refactor: Workspace cleanup (backport #35409) (#35505) 
* refactor: Workspace cleanup

(cherry picked from commit 243c49c550)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json
#	erpnext/assets/workspace/assets/assets.json

* fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces

(cherry picked from commit 0b28f641ad)

* fix: Added pos links in Selling workspace

(cherry picked from commit 86f88817a9)

* fix: removed duplicate links of manufacturing workspace

(cherry picked from commit 5cf4c8c8b7)

* fix: Rearranged accounting module links

(cherry picked from commit e78a7de1e5)

# Conflicts:
#	erpnext/accounts/workspace/accounting/accounting.json

* chore: typo

(cherry picked from commit bb67cc03df)

* chore: conflicts

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-05-31 16:51:54 +05:30
mergify[bot]
52bfb66729 feat: Add filters in Loan Interest Report (#33907) 
* feat: Add filters in Loan Interest Report (#33907)

(cherry picked from commit e478a5d0ce)

* chore: remove flaky tests

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:20:10 +05:30
Abhinav Raut
5edaf83733 fix: disbursable amount on currrent security price 
(cherry picked from commit fe87c27acd)
 2022-11-25 09:48:42 +00:00
Abhinav Raut
2f5033b70f fix: repayment schedule regeneration 
(cherry picked from commit d6ab2b3b87)
 2022-11-11 08:53:59 +00:00
Deepesh Garg
2348c42c79 chore: Update tests 
(cherry picked from commit e59b147a62)
 2022-10-23 14:08:36 +00:00
Deepesh Garg
1b3a0be0f1 chore: Add repayment date on option 
(cherry picked from commit ef0cb17faf)
 2022-10-23 14:08:35 +00:00
Deepesh Garg
b9bf5666bc chore: label post save 
(cherry picked from commit bf7a51791a)
 2022-10-23 14:08:34 +00:00
Deepesh Garg
25e87641b6 chore: Add patch to update repayment schedule type in loan documents 
(cherry picked from commit 679b5ed551)

# Conflicts:
#	erpnext/patches.txt
 2022-10-23 14:08:34 +00:00
Deepesh Garg
8550bbde27 chore: Update labels as per repayment type 
(cherry picked from commit 2ddee50f27)
 2022-10-23 14:08:32 +00:00
Deepesh Garg
6ce32fd5a9 feat: Repayment schedule types for term loans 
(cherry picked from commit 76c6ccab5d)
 2022-10-23 14:08:32 +00:00
Abhinav Raut
b9a249918a fix: pending accrual entries 
(cherry picked from commit f2209045f8)
 2022-09-14 08:45:47 +00:00
Deepesh Garg
52fc10d00c chore: Add check for principal amount 
(cherry picked from commit a76d3827ec)
 2022-08-30 15:47:11 +00:00
Deepesh Garg
1b9082e07b fix: Loan Interest accruals for 0 rated loans 
(cherry picked from commit eefc9b7172)
 2022-08-30 15:47:11 +00:00
Abhinav Raut
8fdbbf374d fix: term loan interest calculation 
(cherry picked from commit 534d7ce64b)
 2022-08-11 10:18:24 +00:00
Abhinav Raut
66e5202642 fix: process loan interest accrual 
(cherry picked from commit 9ef8d5c5c3)
 2022-08-11 10:18:24 +00:00
Rucha Mahabal
d8aa1c59f1 Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Deepesh Garg
0bac030ca7 chore: Linting Issues 2022-07-11 22:04:52 +05:30
Deepesh Garg
d933ff5cf6 chore: Linting Issues 2022-07-11 21:50:01 +05:30
Abhinav Raut
13b7ed1e2c fix: on cancel for loan refund 2022-07-08 17:58:36 +05:30
Labeeb Mattra
35f2717ad2 Consider refund_amount in pending principal amount 2022-07-08 17:53:29 +05:30
Labeeb Mattra
9df1413adb fix excess amount calculation in loan refund 2022-07-08 17:52:36 +05:30
Labeeb Mattra
245b0c7818 Update adjustment_type field options 2022-07-08 16:49:19 +05:30
Labeeb Mattra
6cc09ef3a2 fix adjustment amount field name 2022-07-08 16:38:41 +05:30
Labeeb Mattra
0ed6382ab6 fix indent and imports 2022-07-07 17:40:50 +05:30
Labeeb Mattra
8434ec09c3 fix lint 2022-07-07 17:20:21 +05:30
Labeeb Mattra
1b5b2138ee Use adjustment amounts in pending principal amnt 2022-07-06 18:52:04 +05:30
Labeeb Mattra
a1a51ce1a6 Add ref no to balance adjustment remarks 2022-07-06 18:52:04 +05:30
Labeeb Mattra
74dbf8c5d9 Add reference number to repayment remarks 2022-07-06 18:52:04 +05:30
Labeeb Mattra
27a8e16b28 Add NPA checkbox in Loan 2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d6e4898c4 Update list view for Accrual and Shortfall 2022-07-06 18:52:04 +05:30
Labeeb Mattra
6febcd529b Remove loan account field from doctype 2022-07-06 18:52:04 +05:30
Labeeb Mattra
7d468a8778 Use new adjustment amount fields 2022-07-06 18:52:04 +05:30
Labeeb Mattra
d6f632a770 Seperate credit and debit adjust amount fields in Loan 2022-07-06 18:52:04 +05:30
Abhinav Raut
5c0a25012c feat: add adjustment amount to loan 
- fix: bugs in loan balance adjustment
 2022-07-06 18:52:04 +05:30
Labeeb Mattra
2e8f056514 Add Loan Balance Adjustment doctype 2022-07-06 18:52:04 +05:30
Labeeb Mattra
e1682965c5 Add Loan Refund doctype 2022-07-06 18:52:04 +05:30
Labeeb Mattra
88cd780ca1 Add refund amount to loan 2022-07-06 18:52:04 +05:30
Labeeb Mattra
a81da2ea85 Add more loan interest accrual types 2022-07-06 18:52:04 +05:30