').data("data", value).appendTo(me.$result).get(0);
+ new erpnext.accounts.ReconciliationRow(row, value);
+ })
+
+ me.parent.page.hide_menu()
+ }
+
+ render_header() {
+ const me = this;
+ if ($(this.wrapper).find('.transaction-header').length === 0) {
+ me.$result.append(frappe.render_template("bank_transaction_header"));
+ }
+ }
+}
+
+erpnext.accounts.ReconciliationRow = class ReconciliationRow {
+ constructor(row, data) {
+ this.data = data;
+ this.row = row;
+ this.make();
+ this.bind_events();
+ }
+
+ make() {
+ $(this.row).append(frappe.render_template("bank_transaction_row", this.data))
+ }
+
+ bind_events() {
+ const me = this;
+ $(me.row).on('click', '.clickable-section', function() {
+ me.bank_entry = $(this).attr("data-name");
+ me.show_dialog($(this).attr("data-name"));
+ })
+
+ $(me.row).on('click', '.new-payment', function() {
+ me.bank_entry = $(this).attr("data-name");
+ me.new_payment();
+ })
+
+ $(me.row).on('click', '.new-invoice', function() {
+ me.bank_entry = $(this).attr("data-name");
+ me.new_invoice();
+ })
+ }
+
+ new_payment() {
+ const me = this;
+ const paid_amount = me.data.credit > 0 ? me.data.credit : me.data.debit;
+ const payment_type = me.data.credit > 0 ? "Receive": "Pay";
+ const party_type = me.data.credit > 0 ? "Customer": "Supplier";
+
+ frappe.new_doc("Payment Entry", {"payment_type": payment_type, "paid_amount": paid_amount,
+ "party_type": party_type, "paid_from": me.data.bank_account})
+ }
+
+ new_invoice() {
+ const me = this;
+ const invoice_type = me.data.credit > 0 ? "Sales Invoice" : "Purchase Invoice";
+
+ frappe.new_doc(invoice_type)
+ }
+
+ show_dialog(data) {
+ const me = this;
+ frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.get_linked_payments',
+ {bank_transaction: data}
+ )
+ .then((result) => {
+ me.make_dialog(result)
+ })
+ }
+
+ make_dialog(data) {
+ const me = this;
+ const fields = [
+ {
+ fieldtype: 'Section Break',
+ fieldname: 'section_break_1',
+ label: __('Automatic Reconciliation')
+ },
+ {
+ fieldtype: 'HTML',
+ fieldname: 'payment_proposals'
+ },
+ {
+ fieldtype: 'Section Break',
+ fieldname: 'section_break_2',
+ label: __('Search for a payment')
+ },
+ {
+ fieldtype: 'Link',
+ fieldname: 'payment_entry',
+ options: 'Payment Entry',
+ label: 'Payment Entry'
+ },
+ {
+ fieldtype: 'HTML',
+ fieldname: 'payment_details'
+ },
+ ];
+
+ me.dialog = new frappe.ui.Dialog({
+ title: __("Choose a corresponding payment"),
+ fields: fields
+ });
+
+ const proposals_wrapper = me.dialog.fields_dict.payment_proposals.$wrapper;
+ if (data.length > 0) {
+ data.map(value => {
+ proposals_wrapper.append(frappe.render_template("linked_payment_row", value))
+ })
+ } else {
+ const empty_data_msg = __("ERPNext could not find any matching payment entry")
+ proposals_wrapper.append(`
${empty_data_msg}
`)
+ }
+
+ $(me.dialog.body).on('click', '.reconciliation-btn', (e) => {
+ const payment_entry = $(e.target).attr('data-name');
+ frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.reconcile',
+ {bank_transaction: me.bank_entry, payment_entry: payment_entry})
+ .then((result) => console.log(result))
+ })
+
+ $(me.dialog.body).on('blur', '.input-with-feedback', (e) => {
+ e.preventDefault();
+ me.dialog.fields_dict['payment_details'].$wrapper.empty();
+ frappe.db.get_doc("Payment Entry", e.target.value)
+ .then(doc => {
+ const details_wrapper = me.dialog.fields_dict.payment_details.$wrapper;
+ details_wrapper.append(frappe.render_template("linked_payment_row", doc));
+ })
+
+ });
+ me.dialog.show();
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json
new file mode 100644
index 00000000000..feea36860b1
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.json
@@ -0,0 +1,29 @@
+{
+ "content": null,
+ "creation": "2018-11-24 12:03:14.646669",
+ "docstatus": 0,
+ "doctype": "Page",
+ "idx": 0,
+ "modified": "2018-11-24 12:03:14.646669",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "bank-reconciliation",
+ "owner": "Administrator",
+ "page_name": "bank-reconciliation",
+ "roles": [
+ {
+ "role": "System Manager"
+ },
+ {
+ "role": "Accounts Manager"
+ },
+ {
+ "role": "Accounts User"
+ }
+ ],
+ "script": null,
+ "standard": "Yes",
+ "style": null,
+ "system_page": 0,
+ "title": "Bank Reconciliation"
+}
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
new file mode 100644
index 00000000000..54eda914f8d
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+import difflib
+from operator import itemgetter
+
+@frappe.whitelist()
+def get_linked_payments(bank_transaction):
+
+ transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+
+ amount_matching = check_matching_amount(transaction)
+ description_matching = check_matching_descriptions(transaction)
+
+ if amount_matching:
+ match = check_amount_vs_description(amount_matching, description_matching)
+ if match:
+ return match
+ else:
+ return merge_matching_lists(amount_matching, description_matching)
+
+ else:
+ linked_payments = get_matching_transactions_payments(description_matching)
+ return linked_payments
+
+@frappe.whitelist()
+def reconcile(bank_transaction, payment_entry):
+ transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+ payment_entry = frappe.get_doc("Payment Entry", payment_entry)
+
+ if transaction.payment_entry:
+ frappe.throw(_("This bank transaction is already linked to a payment entry"))
+
+ if transaction.credit > 0 and payment_entry.payment_type == "Pay":
+ frappe.throw(_("The selected payment entry should be linked with a debitor bank transaction"))
+
+ if transaction.debit > 0 and payment_entry.payment_type == "Receive":
+ frappe.throw(_("The selected payment entry should be linked with a creditor bank transaction"))
+
+ frappe.db.set_value("Bank Transaction", bank_transaction, "payment_entry", payment_entry)
+ linked_bank_transactions = frappe.get_all("Bank Transaction", filters={"payment_entry": payment_entry, "docstatus": 1},
+ fields=["sum(debit) as debit", "sum(credit) as credit"])
+ cleared_amount = (linked_bank_transactions[0].credit - linked_bank_transactions[0].debit)
+
+ if cleared_amount == payment_entry.total_allocated_amount:
+ frappe.db.set_value("Payment Entry", payment_entry, "clearance_date", transaction.date)
+
+def check_matching_amount(transaction):
+ amount = transaction.credit if transaction.credit > 0 else transaction.debit
+ payment_type = "Receive" if transaction.credit > 0 else "Pay"
+
+ payments = frappe.get_all("Payment Entry", fields=["name", "paid_amount", "payment_type", "reference_no", "reference_date",
+ "party", "party_type", "posting_date", "paid_to_account_currency"], filters=[["paid_amount", "like", "{0}%".format(amount)],
+ ["docstatus", "=", "1"], ["payment_type", "=", payment_type], ["clearance_date", "=", ""]])
+
+ return payments
+
+
+def check_matching_descriptions(transaction):
+ bank_transactions = frappe.get_all("Bank Transaction", fields=["name", "description", "payment_entry", "date"],
+ filters=[["docstatus", "=", "1"], ["payment_entry", "!=", ""]])
+
+ result = []
+ for bank_transaction in bank_transactions:
+ if bank_transaction.description:
+ seq=difflib.SequenceMatcher(lambda x: x == " ", transaction.description, bank_transaction.description)
+
+ if seq.ratio() > 0.5:
+ bank_transaction["ratio"] = seq.ratio()
+ result.append(bank_transaction)
+
+ return result
+
+def check_amount_vs_description(amount_matching, description_matching):
+ result = []
+ for match in amount_matching:
+ result.append([match for x in description_matching if match["name"]==x["payment_entry"]])
+
+ return match
+
+def merge_matching_lists(amount_matching, description_matching):
+
+ for match in amount_matching:
+ if match["name"] in map(itemgetter('payment_entry'), description_matching):
+ index = map(itemgetter('payment_entry'), description_matching).index(match["name"])
+ del description_matching[index]
+
+ linked_payments = get_matching_transactions_payments(description_matching)
+
+ result = amount_matching.append(linked_payments)
+ return sorted(result, key = lambda x: x["posting_date"], reverse=True)
+
+def get_matching_transactions_payments(description_matching):
+ payments = [x["payment_entry"] for x in description_matching]
+
+ payment_by_ratio = {x["payment_entry"]: x["ratio"] for x in description_matching}
+
+ if payments:
+ payment_list = frappe.get_all("Payment Entry", fields=["name", "paid_amount", "payment_type", "reference_no", "reference_date",
+ "party", "party_type", "posting_date", "paid_to_account_currency"], filters=[["name", "in", payments]])
+
+ return sorted(payment_list, key=lambda x: payment_by_ratio[x["name"]])
+
+ else:
+ return []
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html b/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html
new file mode 100644
index 00000000000..94f183b793b
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_transaction_header.html
@@ -0,0 +1,21 @@
+
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html b/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html
new file mode 100644
index 00000000000..ab83ebec311
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html
@@ -0,0 +1,32 @@
+
+
+
+
+ {%= frappe.datetime.str_to_user(date) %}
+
+
+ {{ description }}
+
+
+ {%= format_currency(debit, currency) %}
+
+
+ {%= format_currency(credit, currency) %}
+
+
+ {{ currency }}
+
+
+
+
+
diff --git a/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html b/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html
new file mode 100644
index 00000000000..deeca942412
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
{{ __("Date:") }}
{{ posting_date }}
+ {{ __("Reference Date:") }}
{{ reference_date }}
+
+
+
{{ __("Amount:") }}
{{ format_currency(paid_amount, paid_to_account_currency) }}
+ {{ __("Party:") }}
{{ party }}
+ {{ __("Reference:") }}
{{ reference_no }}
+
+
+
+
+
+
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 9d8e1bf3c34..3a8816ea498 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -76,6 +76,14 @@ def get_data():
{
"type": "doctype",
"name": "Item",
+ },
+ {
+ "type": "doctype",
+ "name": "Bank",
+ },
+ {
+ "type": "doctype",
+ "name": "Bank Account",
}
]
},
@@ -135,6 +143,12 @@ def get_data():
"name": "Bank Reconciliation",
"description": _("Update bank payment dates with journals.")
},
+ {
+ "type": "page",
+ "label": _("Reconcile payments and bank transactions"),
+ "name": "bank-reconciliation",
+ "description": _("Link bank transactions with payments.")
+ },
{
"type": "doctype",
"label": _("Match Payments with Invoices"),
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
index 24bb2e9fd9e..f4eb97b32ef 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
@@ -42,7 +42,6 @@ class PlaidConnector():
def auth(self):
try:
- print(self.access_token)
self.client.Auth.get(self.access_token)
print("Authentication successful.....")
except ItemError as e:
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
index 18519bb9b1a..44a261946cf 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
@@ -7,6 +7,6 @@ frappe.ui.form.on('Plaid Settings', {
},
connect_btn: function(frm) {
- frappe.set_route('bankreconciliation/synchronization');
+ frappe.set_route('bank-reconciliation');
}
});
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
index 476e56d5c45..17acb6a6c9d 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -16,13 +16,14 @@ class PlaidSettings(Document):
@frappe.whitelist()
def plaid_configuration():
- return {"plaid_public_key": frappe.conf.get("plaid_public_key") or None, "plaid_env": frappe.conf.get("plaid_env") or None, "client_name": frappe.local.site }
-
+ if frappe.db.get_value("Plaid Settings", None, "enabled") == "1":
+ return {"plaid_public_key": frappe.conf.get("plaid_public_key") or None, "plaid_env": frappe.conf.get("plaid_env") or None, "client_name": frappe.local.site }
+ else:
+ return "disabled"
@frappe.whitelist()
def add_institution(token, response):
response = json.loads(response)
- frappe.log_error(response)
plaid = PlaidConnector()
access_token = plaid.get_access_token(token)
@@ -46,12 +47,14 @@ def add_institution(token, response):
return bank
@frappe.whitelist()
-def add_bank_accounts(response, bank):
+def add_bank_accounts(response, bank, company):
response = json.loads(response)
bank = json.loads(bank)
- company = "Dokos"
result = []
+
default_gl_account = get_default_bank_cash_account(company, "Bank")
+ if not default_gl_account:
+ frappe.throw(_("Please setup a default bank account for company {0}".format(company)))
for account in response["accounts"]:
acc_type = frappe.db.get_value("Account Type", account["type"])
@@ -80,6 +83,8 @@ def add_bank_accounts(response, bank):
result.append(new_account.name)
+ except frappe.UniqueValidationError as e:
+ frappe.msgprint(_("Bank account {0} already exists and could not be created again").format(new_account.account_name))
except Exception:
frappe.throw(frappe.get_traceback())
@@ -135,7 +140,7 @@ def get_transactions(bank, bank_account=None, start_date=None, end_date=None):
access_token = None
if bank_account:
- related_bank = frappe.db.get_values("Bank Account", dict(account_name=bank_account), ["bank", "integration_id"], as_dict=True)
+ related_bank = frappe.db.get_values("Bank Account", bank_account, ["bank", "integration_id"], as_dict=True)
access_token = frappe.db.get_value("Bank", related_bank[0].bank, "plaid_access_token")
account_id = related_bank[0].integration_id
@@ -175,6 +180,7 @@ def new_bank_transaction(transaction):
"description": transaction["name"]
})
new_transaction.insert()
+ new_transaction.submit()
result.append(new_transaction.name)
diff --git a/erpnext/public/js/reconciliation/Home.vue b/erpnext/public/js/reconciliation/Home.vue
deleted file mode 100644
index 57e6cefd694..00000000000
--- a/erpnext/public/js/reconciliation/Home.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/erpnext/public/js/reconciliation/Sidebar.vue b/erpnext/public/js/reconciliation/Sidebar.vue
deleted file mode 100644
index e99bf978b2a..00000000000
--- a/erpnext/public/js/reconciliation/Sidebar.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/AccountCard.vue b/erpnext/public/js/reconciliation/components/AccountCard.vue
deleted file mode 100644
index 99fda80626c..00000000000
--- a/erpnext/public/js/reconciliation/components/AccountCard.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/BankAccountsContainer.vue b/erpnext/public/js/reconciliation/components/BankAccountsContainer.vue
deleted file mode 100644
index 099a73755cb..00000000000
--- a/erpnext/public/js/reconciliation/components/BankAccountsContainer.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/EmptyState.vue b/erpnext/public/js/reconciliation/components/EmptyState.vue
deleted file mode 100644
index 490a67eb655..00000000000
--- a/erpnext/public/js/reconciliation/components/EmptyState.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
{{ message }}
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/NewAccountCard.vue b/erpnext/public/js/reconciliation/components/NewAccountCard.vue
deleted file mode 100644
index bf311ac44a0..00000000000
--- a/erpnext/public/js/reconciliation/components/NewAccountCard.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/TransactionCard.vue b/erpnext/public/js/reconciliation/components/TransactionCard.vue
deleted file mode 100644
index 96141116947..00000000000
--- a/erpnext/public/js/reconciliation/components/TransactionCard.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- | {{ transaction.description }} |
- {{ amount }} |
- {{ transaction.currency }} |
- {{ date }} |
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/components/TransactionsContainer.vue b/erpnext/public/js/reconciliation/components/TransactionsContainer.vue
deleted file mode 100644
index 8c25c146071..00000000000
--- a/erpnext/public/js/reconciliation/components/TransactionsContainer.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
- | {{ __('Description') }} |
- {{ __('Amount') }} |
- {{ __('Currency') }} |
- {{ __('Date') }} |
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/pages/Dashboard.vue b/erpnext/public/js/reconciliation/pages/Dashboard.vue
deleted file mode 100644
index f60a75ece5f..00000000000
--- a/erpnext/public/js/reconciliation/pages/Dashboard.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/pages/Reconciliation.vue b/erpnext/public/js/reconciliation/pages/Reconciliation.vue
deleted file mode 100644
index b946e1be580..00000000000
--- a/erpnext/public/js/reconciliation/pages/Reconciliation.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/pages/Upload.vue b/erpnext/public/js/reconciliation/pages/Upload.vue
deleted file mode 100644
index f88b42929e6..00000000000
--- a/erpnext/public/js/reconciliation/pages/Upload.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/reconciliation_factory.js b/erpnext/public/js/reconciliation/reconciliation_factory.js
deleted file mode 100644
index b76722f6ff8..00000000000
--- a/erpnext/public/js/reconciliation/reconciliation_factory.js
+++ /dev/null
@@ -1,29 +0,0 @@
-frappe.provide('erpnext.bankreconciliation');
-
-frappe.views.bankreconciliationFactory = class bankreconciliationFactory extends frappe.views.Factory {
- show() {
- if (frappe.pages.bankreconciliation) {
- frappe.container.change_to('bankreconciliation');
- } else {
- this.make('bankreconciliation');
- }
- }
- make(page_name) {
- const assets = [
- '/assets/js/bankreconciliation.min.js'
- ];
- frappe.require(assets, () => {
- erpnext.bankreconciliation.home = new erpnext.bankreconciliation.Home({
- parent: this.make_page(true, page_name)
- });
- });
- }
-};
-
-$(document).on('toolbar_setup', () => {
- $('#toolbar-user .navbar-reload').after(`
-
- ${__("Bank Reconciliation")}
-
- `);
-});
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/reconciliation_home.js b/erpnext/public/js/reconciliation/reconciliation_home.js
deleted file mode 100644
index fb7fe647149..00000000000
--- a/erpnext/public/js/reconciliation/reconciliation_home.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import Vue from 'vue/dist/vue.js';
-import './vue-plugins';
-
-import Home from './Home.vue';
-import Sidebar from './Sidebar.vue';
-
-import EventEmitter from '../hub/event_emitter';
-
-frappe.provide('erpnext.bankreconciliation');
-frappe.provide('frappe.route');
-frappe.provide('frappe.upload');
-
-$.extend(erpnext.bankreconciliation, EventEmitter.prototype);
-$.extend(frappe.route, EventEmitter.prototype);
-
-erpnext.bankreconciliation.Home = class bankreconciliation {
- constructor({ parent }) {
- this.$parent = $(parent);
- this.page = parent.page;
- this.company = frappe.defaults.get_user_default("Company");
- this.setup_header();
- this.make_sidebar();
- this.make_body();
- this.setup_events();
- this.set_secondary_action();
- }
-
- make_sidebar() {
- this.$sidebar = this.$parent.find('.layout-side-section').addClass('hidden-xs');
-
- new Vue({
- el: $('
').appendTo(this.$sidebar)[0],
- render: h => h(Sidebar)
- });
- }
-
- make_body() {
- let me = this;
- me.$body = me.$parent.find('.layout-main-section');
- me.$page_container = $('
').appendTo(this.$body);
-
- new Vue({
- el: me.$page_container[0],
- render(h) {
- return h(Home, {props: { initCompany: me.company}})
- }
- });
- }
-
- setup_header() {
- this.page.set_title(__('Bank Reconciliation'));
- }
-
- setup_events() {
- this.$parent.on('click', '[data-route]', (e) => {
- const $target = $(e.currentTarget);
- const route = $target.data().route;
- frappe.set_route(route);
- });
-
- this.$parent.on('click', '[data-action]', e => {
- const $target = $(e.currentTarget);
- const action = $target.data().action;
-
- if (action && this[action]) {
- this[action].apply(this, $target);
- }
- })
- }
-
- set_secondary_action() {
- let me = this;
- this.page.set_secondary_action(this.company, function () {
- me.company_selection_dialog();
- })
- }
-
- company_selection_dialog() {
- let me = this;
- let dialog = new frappe.ui.Dialog({
- title: __('Select another company'),
- fields: [
- {
- "label": "Company",
- "fieldname": "company",
- "fieldtype": "Link",
- "options": "Company"
- }
- ],
- primary_action_label: __('Confirm'),
- primary_action: function(v) {
- me.company = v.company;
- erpnext.bankreconciliation.trigger('company_changed', v.company);
- me.set_secondary_action();
- dialog.hide();
- },
- })
- dialog.show();
- }
-};
\ No newline at end of file
diff --git a/erpnext/public/js/reconciliation/vue-plugins.js b/erpnext/public/js/reconciliation/vue-plugins.js
deleted file mode 100644
index 708d179177d..00000000000
--- a/erpnext/public/js/reconciliation/vue-plugins.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Vue from 'vue/dist/vue.js';
-
-Vue.prototype.__ = window.__;
-Vue.prototype.frappe = window.frappe;
-
-Vue.directive('route', {
- bind(el, binding) {
- const route = binding.value;
- if (!route) return;
- el.classList.add('cursor-pointer');
- el.dataset.route = route;
- el.addEventListener('click', () => frappe.set_route(route));
- },
- unbind(el) {
- el.classList.remove('cursor-pointer');
- }
-});
\ No newline at end of file
diff --git a/erpnext/public/less/bankreconciliation.less b/erpnext/public/less/bankreconciliation.less
deleted file mode 100644
index 35c144f48e4..00000000000
--- a/erpnext/public/less/bankreconciliation.less
+++ /dev/null
@@ -1,71 +0,0 @@
-
-@import "variables.less";
-@import (reference) 'common.less';
-
-body[data-route*="bankreconciliation"] {
-
- .layout-side-section {
- padding-top: 25px;
- padding-left: 5px;
- padding-right: 25px;
- }
-
- [data-route], [data-action] {
- cursor: pointer;
- }
-
- .layout-main-section {
- border: none;
- font-size: @text-medium;
- padding-top: 25px;
-
- @media (max-width: @screen-xs) {
- padding-left: 20px;
- padding-right: 20px;
- }
- }
-
- input, textarea {
- font-size: @text-medium;
- }
-
- .bankreconciliation-sidebar {
- padding-top: 25px;
- padding-right: 15px;
- }
-
- .bankreconciliation-sidebar-group {
- margin-bottom: 10px;
- }
-
- .bankreconciliation-sidebar-item {
- padding: 5px 8px;
- margin-bottom: 3px;
- border-radius: 4px;
- border: 1px solid transparent;
-
- &.active, &:hover:not(.is-title) {
- border-color: @border-color;
- }
- }
-
- .form-container {
- .frappe-control {
- max-width: 100% !important;
- }
- }
-
- .upload-btn-container {
- margin-top: 20px;
- }
-
- .account-card {
- .selected {
- background-color: #e2f4d0;
- }
- }
-
- .table-container {
- margin-top: 20px;
- }
-}
\ No newline at end of file
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index b746cc138f6..0c1751657e4 100644
--- a/erpnext/public/less/erpnext.less
+++ b/erpnext/public/less/erpnext.less
@@ -25,10 +25,10 @@
.app-icon-svg {
display: inline-block;
- margin: auto;
- text-align: center;
- border-radius: 16px;
- cursor: pointer;
+ margin: auto;
+ text-align: center;
+ border-radius: 16px;
+ cursor: pointer;
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.15);
}
@@ -459,3 +459,30 @@ body[data-route="pos"] {
padding-right: 45px;
}
}
+
+// Bank Reconciliation
+
+.plaid-btn {
+ margin-top: 24px;
+ color: #fff;
+ background-color: #5bc0de;
+ border-color: #46b8da;
+}
+
+.transactions-btn {
+ margin: 15px;
+}
+
+[data-fieldname='reconcile_data'],
+[data-fieldname='sync_data'],
+[data-fieldname='import_data'] {
+ .btn {
+ color: #fff;
+ background-color: #8d99a6;
+ border-color: #7f8c9b;
+ }
+}
+
+[data-fieldname='table_container'] {
+ margin: -15px -30px;
+}
\ No newline at end of file