Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,155 Commits 3 Branches 0 Tags 1 GiB
c0b889b94d
Commit Graph

194 Commits

Author SHA1 Message Date
Deepesh Garg
bc857522ad fix: Loan Interest Accrual Chart 2021-02-19 10:13:56 +05:30
Deepesh Garg
535dc4aea2 fix: Do not round off per day interest 2021-02-15 15:54:25 +05:30
Deepesh Garg
429fb3bba8 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix 2021-02-15 14:10:10 +05:30
Deepesh Garg
9bf05ad927 feat: Loans Dashboard 2021-02-15 13:32:50 +05:30
Deepesh Garg
ab88ec208e fix: Error handling in loan reports 2021-01-31 12:31:46 +05:30
Suraj Shetty
0a8939e1c1 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-29 08:56:22 +05:30
Deepesh Garg
7e3f5e04ab fix: LTV ration in interest report 2021-01-28 23:25:23 +05:30
Deepesh Garg
7a4db2214a fix: Division by 0 error in security exposure reports 2021-01-26 10:10:35 +05:30
Deepesh Garg
91eb9bb5c2 fix: Add loan to value field in Loan Interest Report 2021-01-24 19:15:57 +05:30
Suraj Shetty
bbc6bfd3c3 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2021-01-19 09:34:06 +05:30
Deepesh Garg
c3d82a889a
Merge pull request #24370 from deepeshgarg007/loan_report_and_enhancements 
feat: Loan report and enhancements
 2021-01-18 12:26:45 +05:30
