Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,388 Commits 3 Branches 0 Tags 1 GiB
67095d239f
Commit Graph

55 Commits

Author SHA1 Message Date
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
Deepesh Garg
b9dc21129c fix: Loan Seurity shortfall calculation fixes 2020-08-01 22:51:40 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Deepesh Garg
04e8af7dca Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes 2020-07-20 09:53:26 +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
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
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
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
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
5cf90baf16 feat: rename loan management to loan on Desk Page 2020-05-22 15:09:57 +05:30
Deepesh Garg
a63fda9097 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes 2020-05-17 23:37:05 +05:30
Deepesh Garg
513099d624 fix: Description for various fields 2020-05-17 23:26:37 +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