feat: Date filters on bank reconciliation tool #33271
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
Adding fields in bank reconciliation tool
sonali8848
requested review from
nextchamp-saqib,
deepeshgarg007 and
ruthra-kumar
as code owners
sonali8848
changed the title
Applying filters on Payement entries and Journal Entries as per reference date and posting date
deepeshgarg007
requested changes
Dec 16, 2022
There was a problem hiding this comment.
- Assuming the user will be filtering either by reference or posting date. So when filter by reference date is enabled those fields should hide
- The commits are non-semantic, please add semantic comments
- This is the first level review, will add more once this cleanup is done
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
Outdated
Show resolved
Hide resolved
| @@ -51,6 +53,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None): | |||
| ], | |||
| filters=filters, | |||
| ) | |||
| transactions = sorted(transactions, key=lambda x: x["date"]) if transactions else [] | |||
There was a problem hiding this comment.
Can add a order by clause in query itself, this seems unnecessary
| @@ -340,6 +343,9 @@ def get_linked_payments(bank_transaction_name, document_types=None): | |||
|
|
|||
| def check_matching(bank_account, company, transaction, document_types): | |||
| # combine all types of vouchers | |||
| filtered_by_reference_date = frappe.db.get_single_value( | |||
There was a problem hiding this comment.
Pass from client side, don't make a DB call
Comment on lines
523
to
531
| from_date = frappe.db.get_single_value("Bank Reconciliation Tool", "bank_statement_from_date") | ||
| to_date = frappe.db.get_single_value("Bank Reconciliation Tool", "bank_statement_to_date") | ||
| from_reference_date = frappe.db.get_single_value( | ||
| "Bank Reconciliation Tool", "from_reference_date" | ||
| ) | ||
| to_reference_date = frappe.db.get_single_value("Bank Reconciliation Tool", "to_reference_date") | ||
| filtered_by_reference_date = frappe.db.get_single_value( | ||
| "Bank Reconciliation Tool", "filtered_by_reference_date" | ||
| ) |
There was a problem hiding this comment.
Pass from the client side
erpnext/hooks.py
Outdated
| @@ -469,8 +469,8 @@ | |||
| bank_reconciliation_doctypes = [ | |||
| "Payment Entry", | |||
| "Journal Entry", | |||
| "Purchase Invoice", | |||
| "Sales Invoice", | |||
| # "Purchase Invoice", | |||
Comment on lines
47
to
620
| callback: (response) => { | ||
| const alert_string = __("Bank Transaction {0} added as Payment Entry", [this.bank_transaction.name]); | ||
| frappe.show_alert(alert_string); | ||
| this.update_dt_cards(response.message); | ||
| this.dialog.hide(); | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| add_journal_entry(values) { | ||
| frappe.call({ | ||
| method: | ||
| "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts", | ||
| args: { | ||
| bank_transaction_name: this.bank_transaction.name, | ||
| reference_number: values.reference_number, | ||
| reference_date: values.reference_date, | ||
| party_type: values.party_type, | ||
| party: values.party, | ||
| posting_date: values.posting_date, | ||
| mode_of_payment: values.mode_of_payment, | ||
| entry_type: values.journal_entry_type, | ||
| second_account: values.second_account, | ||
| }, | ||
| callback: (response) => { | ||
| const alert_string = __("Bank Transaction {0} added as Journal Entry", [this.bank_transaction.name]); | ||
| frappe.show_alert(alert_string); | ||
| this.update_dt_cards(response.message); | ||
| this.dialog.hide(); | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| update_transaction(values) { | ||
| frappe.call({ | ||
| method: | ||
| "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.update_bank_transaction", | ||
| args: { | ||
| bank_transaction_name: this.bank_transaction.name, | ||
| reference_number: values.reference_number, | ||
| party_type: values.party_type, | ||
| party: values.party, | ||
| }, | ||
| callback: (response) => { | ||
| const alert_string = __("Bank Transaction {0} updated", [this.bank_transaction.name]); | ||
| frappe.show_alert(alert_string); | ||
| this.update_dt_cards(response.message); | ||
| this.dialog.hide(); | ||
| }, | ||
| }); | ||
| } | ||
|
|
||
| edit_in_full_page() { | ||
| const values = this.dialog.get_values(true); | ||
| if (values.document_type == "Payment Entry") { | ||
| frappe.call({ | ||
| method: | ||
| "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts", | ||
| args: { | ||
| bank_transaction_name: this.bank_transaction.name, | ||
| reference_number: values.reference_number, | ||
| reference_date: values.reference_date, | ||
| party_type: values.party_type, | ||
| party: values.party, | ||
| posting_date: values.posting_date, | ||
| mode_of_payment: values.mode_of_payment, | ||
| project: values.project, | ||
| cost_center: values.cost_center, | ||
| allow_edit: true | ||
| }, | ||
| callback: (r) => { | ||
| const doc = frappe.model.sync(r.message); | ||
| frappe.set_route("Form", doc[0].doctype, doc[0].name); | ||
| }, | ||
| }); | ||
| } else { | ||
| frappe.call({ | ||
| method: | ||
| "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts", | ||
| args: { | ||
| bank_transaction_name: this.bank_transaction.name, | ||
| reference_number: values.reference_number, | ||
| reference_date: values.reference_date, | ||
| party_type: values.party_type, | ||
| party: values.party, | ||
| posting_date: values.posting_date, | ||
| mode_of_payment: values.mode_of_payment, | ||
| entry_type: values.journal_entry_type, | ||
| second_account: values.second_account, | ||
| allow_edit: true | ||
| }, | ||
| callback: (r) => { | ||
| var doc = frappe.model.sync(r.message); | ||
| frappe.set_route("Form", doc[0].doctype, doc[0].name); | ||
| }, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| }; |
There was a problem hiding this comment.
What is this for, can't see any mention in the description. Please be more descriptive
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
sonali8848
changed the title
sonali8848
changed the title
deepeshgarg007
requested changes
Dec 29, 2022
Comment on lines
163
to
165
| filtered_by_reference_date:frm.doc.filtered_by_reference_date, | ||
| from_reference_date:frm.doc.from_reference_date, | ||
| to_reference_date:frm.doc.to_reference_date, |
There was a problem hiding this comment.
Suggested change
| filtered_by_reference_date:frm.doc.filtered_by_reference_date, | |
| from_reference_date:frm.doc.from_reference_date, | |
| to_reference_date:frm.doc.to_reference_date, | |
| filtered_by_reference_date: frm.doc.filtered_by_reference_date, | |
| from_reference_date: frm.doc.from_reference_date, | |
| to_reference_date: frm.doc.to_reference_date, |
| # get matching payment entries query | ||
| if transaction.deposit > 0: | ||
| currency_field = "paid_to_account_currency as currency" | ||
| else: | ||
| currency_field = "paid_from_account_currency as currency" | ||
| filter_by_date = f"AND posting_date between '{from_date}' and '{to_date}'" | ||
| order_by = " posting_date" | ||
| if filtered_by_reference_date == "1": |
There was a problem hiding this comment.
Should be an int, why comparing with a string
| # We have mapping at the bank level | ||
| # So one bank could have both types of bank accounts like asset and liability | ||
| # So cr_or_dr should be judged only on basis of withdrawal and deposit and not account type | ||
| cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit" | ||
| # filter_by_date = f"AND je.posting_date between '{from_date}' and '{to_date}'" | ||
| order_by = " je.posting_date" | ||
| if filtered_by_reference_date == "1": |
|
OKK , I will do
…On Thu, Dec 29, 2022 at 11:14 AM Deepesh Garg ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js
<#33271 (comment)>:
> + filtered_by_reference_date:frm.doc.filtered_by_reference_date,
+ from_reference_date:frm.doc.from_reference_date,
+ to_reference_date:frm.doc.to_reference_date,
⬇️ Suggested change
- filtered_by_reference_date:frm.doc.filtered_by_reference_date,
- from_reference_date:frm.doc.from_reference_date,
- to_reference_date:frm.doc.to_reference_date,
+ filtered_by_reference_date: frm.doc.filtered_by_reference_date,
+ from_reference_date: frm.doc.from_reference_date,
+ to_reference_date: frm.doc.to_reference_date,
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> # get matching payment entries query
if transaction.deposit > 0:
currency_field = "paid_to_account_currency as currency"
else:
currency_field = "paid_from_account_currency as currency"
+ filter_by_date = f"AND posting_date between '{from_date}' and '{to_date}'"
+ order_by = " posting_date"
+ if filtered_by_reference_date == "1":
Should be an int, why comparing with a string
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> # We have mapping at the bank level
# So one bank could have both types of bank accounts like asset and liability
# So cr_or_dr should be judged only on basis of withdrawal and deposit and not account type
cr_or_dr = "credit" if transaction.withdrawal > 0 else "debit"
+ # filter_by_date = f"AND je.posting_date between '{from_date}' and '{to_date}'"
+ order_by = " je.posting_date"
+ if filtered_by_reference_date == "1":
Here too
—
Reply to this email directly, view it on GitHub
<#33271 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3OTA7GMROIDXIQ7HKF42YTWPUQLFANCNFSM6AAAAAASYB6TOE>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
|
@sonali8848 Please also add in the description why these changes were needed, what changes are added is well understood but why they were needed is still a bit confusing to me. Unit tests also failing after the changes |
|
Okk, I will add the proper description, but unit testing is failing because
we have passed the filters in get_linked_payments function, in test cases
the filters are not passed that's why it is failing.
…On Thu, Dec 29, 2022 at 11:26 AM Deepesh Garg ***@***.***> wrote:
@sonali8848 <https://github.com/sonali8848> Please also add in the
description why these changes were needed, what changes are added is well
understood but why they were needed is still a bit confusing to me.
Unit tests also failing after the changes
—
Reply to this email directly, view it on GitHub
<#33271 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3OTA7HHXYM265E5QPIC463WPUR2BANCNFSM6AAAAAASYB6TOE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
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.
So pass the filters from the backend, is there any issue you are facing with this? |
|
I will add the filters on test cases in test_bank_transaction
…On Thu, Dec 29, 2022 at 12:10 PM Deepesh Garg ***@***.***> wrote:
Okk, I will add the proper description, but unit testing is failing
because we have passed the filters in get_linked_payments function, in test
cases the filters are not passed that's why it is failing
So pass the filters from the backend, is there any issue you are facing
with this?
—
Reply to this email directly, view it on GitHub
<#33271 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3OTA7AGNHMPLJDD2MATUGLWPUW4JANCNFSM6AAAAAASYB6TOE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
passing from_date and to_date filters in test_linked_payments and test_debit_credit_output for unit testing
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #33271 +/- ##
===========================================
+ Coverage 63.97% 64.15% +0.17%
===========================================
Files 818 819 +1
Lines 58617 59085 +468
===========================================
+ Hits 37501 37905 +404
- Misses 21116 21180 +64
|
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.
|
Hi Deepesh,
The failed test cases are not linked with bank reconciliation, which we
have done. The link is mentioned below. Kindly check.
https://github.com/frappe/erpnext/actions/runs/3805772367/jobs/6498112341
…On Fri, Dec 16, 2022 at 12:30 PM Deepesh Garg ***@***.***> wrote:
***@***.**** requested changes on this pull request.
- Assuming the user will be filtering either by reference or posting
date. So when filter by reference date is enabled those fields should hide
- The commits are non-semantic, please add semantic comments
- This is the first level review, will add more once this cleanup is
done
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> @@ -25,6 +25,8 @@ class BankReconciliationTool(Document):
@frappe.whitelist()
def get_bank_transactions(bank_account, from_date=None, to_date=None):
# returns bank transactions for a bank account
+ from_date = frappe.db.get_single_value("Bank Reconciliation Tool", "bank_statement_from_date")
This is the incorrect way of getting the dates, pass from the client side.
I can see options params are already there
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> @@ -51,6 +53,7 @@ def get_bank_transactions(bank_account, from_date=None, to_date=None):
],
filters=filters,
)
+ transactions = sorted(transactions, key=lambda x: x["date"]) if transactions else []
Can add a order by clause in query itself, this seems unnecessary
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> @@ -340,6 +343,9 @@ def get_linked_payments(bank_transaction_name, document_types=None):
def check_matching(bank_account, company, transaction, document_types):
# combine all types of vouchers
+ filtered_by_reference_date = frappe.db.get_single_value(
Pass from client side, don't make a DB call
------------------------------
In
erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
<#33271 (comment)>:
> + from_date = frappe.db.get_single_value("Bank Reconciliation Tool", "bank_statement_from_date")
+ to_date = frappe.db.get_single_value("Bank Reconciliation Tool", "bank_statement_to_date")
+ from_reference_date = frappe.db.get_single_value(
+ "Bank Reconciliation Tool", "from_reference_date"
+ )
+ to_reference_date = frappe.db.get_single_value("Bank Reconciliation Tool", "to_reference_date")
+ filtered_by_reference_date = frappe.db.get_single_value(
+ "Bank Reconciliation Tool", "filtered_by_reference_date"
+ )
Pass from the client side
------------------------------
In erpnext/hooks.py
<#33271 (comment)>:
> @@ -469,8 +469,8 @@
bank_reconciliation_doctypes = [
"Payment Entry",
"Journal Entry",
- "Purchase Invoice",
- "Sales Invoice",
+ # "Purchase Invoice",
Why are they commented?
------------------------------
In erpnext/public/js/bank_reconciliation_tool/dialog_manager.js
<#33271 (comment)>:
> + callback: (response) => {
+ const alert_string = __("Bank Transaction {0} added as Payment Entry", [this.bank_transaction.name]);
+ frappe.show_alert(alert_string);
+ this.update_dt_cards(response.message);
+ this.dialog.hide();
+ },
+ });
+ }
+
+ add_journal_entry(values) {
+ frappe.call({
+ method:
+ "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
+ args: {
+ bank_transaction_name: this.bank_transaction.name,
+ reference_number: values.reference_number,
+ reference_date: values.reference_date,
+ party_type: values.party_type,
+ party: values.party,
+ posting_date: values.posting_date,
+ mode_of_payment: values.mode_of_payment,
+ entry_type: values.journal_entry_type,
+ second_account: values.second_account,
+ },
+ callback: (response) => {
+ const alert_string = __("Bank Transaction {0} added as Journal Entry", [this.bank_transaction.name]);
+ frappe.show_alert(alert_string);
+ this.update_dt_cards(response.message);
+ this.dialog.hide();
+ },
+ });
+ }
+
+ update_transaction(values) {
+ frappe.call({
+ method:
+ "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.update_bank_transaction",
+ args: {
+ bank_transaction_name: this.bank_transaction.name,
+ reference_number: values.reference_number,
+ party_type: values.party_type,
+ party: values.party,
+ },
+ callback: (response) => {
+ const alert_string = __("Bank Transaction {0} updated", [this.bank_transaction.name]);
+ frappe.show_alert(alert_string);
+ this.update_dt_cards(response.message);
+ this.dialog.hide();
+ },
+ });
+ }
+
+ edit_in_full_page() {
+ const values = this.dialog.get_values(true);
+ if (values.document_type == "Payment Entry") {
+ frappe.call({
+ method:
+ "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_payment_entry_bts",
+ args: {
+ bank_transaction_name: this.bank_transaction.name,
+ reference_number: values.reference_number,
+ reference_date: values.reference_date,
+ party_type: values.party_type,
+ party: values.party,
+ posting_date: values.posting_date,
+ mode_of_payment: values.mode_of_payment,
+ project: values.project,
+ cost_center: values.cost_center,
+ allow_edit: true
+ },
+ callback: (r) => {
+ const doc = frappe.model.sync(r.message);
+ frappe.set_route("Form", doc[0].doctype, doc[0].name);
+ },
+ });
+ } else {
+ frappe.call({
+ method:
+ "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.create_journal_entry_bts",
+ args: {
+ bank_transaction_name: this.bank_transaction.name,
+ reference_number: values.reference_number,
+ reference_date: values.reference_date,
+ party_type: values.party_type,
+ party: values.party,
+ posting_date: values.posting_date,
+ mode_of_payment: values.mode_of_payment,
+ entry_type: values.journal_entry_type,
+ second_account: values.second_account,
+ allow_edit: true
+ },
+ callback: (r) => {
+ var doc = frappe.model.sync(r.message);
+ frappe.set_route("Form", doc[0].doctype, doc[0].name);
+ },
+ });
+ }
+ }
+
+ };
What is this for, can't see any mention in the description. Please be more
descriptive
—
Reply to this email directly, view it on GitHub
<#33271 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3OTA7AFB26DEKYI7PKOXZLWNQHQPANCNFSM6AAAAAASYB6TOE>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
@sonali8848 this is still unanswered, can you update this as well |
|
Hi Deepesh,
I have already added it in the comment section. The link is mentioned
below. Kindly check.
#33271 (comment)
Thanks
…On Mon, Jan 2, 2023 at 4:08 PM Deepesh Garg ***@***.***> wrote:
@sonali8848 <https://github.com/sonali8848> Please also add in the
description why these changes were needed, what changes are added is well
understood but why they were needed is still a bit confusing to me.
@sonali8848 <https://github.com/sonali8848> this is still unanswered, can
you update this as well
—
Reply to this email directly, view it on GitHub
<#33271 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/A3OTA7AOOY256SEGCPCMMVLWQKVZPANCNFSM6AAAAAASYB6TOE>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
deepeshgarg007
requested changes
Jan 9, 2023
| @@ -25,6 +25,24 @@ frappe.ui.form.on("Bank Reconciliation Tool", { | |||
| frappe.require("bank-reconciliation-tool.bundle.js", () => | |||
| frm.trigger("make_reconciliation_tool") | |||
| ); | |||
| frm.add_custom_button(__('Auto Reconcile'), function(){ | |||
There was a problem hiding this comment.
Suggested change
| frm.add_custom_button(__('Auto Reconcile'), function(){ | |
| frm.add_custom_button(__('Auto Reconcile'), function() { |
| @@ -25,6 +25,24 @@ frappe.ui.form.on("Bank Reconciliation Tool", { | |||
| frappe.require("bank-reconciliation-tool.bundle.js", () => | |||
| frm.trigger("make_reconciliation_tool") | |||
| ); | |||
| frm.add_custom_button(__('Auto Reconcile'), function(){ | |||
| frappe.call({ | |||
| method:"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", | |||
There was a problem hiding this comment.
Suggested change
| method:"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", | |
| method: "erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", |
| frappe.call({ | ||
| method:"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.auto_reconcile_vouchers", | ||
| args: { | ||
| bank_account:frm.doc.bank_account, |
There was a problem hiding this comment.
Suggested change
| bank_account:frm.doc.bank_account, | |
| bank_account: frm.doc.bank_account, |
Comment on lines
35
to
37
| filtered_by_reference_date:frm.doc.filtered_by_reference_date, | ||
| from_reference_date:frm.doc.from_reference_date, | ||
| to_reference_date:frm.doc.to_reference_date, |
There was a problem hiding this comment.
Suggested change
| filtered_by_reference_date:frm.doc.filtered_by_reference_date, | |
| from_reference_date:frm.doc.from_reference_date, | |
| to_reference_date:frm.doc.to_reference_date, | |
| filtered_by_reference_date: frm.doc.filtered_by_reference_date, | |
| from_reference_date: frm.doc.from_reference_date, | |
| to_reference_date: frm.doc.to_reference_date, |
Comment on lines
301
to
302
| # vouchers = frappe.as_json(voucherss) | ||
| # vouchers = json.loads(voucherss) |
| transaction.update_allocations() | ||
| matched_transaction_len = len(set(matched_transaction)) | ||
| if matched_transaction_len == 0: | ||
| frappe.msgprint(_("There is no any matched reference number for reconciliation")) |
There was a problem hiding this comment.
Suggested change
| frappe.msgprint(_("There is no any matched reference number for reconciliation")) | |
| frappe.msgprint(_("No matching references found for auto reconciliation")) |
Comment on lines
25
to
26
| from_date:this.bank_statement_from_date, | ||
| to_date:this.bank_statement_to_date |
There was a problem hiding this comment.
Suggested change
| from_date:this.bank_statement_from_date, | |
| to_date:this.bank_statement_to_date | |
| from_date: this.bank_statement_from_date, | |
| to_date: this.bank_statement_to_date |
deepeshgarg007
changed the title
deepeshgarg007
added a commit
that referenced
this pull request
Jan 15, 2023
* Update bank_reconciliation_tool.py Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox. (cherry picked from commit e5a1189) * Filters on Bank Reconciliation Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox. (cherry picked from commit 447272a) * Update bank_reconciliation_tool.json Adding fields in bank reconciliation tool (cherry picked from commit 8e7c8a6) * Feat:Filter on Payment Entries and Journal Entries Applying filters on Payement entries and Journal Entries as per reference date and posting date (cherry picked from commit 408c89d) * 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. (cherry picked from commit 05b6fce) * feat: added arguments of posting date and reference date (cherry picked from commit 645869e) * fix: linters (cherry picked from commit 6b52763) * fix: json issue (cherry picked from commit 81e5f71) * 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. (cherry picked from commit 3aaa2f5) * fix: pre-commit (cherry picked from commit e2614b8) * 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 (cherry picked from commit f181080) * fix: pre-commit (cherry picked from commit 35c29e0) * fix: pre-commit (cherry picked from commit c764f14) * 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. (cherry picked from commit d65243e) * fix: data format (cherry picked from commit 12822f7) * fix: remove comments (cherry picked from commit 917b219) * chore: fix fieldnames and order (cherry picked from commit 2327262) Co-authored-by: sonali <sonali@8848digital.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jan 17, 2023
# [14.13.0](v14.12.1...v14.13.0) (2023-01-17) ### Bug Fixes * allow to create sales order from expired quotation ([#33582](#33582)) ([fe51343](fe51343)) * asset repair link ([bc55f44](bc55f44)) * asset value in fixed asset register ([#33608](#33608)) ([4d2497f](4d2497f)) * attribute error while submitting Repost PLE ([0431a57](0431a57)) * better comparision of difference value between stock and account ([5869fcb](5869fcb)) * minor filter issue while reconciliation tool from bench console ([bddf330](bddf330)) * Missing constructor args in Bank Reco Tool ([#33705](#33705)) ([f88c8c4](f88c8c4)) * only group similar items in print format if group_same_items is checked in pick list (backport [#33627](#33627)) ([#33630](#33630)) ([28f2d35](28f2d35)) * patch item_reposting_for_incorrect_sl_and_gl ([1928195](1928195)) * Rate from LDC in TDS reports (backport [#33699](#33699)) ([#33700](#33700)) ([9fa4c1a](9fa4c1a)) * Return against internal purchase invoice (backport [#33635](#33635)) ([#33658](#33658)) ([35fbd67](35fbd67)) * Sales ORder Connections on Material Request ([8a04031](8a04031)) * Updating SO throws ordered_qty not allowed to change after submission ([f915c18](f915c18)) * zero rm-cost in SCR ([2dfbc6e](2dfbc6e)) ### Features * Date filters on bank reconciliation tool ([#33271](#33271)) ([91b08f1](91b08f1)) * provision to select date type based on filter ([4d65d6f](4d65d6f)) ### Performance Improvements * improve reconciliation speed on JE's with 1000's of rows ([8a498ed](8a498ed)) ### Reverts * Reverting changes done on 33495 ([#33662](#33662)) ([23b9f66](23b9f66))
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bank.Reconciliation.Tool.mp4
Date filters in Bank Reconciliation Tool
Step 1-To apply date filter as per posting date in Bank Transactions and Vouchers and sorted bank transactions as per ascending order.
Step 2- Added checkbox of 'filtered as per reference date' and two fields 'from reference date' and 'to reference date' to filter by reference date. If the checkbox is ticked then the vouchers will be filtered and sorted as per the reference date.
Step 3- Added field of posting date in the dialog.
Step 4- Journal Entry checkbox is ticked by default.
Consolidated auto bank reconciliation
All the transactions will get auto-reconciled if the reference number matched with bank uploaded transaction and voucher posted, we can see that that pop message will show the count of transactions reconciled and if no transactions are reconciled then the pop will show “There is no matched reference number for reconciliation.