Deepesh Garg
52172252b4 fix: Interest calculations in Loan Interest Report 2021-01-18 12:07:54 +05:30
Deepesh Garg
2cb12e6f70 fix: Loan Security name fetch 2021-01-17 18:38:21 +05:30
Deepesh Garg
dd25ecb70d fix: Add reports in Desk Page 2021-01-17 17:52:02 +05:30
Deepesh Garg
ec60063155 fix: Auto Loan Write Off 2021-01-17 17:39:51 +05:30
Deepesh Garg
914ab7e4b0 fix: Add filters and currency in reports 2021-01-17 14:40:32 +05:30
Deepesh Garg
addea9697d feat: Loan Exposure report 2021-01-17 11:36:51 +05:30
Deepesh Garg
7976d12ed0 fix: Applicant-Wise Loan Security Exposure report 2021-01-16 18:10:01 +05:30
Anupam Kumar
4a649a4fce
fix: removing payment_field from loan repayment closuer (#24291) 2021-01-13 21:10:49 +05:30
Rushabh Mehta
b6c7ba2eea fix(minor): Rename loan workspace to loan management for naming 2021-01-12 11:34:11 +05:30
Deepesh Garg
d3634f6dac feat: Loan Interest Report 2021-01-10 19:26:45 +05:30
Deepesh Garg
1b208e0695 fix: Add total loan interest amount field in loans 2021-01-10 12:29:55 +05:30
Deepesh Garg
05fe7ac29c fix: fieldname 2021-01-06 09:10:28 +05:30
Deepesh Garg
dd768a07c5 fix: Sanctioned loan security unpledge 2021-01-05 23:55:00 +05:30
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge 
fix: Partial loan security unpledging
 2020-12-30 21:37:52 +05:30
Deepesh Garg
9716216632 fix: check for string types 2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c fix: Partial loan security unpledging 2020-12-30 20:24:15 +05:30
Deepesh Garg
8b7ebe5044 fix: Test Case cleanup and fixes 2020-12-30 12:45:46 +05:30
Shivam Mishra
fd044b032f Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements 2020-12-16 13:21:10 +05:30
Rushabh Mehta
fec8dba16c fix(merge): merge develop 2020-12-08 16:23:09 +05:30
Shivam Mishra
2fa3cac814 feat: update workspace folders 2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86 feat: rename desk page to workspace 2020-12-03 15:39:53 +05:30
Shivam Mishra
9aaca25edb feat: update desk page json 2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c chore: update all desk pages 2020-12-01 12:51:38 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll (#23519) 
* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* Update asset_value_adjustment.py

* patch: update columns

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: multi-currency payroll

* fix: refactor and added conditions

* fix: uncommented code

* style: removed comments

* fix: missing argument

* style: styling changes

* fix: test cases

* patch: update columns

* Update asset_value_adjustment.py

* style: formating

* style: formatting

* fix: 1st review

* fix: refactor

* Revert "fix: refactor"

This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.

reverting to previous state

* Revert "fix: 1st review"

This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.

reverting before 1st review

* fix: 2nd review changes

* fix: test cases

* fix: added call to fetch exchange rate

* fix: remove unnecessary code

* fix: refactor

* fix: refactor patch

* fix: refactor

* fix: refactor

* fix: clear test data

* fix: slider

* feat: Added company field in leave encashment and employee benefit

* refactor: Refactored multi-currency payroll patch

* fix: currency column in salary register

* refactor: Refactored code for making bank and return entry against employee advance

* fix: minor cleanup

* fix: fixed translation

* fix: removed salary component type

* fix: fixed sider issues

* fix: translation and slider

* style: formatted msg

* fix: fixed slider

* fix: travis

* fix: refactor

* fix: slider

* fix: slider

* fix: slider

* fix: travis

* fix: patch

* fix: patch

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: travis

* fix: re-run travis

* fix: rerun travis

* fix: rerun travis

* fix: rerun travis

* fix: travis rerun

* fix: increased throttle_user_limit from 60 to 100

* fix: patch

* fix: patch

* fix: assign payroll payable account as default payroll payable account in SSA

* fix: removed debugger

* fix: slider

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-12-01 09:11:05 +05:30
Shivam Mishra
27e7c264f2 fix: link type 2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b feat: update desk pages 2020-11-30 14:58:00 +05:30
Deepesh Garg
a339752ba4
fix: Loan disbursement amount validation (#24000) 2020-11-25 08:54:51 +05:30
Deepesh Garg
69232f8dd1 fix: Loan application link on creating loan 2020-11-17 22:00:41 +05:30
Shivam Mishra
bed717b442 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-11-12 11:32:59 +05:30
Deepesh Garg
101bad3ea1 fix: Remarks for penalty GL Entry 2020-11-10 17:53:50 +05:30
Deepesh Garg
d53abf194e fix: Party for loan ledger entries 2020-11-09 18:34:38 +05:30
Deepesh Garg
dd94587ef8 fix: Loan write off precision issue 2020-11-07 17:08:30 +05:30
Deepesh Garg
2ad015450e fix: Remarks fix 2020-11-07 00:14:40 +05:30
Deepesh Garg
3899079bb9 fix: Loan seurity unpledge msg improvement 2020-11-06 17:39:54 +05:30
Deepesh Garg
3e69756e15 fix: Add better remarks for Loan GL entries 2020-11-06 14:25:09 +05:30
Deepesh Garg
1145b3796c fix: Remove accrual type from process 2020-11-05 21:21:40 +05:30
Deepesh Garg
a2bff7fbfc fix: Penalty amount calculation fix 2020-11-05 21:14:29 +05:30
Deepesh Garg
49cc57e76e fix: Negative amount check for amounts 2020-11-05 21:14:07 +05:30
Deepesh Garg
c9a6135d6c fix: Interest accrual after loan topup 2020-10-28 13:38:15 +05:30
Deepesh Garg
13f4b3fc17 fix: Translation syntax 2020-10-26 19:01:36 +05:30
Deepesh Garg
a630de56e9 fix: Loan disbursement amount validation check 2020-10-26 18:53:56 +05:30
Deepesh Garg
5b4742fd25 fix: Permission fixes for some doctypes 2020-10-26 16:56:05 +05:30
Deepesh Garg
d63fbd79f4 fix: Unaccrued interest from last accrual date instead of disbursement date 2020-10-26 14:20:55 +05:30
Deepesh Garg
2b3f8e0c3b fix: Cancel repayment accrual interest entry on payment cancellation 2020-10-23 19:02:24 +05:30
Deepesh Garg
cd2c90451e fix: Unaccrued interest after disbursal 2020-10-22 21:50:06 +05:30
Deepesh Garg
2c97244bad fix: Test Cases 2020-10-22 09:34:27 +05:30
Deepesh Garg
3f177bffac fix: Add test for loan top up 2020-10-21 22:15:18 +05:30
Deepesh Garg
8f9bab79a7 fix: Update no copy fields 2020-10-21 19:03:13 +05:30
Deepesh Garg
13cbda110d fix: Test Case 2020-10-21 16:11:52 +05:30
Deepesh Garg
2f65ab5355 fix: Validatiion for loan write off amountt 2020-10-21 10:40:59 +05:30
Deepesh Garg
8cd8dbe15d fix: Add write off test 2020-10-18 22:26:09 +05:30
Deepesh Garg
9945ccc0cc fix: Write Off amount handling in Loan accrual and closure 2020-10-18 22:25:24 +05:30
Deepesh Garg
c0e24735e3 feat: Add loan write off doctype 2020-10-17 22:31:36 +05:30
Deepesh Garg
66967c6d45 fix: Loan Security unpledge on loan cancel 2020-10-13 18:10:51 +05:30
Deepesh Garg
8c13fded17 fix: Add unaccrued interest in interest amount for loan closure 2020-10-13 09:23:04 +05:30
Deepesh Garg
a034311b1b fix: Acrual type 2020-10-11 20:52:02 +05:30
Deepesh Garg
d86b7c5537 fix: Remove repayment type 2020-10-11 00:37:34 +05:30
Deepesh Garg
6dccf79250 fix: Add accrual type and penalty field in interest accrual 2020-10-10 23:32:57 +05:30
Deepesh Garg
6d27adccfc fix: Button to close loan 2020-10-10 23:28:39 +05:30
Deepesh Garg
51c6cf692e fix: Add method for loan closure 2020-10-10 23:20:36 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Deepesh Garg
dc84633860
Merge pull request #23301 from deepeshgarg007/closed_loan_amount 
fix: Amount for closed loans
 2020-09-08 21:32:54 +05:30
Deepesh Garg
846e6d4803 fix: Add test 2020-09-08 21:32:06 +05:30
Deepesh Garg
f247686ace fix: Amount for closed states 2020-09-08 21:26:06 +05:30
Deepesh Garg
b828e2fcf4
Merge pull request #23287 from deepeshgarg007/lsu_api_fix 
fix: Only submitted Loan security pledges should be approved
 2020-09-07 23:23:55 +05:30
Deepesh Garg
03b0ad4f98 fix: Only submitted Loan security pledges should be approved 2020-09-07 23:22:21 +05:30
Deepesh Garg
af1c4ba443
Merge pull request #23279 from deepeshgarg007/loan_closure_interest 
fix: Pending loan interest accrual on loan closure
 2020-09-07 15:01:33 +05:30
Deepesh Garg
afefa878b0 fix: Pending loan interest accrual on loan closure 2020-09-07 14:57:44 +05:30
Deepesh Garg
da6074a84c fix: Pending loan interest accrual on loan closure 2020-09-07 14:55:04 +05:30
Deepesh Garg
5158d0fbba fix: Repayment Method not visible correctly 2020-09-05 21:16:57 +05:30
Deepesh Garg
1b4ed454d2 fix: Add reference no and descripiton field in Loan Security Pledge and Unpledge 2020-09-04 22:42:41 +05:30
Deepesh Garg
e4c38e5fe5 fix: Remove print statement 2020-09-04 22:30:13 +05:30
Deepesh Garg
4d636fde3a fix: API changes in loan security unpledge utility 2020-09-04 22:23:30 +05:30
Deepesh Garg
14718e2bde fix: Add unit test for pending principal amount 2020-08-31 21:21:05 +05:30
Deepesh Garg
25042a22eb fix: Pending amount after loan closure request 2020-08-31 19:17:29 +05:30
Deepesh Garg
e8b121c2c2 fix: Add status in field list 2020-08-31 11:31:48 +05:30
Deepesh Garg
ce29757bff fix: Import flt 2020-08-31 11:26:51 +05:30
Deepesh Garg
a4259208e7 feat: Utility function to get possible loan disbursal amount 2020-08-30 23:09:23 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Deepesh Garg
e1e847a3f7 feat: Enhancement in Loan Topups 2020-08-16 20:57:39 +05:30
Deepesh Garg
a2249e013d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes 2020-08-15 18:28:04 +05:30
Deepesh Garg
1151f888ba fix: Set pledge amount before setting loan amount 2020-08-13 18:52:23 +05:30
marination
8264fcd0a5 fix: Only validate repayment if term loan 2020-08-13 12:47:34 +05:30
marination
6988fbb82d fix: Validate or Set Loan Amount first 2020-08-13 12:17:13 +05:30
Deepesh Garg
2633e292a5 fix: Is Secured Loan check mapping 2020-08-11 18:03:28 +05:30
Deepesh Garg
b98088bb01
Merge branch 'develop' into loan_patch_and_fixes 2020-08-07 13:27:40 +05:30
Shivam Mishra
de80553d89 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-03 12:34:05 +05:30
Deepesh Garg
4104887abb fix: fieldname in filter 2020-08-02 18:23:54 +05:30
Deepesh Garg
d909669a18 fix: Test cases 2020-08-02 17:00:53 +05:30