Deepesh Garg
afb33f2049
Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation
...
feat: Date filters on bank reconciliation tool
2023-01-12 18:25:05 +05:30
Deepesh Garg
232726288a
chore: fix fieldnames and order
2023-01-12 17:44:07 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries ( #33481 )
...
* fix: Incorrect exchange rate in payment entries
* test: Update failing tests
2023-01-10 20:12:43 +05:30
Gughan Ravikumar
4d5067d6d4
fix(accounts): currency fields no longer read as strings by validation function in Payment Entry ( #33535 )
...
explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function
2023-01-09 23:26:51 +05:30
sonali
917b2190aa
fix: remove comments
2023-01-09 20:07:24 +05:30
Anand Baburajan
3ae47ab32c
Merge branch 'develop' into asset_depreciation_schedule
2023-01-04 01:34:08 +05:30
Deepesh Garg
1a83a67d41
fix: Get payment entry button not visible in Bank Clearance doc ( #33518 )
2023-01-03 21:34:49 +05:30
Deepesh Garg
9a3d947e89
fix: Exchange gain and loss booking on multi-currency invoice reconciliation ( #32900 )
...
* fix: Exchange gain and loss booking on multi-curreny invoice reconciliation
* test: Update test cases
* chore: Ignore SQL linting rule
* chore: Joural Entry for exchange gainand loss booking
* chore: Journal entry for exchange gain loss booking
* test: Update test case
* chore: Default exchange gain and loss account
2023-01-03 16:55:15 +05:30
anandbaburajan
312e51e8b2
chore: more refactoring and adding test for duplicate asset_depr_schedule
2023-01-03 15:09:04 +05:30
Anand Baburajan
72c2e77a5d
Merge branch 'develop' into asset_depreciation_schedule
2023-01-02 17:07:58 +05:30
anandbaburajan
7c5168eeac
chore: allow manually submitting and cancelling asset depr schedule
2023-01-02 17:07:28 +05:30
ruthra kumar
914b23038c
refactor: Exchange rate revaluation to handle accounts with zero account balance ( #33165 )
...
* refactor: new type for JE - Exchange Gain or Loss
* refactor: skip few validations for Exchanage Gain Or Loss type Jour
* refactor: ERR create 2 journals for handling zero and non-zero compa
1. Additional check box accounts table to identify accounts with zero balance
2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal
* refactor: skips few validation for allowing 0 debit/credit
* fix: General Ledger presentaion currency
* test: fix test case in general ledger
* test: fix failing test case in AR report
2023-01-02 14:33:14 +05:30
sonali
12822f7c36
fix: data format
2022-12-30 14:06:19 +05:30
Deepesh Garg
ad53ecf2b4
fix: Multi-currency issues in Bank Recociliation Tool
2022-12-30 13:37:41 +05:30
sonali
d65243eb65
feat: consolidated auto bank reconciliation
...
Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.
2022-12-29 16:12:25 +05:30
sonali
c764f14f53
fix: pre-commit
2022-12-29 13:58:06 +05:30
sonali
35c29e0226
fix: pre-commit
2022-12-29 13:45:15 +05:30
sonali
f1810803e1
fix: passing from_date and to_date filters in test cases
...
passing from_date and to_date filters in test_linked_payments and test_debit_credit_output for unit testing
2022-12-29 13:07:06 +05:30
sonali
e2614b8a21
fix: pre-commit
2022-12-29 12:21:45 +05:30
sonali
3aaa2f5326
fix: filtered as per reference date
...
On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick.
Also sorted the bank transactions and bank entries as per ascending order date wise.
2022-12-29 12:05:22 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) ( #32714 )
...
* fix: Set default uom conversion factor to 1 for invoices
* chore: set default conversion_factor as 1
* chore: remove print statements
2022-12-29 10:41:36 +05:30
Dany Robert
cabaed9ed2
fix(pricing rule): consider child tables in condition ( #33469 )
2022-12-28 18:05:55 +05:30
Anand Baburajan
6f4e6fafa9
Merge branch 'develop' into asset_depreciation_schedule
2022-12-27 07:36:32 +05:30
anandbaburajan
6d791cabd1
chore: more refactoring
2022-12-26 22:13:11 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry ( #33411 )
2022-12-26 10:17:55 +05:30
anandbaburajan
03662be150
chore: have different functions for draft. active and cancelled depr schedules
2022-12-25 18:05:19 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule
2022-12-23 11:02:17 +05:30
sonali
81e5f71172
fix: json issue
2022-12-21 14:02:54 +05:30
Deepesh Garg
31c95deb88
chore: More fixes
2022-12-20 11:45:51 +05:30
Deepesh Garg
ff48634cbb
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow
2022-12-20 11:42:15 +05:30
Deepesh Garg
e25b98b620
chore: Update test case
2022-12-20 11:42:05 +05:30
Deepesh Garg
6238fd9d9e
Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center
...
fix: Cost Center for tax withholding invoices
2022-12-17 19:24:34 +05:30
sonali
05b6fce03d
feat:filters on bank reconciliation
...
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
2022-12-17 17:15:28 +05:30
Deepesh Garg
2a4eec245a
Merge pull request #33371 from deepeshgarg007/coa_import_srbnb
...
fix: Unable to import COA through importer
2022-12-17 16:42:37 +05:30
Deepesh Garg
3b66920342
fix: Unable to import COA through importer
2022-12-16 19:22:29 +05:30
Deepesh Garg
6bb22c703a
Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision
...
fix: use highest precision for exchange rate.
2022-12-16 15:43:36 +05:30
Deepesh Garg
b76129c1dd
Merge pull request #33286 from artykbasar/develop
...
Subscription Cost center value is fixed to Default value(Bug fix)
2022-12-16 14:44:51 +05:30
sonali
408c89df03
Feat:Filter on Payment Entries and Journal Entries
...
Applying filters on Payement entries and Journal Entries as per reference date and posting date
2022-12-15 18:09:57 +05:30
ruthra kumar
d126c8030f
Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool
...
fix: paid invoices shows up as outstanding when 'cost_center' filter is applied
2022-12-15 15:02:18 +05:30
Anand Baburajan
246d3b4075
Merge branch 'develop' into asset_depreciation_schedule
2022-12-15 14:51:16 +05:30
ruthra kumar
a998a8a2da
test: cost center should not affect outstanding calculation
2022-12-15 14:28:33 +05:30
Deepesh Garg
dc178984ae
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-15 14:15:20 +05:30
Deepesh Garg
076527bb88
Merge pull request #33305 from barredterra/incoterm-named-place
...
feat: incoterm named place
2022-12-15 11:59:54 +05:30
Deepesh Garg
26277cfcf3
chore: resolve errors in test
2022-12-14 21:22:48 +05:30
Deepesh Garg
973ef33eb5
fix: Cost Center for tax withholding invoices
2022-12-14 20:41:00 +05:30
ruthra kumar
8eb93004f7
fix: cost_center filter fix for 'Get Outstanding Invoice' in PE
2022-12-14 16:16:22 +05:30
ruthra kumar
6d9d730759
fix: cost_center filter gives incorrect output
...
filtering on cost center gives invoices that are reconciled as having outstanding
2022-12-14 16:05:15 +05:30
anandbaburajan
22ef342ac7
chore: fixing all tests
2022-12-13 20:48:34 +05:30
anandbaburajan
df134c7c5b
chore: fixing some tests
2022-12-13 16:26:33 +05:30
barredterra
f20370c5ef
refactor: translatable strings and guard clause
2022-12-13 02:36:12 +01:00