Rucha Mahabal
f6fb00b59d
test: Matching Loan Repayment query in Bank Reco
2022-07-08 19:28:38 +05:30
Ankush Menat
4ec85cb2f0
test: don't silently fail reposts in tests ( #31559 )
2022-07-08 19:28:03 +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
Marica
dc3d492c83
Merge branch 'develop' into rfq-email-addressing
2022-07-08 15:39:20 +05:30
marination
300e812a1f
chore: Instantiate variable unconditionally
2022-07-08 15:38:44 +05:30
Nabin Hait
8b69a3ec7a
Merge pull request #30955 from s-aga-r/subcontracting
...
feat: subcontracting module
2022-07-08 15:21:46 +05:30
Nabin Hait
a768b4cec3
Merge branch 'develop' into subcontracting
2022-07-08 15:21:03 +05:30
rohitwaghchaure
0c2e0693eb
Merge pull request #31553 from s-aga-r/fix/job-card/report/status
...
fix: status filter in Job Card Summary
2022-07-08 11:56:18 +05:30
Sagar Sharma
57b6dab1da
fix: status filter in Job Card Summary
2022-07-07 23:19:17 +05:30
Deepesh Garg
832a863d1e
Merge pull request #31451 from Altizo/develop
...
fix: update ru translate
2022-07-07 21:15:22 +05:30
Deepesh Garg
5eb2e71f0f
Merge branch 'develop' into develop
2022-07-07 21:15:03 +05:30
Rucha Mahabal
108cce2785
refactor: rewrite raw sql queries with frappe.qb and database API
2022-07-07 19:00:19 +05:30
Labeeb Mattra
0ed6382ab6
fix indent and imports
2022-07-07 17:40:50 +05:30
Rucha Mahabal
64075cbebc
Merge branch 'develop' into hr-separation
2022-07-07 17:36:01 +05:30
Labeeb Mattra
8434ec09c3
fix lint
2022-07-07 17:20:21 +05:30
marination
88ac519b24
fix: Use Contact Name instead of Supplier in RFQ Email
2022-07-07 16:59:23 +05:30
Sagar Vora
93f87cb6e2
chore: remove missed code for India localisation
2022-07-07 16:41:41 +05:30
Ankush Menat
bc3f99321a
refactor: department creation ( #31548 )
...
- all department creation always fails after first company, this is
handled in exception handling code but better to not attempt this in
first place.
- move department creation to company.py this has nothing to do with
setup and previous function signature made no sense.
2022-07-07 16:05:18 +05:30
marination
7a6ee8cf2d
chore: Remove image
use in website item list
2022-07-07 14:25:02 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Deepesh Garg
0b5101d9c7
Merge pull request #31546 from deepeshgarg007/regional_quotation
...
fix: Unable to open quotation
2022-07-07 11:53:34 +05:30
Deepesh Garg
f73408bfd6
fix: Unable to open quotation
2022-07-07 10:47:48 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Suraj Shetty
891fd70882
Merge pull request #31541 from surajshetty3416/update-library-usage
2022-07-07 09:41:05 +05:30
Suraj Shetty
c9dc902dee
Merge branch 'develop' into update-library-usage
2022-07-07 09:40: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
Labeeb Mattra
900c878e03
update loan interest accrual types
2022-07-06 18:52:04 +05:30
Aditya Hase
7053bb9bb8
fix: Maintain backward compatibility with older bench versions ( #31542 )
...
Older versions of bench depend on `name` in setup.py
Setting it to `frappe` causes some weird behavior like moving `apps/erpnext` to `apps/frappe`
2022-07-06 17:32:21 +05:30
Suraj Shetty
f0e8a518cd
fix: Update font awesome path
2022-07-06 15:10:39 +05:30
Suraj Shetty
32fd753a14
fix: Update html2text import path
2022-07-06 15:09:44 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
rohitwaghchaure
8eb676eb5a
Merge pull request #31519 from rohitwaghchaure/fixed-time-out-error-reposting
...
fix: timeout error while reposting
2022-07-06 11:45:02 +05:30
Marica
9b6bb1b3fc
Merge pull request #31529 from marination/petty-purchase
...
fix: Use fallback conversion factor while setting incoming rate for petty purchase
2022-07-06 00:38:37 +05:30