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 |
|