Deepesh Garg
0bac030ca7
chore: Linting Issues
2022-07-11 22:04:52 +05:30
Deepesh Garg
d933ff5cf6
chore: Linting Issues
2022-07-11 21:50:01 +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
Labeeb Mattra
0ed6382ab6
fix indent and imports
2022-07-07 17:40:50 +05:30
Labeeb Mattra
8434ec09c3
fix lint
2022-07-07 17:20: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
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
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
marination
aa043fe961
fix: Use fallback conversion factor while setting incoming rate for petty purchase
...
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
2022-07-05 19:43:02 +05:30
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting
2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e
fix: timeout error while reposting
2022-07-05 18:45:13 +05:30
rohitwaghchaure
c2432778ef
Merge branch 'develop' into fix_test_for_pr_tool
2022-07-05 17:18:50 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials
...
fix: test case
2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b
fix: test case
2022-07-05 15:10:28 +05:30
Ankush Menat
90942d2ba5
chore: remove currency info from boot ( #31520 )
...
refactor: remove currency info from boot
Framework loads this info by default now, so no need to add it here.
2022-07-05 11:22:32 +05:30
Deepesh Garg
d5da8c7403
Merge pull request #31516 from deepeshgarg007/previsional_accounting_report
...
fix: Incorrect provisional expense booking while reposting
2022-07-04 20:28:10 +05:30
Deepesh Garg
60aad31162
fix: Incorrect provisional expense booking while reposting
2022-07-04 18:38:26 +05:30
ruthra kumar
104c45ecc4
fix: test pr output for amount and currency
2022-07-04 18:04:29 +05:30
Deepesh Garg
ac9d38aa1c
Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool
...
fix: Use account currency on Payment Reconciliation tool
2022-07-03 19:20:29 +05:30
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
Deepesh Garg
b168d2fc25
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-03 11:02:32 +05:30
Deepesh Garg
e54ec4b9b6
chore: use get instead of . operator
2022-07-03 11:02:21 +05:30
Deepesh Garg
6bb203d1f5
Merge pull request #31410 from alyf-de/apply-price-list
...
fix: apply price list rate
2022-07-02 22:47:55 +05:30
Deepesh Garg
a4edcfe33b
Merge pull request #31493 from deepeshgarg007/internal_invoicing_references
...
fix: Internal PI link in Sales Invoice
2022-07-02 22:47:10 +05:30
Deepesh Garg
38352b3e46
test: Add test for einvoice discounts
2022-07-02 22:27:20 +05:30
Deepesh Garg
b4f6429e32
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-02 18:42:31 +05:30
Ankush Menat
7e40c86c56
fix(UX): dont apply price list when changing batch on mapped docs ( #31503 )
...
fix(UX): dont apply price list batch change on mapped docs
2022-07-01 20:08:16 +05:30
ruthra kumar
c9d67defd8
test: PR output should have account currency
2022-07-01 13:02:14 +05:30
ruthra kumar
219855311d
fix: wrong amount fetched in payment reconciliation tool
...
- fetch amount on account currency for outstanding invoices and
- unreconcilied dr/cr notes
- fix currency field name in payment ledger entry creation
2022-07-01 12:47:07 +05:30
mergify[bot]
7b093e5803
fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days (backport #31425 ) ( #31432 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-07-01 10:35:59 +05:30
Deepesh Garg
536e768ba9
fix: Internal PI link in Sales Invoice
2022-06-30 21:29:54 +05:30
