Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,945 Commits 3 Branches 0 Tags 1 GiB
348a674df9
Commit Graph

231 Commits

Author SHA1 Message Date
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Jannat Patel
b4ea185eca
fix: added company filter while fetching loans (#26295) 
* fix: added company filter while fetching loans

* fix: added set_query in refresh

* fix: quotes

* fix: tests

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-07-12 13:15:41 +05:30
Jannat Patel
38994bd494
fix: Added Company filters for Loan (#26294) 
* fix: loan validations

* fix: added company filter while fetching loans

* fix: tests
 2021-07-12 13:01:31 +05:30
Deepesh Garg
9181dde86a fix: Cancelation of Loan Security Pledges 2021-06-29 17:18:39 +05:30
Deepesh Garg
52992b345f
Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary 
fix: Sanctioned loan amount limit check
 2021-06-18 23:30:54 +05:30
Deepesh Garg
81c97c13ce fix: Sanctioned loan amount limit check 2021-06-18 19:57:53 +05:30
Deepesh Garg
22e75725ea fix: Sanctioned loan amount limit check 2021-06-18 17:25:37 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans (#25856) 2021-05-31 19:48:31 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Deepesh Garg
84ec295b43
Merge pull request #25546 from deepeshgarg007/loan_schedule_fixes 
fix: Minor fixes in loan
 2021-05-02 22:35:34 +05:30
Deepesh Garg
c571141c1f fix: Test cases 2021-05-02 15:31:04 +05:30
Deepesh Garg
824f089569 fix: Auto write off on loan closure 2021-05-01 22:07:13 +05:30
Deepesh Garg
1efafb3ce8 fix: Do not roundoff balance amount 2021-05-01 21:52:43 +05:30
Afshan
ab052599c0 fix: allow to cancel loan with cancelled replayment entry 2021-04-28 20:21:04 +05:30
Deepesh Garg
047044f975 fix: Add amend perm for loan and system manager for loan doctypes 2021-04-19 18:27:37 +05:30
Deepesh Garg
b58590251b fix: minor improvements and tests 2021-04-10 19:55:36 +05:30
Deepesh Garg
f38a653a08 fix: Show exact error message in datetime 2021-04-10 18:34:51 +05:30
Deepesh Garg
e7efbc1d33 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix 2021-04-10 18:33:38 +05:30
Deepesh Garg
37d6c19a34 fix: Consider paid repayment entries in subsequent loan repayments 2021-04-10 18:33:26 +05:30
Deepesh Garg
5af6aea9f9 fix: Posting Date check 2021-04-07 09:46:13 +05:30
Deepesh Garg
d551940dc5 fix: Remove comments 2021-04-06 23:55:48 +05:30
Deepesh Garg
a42194f3d5 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2 2021-04-06 23:53:34 +05:30
Deepesh Garg
dfe91b5df3
Merge pull request #25212 from deepeshgarg007/loan_shortfall_preference 
fix: Give first preference to loan security on repayment
 2021-04-06 11:06:03 +05:30
Deepesh Garg
015fd681ec fix: Give first preference to loan security on repayment 2021-04-06 00:49:46 +05:30
Deepesh Garg
7f10044195 fix: Typo 2021-04-02 12:04:42 +05:30
Deepesh Garg
eea20f83ab fix: Add shortfall ratio in Loan Security Shortfall 2021-04-01 18:13:54 +05:30
Deepesh Garg
48d5a65ef5 fix: Add test for pending shortfall update 2021-03-22 21:19:19 +05:30
Deepesh Garg
f112ce14cf fix: Pending shortfall update on processing loan security shortfall 2021-03-22 18:33:55 +05:30
Deepesh Garg
a2e4564464 fix: Prevent non sequential repayment entries 2021-03-15 10:32:38 +05:30
Deepesh Garg
61fb9bf869 fix: Loan Repayment entry cancellation on salary slip cancel 2021-03-14 21:25:21 +05:30
Deepesh Garg
3dd0e49525
Merge pull request #24703 from deepeshgarg007/loan_test_precision_fix_new 
fix: Precision fixes in loans
 2021-02-23 11:22:52 +05:30
Deepesh Garg
b5a2320b33 fix: Precision fixes in loans 2021-02-22 23:04:48 +05:30
Deepesh Garg
d780f56ba8
Revert "fix: Error handling in loan reports and precision fixes" 2021-02-22 15:12:35 +05:30
Deepesh Garg
e4964a0c6c fix: Update color in charts 2021-02-21 21:03:42 +05:30
Deepesh Garg
e53fd87669 fix: Rearrange cards 2021-02-21 20:57:56 +05:30
Deepesh Garg
cbb4fe2cce fix: Add cards 2021-02-21 20:57:30 +05:30
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