').data("data", value).appendTo(me.$result).get(0);
+ new erpnext.accounts.ReconciliationRow(row, value);
+ })
+ }
+
+ 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-reconciliation', 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();
+ })
+
+ $(me.row).on('click', '.new-expense', function() {
+ me.bank_entry = $(this).attr("data-name");
+ me.new_expense();
+ })
+ }
+
+ 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)
+ }
+
+ new_invoice() {
+ frappe.new_doc("Expense Claim")
+ }
+
+
+ show_dialog(data) {
+ const me = this;
+
+ frappe.db.get_value("Bank Account", me.data.bank_account, "account", (r) => {
+ me.gl_account = r.account;
+ })
+
+ frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.get_linked_payments',
+ {bank_transaction: data, freeze:true, freeze_message:__("Finding linked payments")}
+ ).then((result) => {
+ me.make_dialog(result)
+ })
+ }
+
+ make_dialog(data) {
+ const me = this;
+ me.selected_payment = null;
+
+ 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_doctype',
+ options: 'DocType',
+ label: 'Payment DocType',
+ get_query: () => {
+ return {
+ filters : {
+ "name": ["in", ["Payment Entry", "Journal Entry", "Sales Invoice", "Purchase Invoice", "Expense Claim"]]
+ }
+ }
+ }
+ },
+ {
+ fieldtype: 'Column Break',
+ fieldname: 'column_break_1',
+ },
+ {
+ fieldtype: 'Dynamic Link',
+ fieldname: 'payment_entry',
+ options: 'payment_doctype',
+ label: 'Payment Document',
+ get_query: () => {
+ let dt = this.dialog.fields_dict.payment_doctype.value;
+ if (dt === "Payment Entry") {
+ return {
+ filters : [
+ ["Payment Entry", "ifnull(clearance_date, '')", "=", ""],
+ ["Payment Entry", "docstatus", "=", 1]
+ ]
+ }
+ } else if (dt === "Journal Entry") {
+ return {
+ query: "erpnext.accounts.page.bank_reconciliation.bank_reconciliation.journal_entry_query",
+ filters : {
+ "bank_account": this.data.bank_account
+ }
+ }
+ } else if (dt === "Sales Invoice") {
+ return {
+ query: "erpnext.accounts.page.bank_reconciliation.bank_reconciliation.sales_invoices_query"
+ }
+ } else if (dt === "Purchase Invoice") {
+ return {
+ filters : [
+ ["Purchase Invoice", "ifnull(clearance_date, '')", "=", ""],
+ ["Purchase Invoice", "docstatus", "=", 1]
+ ]
+ }
+ } else if (dt === "Expense Claim") {
+ return {
+ filters : [
+ ["Expense Claim", "ifnull(clearance_date, '')", "=", ""],
+ ["Expense Claim", "docstatus", "=", 1]
+ ]
+ }
+ }
+ },
+ onchange: function() {
+ if (me.selected_payment !== this.value) {
+ me.selected_payment = this.value;
+ me.display_payment_details(this);
+ }
+ }
+ },
+ {
+ fieldtype: 'Section Break',
+ fieldname: 'section_break_3'
+ },
+ {
+ fieldtype: 'HTML',
+ fieldname: 'payment_details'
+ },
+ ];
+
+ me.dialog = new frappe.ui.Dialog({
+ title: __("Choose a corresponding payment"),
+ fields: fields,
+ size: "large"
+ });
+
+ const proposals_wrapper = me.dialog.fields_dict.payment_proposals.$wrapper;
+ if (data && data.length > 0) {
+ proposals_wrapper.append(frappe.render_template("linked_payment_header"));
+ 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');
+ const payment_doctype = $(e.target).attr('data-doctype');
+ frappe.xcall('erpnext.accounts.page.bank_reconciliation.bank_reconciliation.reconcile',
+ {bank_transaction: me.bank_entry, payment_doctype: payment_doctype, payment_name: payment_entry})
+ .then((result) => {
+ setTimeout(function(){
+ erpnext.accounts.ReconciliationList.refresh();
+ }, 2000);
+ me.dialog.hide();
+ })
+ })
+
+ me.dialog.show();
+ }
+
+ display_payment_details(event) {
+ const me = this;
+ if (event.value) {
+ let dt = me.dialog.fields_dict.payment_doctype.value;
+ me.dialog.fields_dict['payment_details'].$wrapper.empty();
+ frappe.db.get_doc(dt, event.value)
+ .then(doc => {
+ let displayed_docs = []
+ if (dt === "Payment Entry") {
+ doc.currency = doc.payment_type == "Receive" ? doc.paid_to_account_currency : doc.paid_from_account_currency;
+ displayed_docs.push(doc);
+ } else if (dt === "Journal Entry") {
+ doc.accounts.forEach(payment => {
+ if (payment.account === me.gl_account) {
+ payment.posting_date = doc.posting_date;
+ payment.party = doc.pay_to_recd_from;
+ payment.reference_no = doc.cheque_no;
+ payment.reference_date = doc.cheque_date;
+ payment.currency = payment.account_currency;
+ payment.paid_amount = payment.credit > 0 ? payment.credit : payment.debit;
+ payment.name = doc.name;
+ displayed_docs.push(payment);
+ }
+ })
+ } else if (dt === "Sales Invoice") {
+ doc.payments.forEach(payment => {
+ if (payment.clearance_date === null || payment.clearance_date === "") {
+ payment.posting_date = doc.posting_date;
+ payment.party = doc.customer;
+ payment.reference_no = doc.remarks;
+ payment.currency = doc.currency;
+ payment.paid_amount = payment.amount;
+ payment.name = doc.name;
+ displayed_docs.push(payment);
+ }
+ })
+ }
+
+ const details_wrapper = me.dialog.fields_dict.payment_details.$wrapper;
+ details_wrapper.append(frappe.render_template("linked_payment_header"));
+ displayed_docs.forEach(values => {
+ details_wrapper.append(frappe.render_template("linked_payment_row", values));
+ })
+ })
+ }
+
+ }
+}
\ 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..6c0e4b8f0b2
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
@@ -0,0 +1,349 @@
+# -*- 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 frappe.utils import flt
+from six import iteritems
+from erpnext import get_company_currency
+
+@frappe.whitelist()
+def reconcile(bank_transaction, payment_doctype, payment_name):
+ transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+ payment_entry = frappe.get_doc(payment_doctype, payment_name)
+
+ account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
+ gl_entry = frappe.get_doc("GL Entry", dict(account=account, voucher_type=payment_doctype, voucher_no=payment_name))
+
+ if transaction.unallocated_amount == 0:
+ frappe.throw(_("This bank transaction is already fully reconciled"))
+
+ if transaction.credit > 0 and gl_entry.credit > 0:
+ frappe.throw(_("The selected payment entry should be linked with a debitor bank transaction"))
+
+ if transaction.debit > 0 and gl_entry.debit > 0:
+ frappe.throw(_("The selected payment entry should be linked with a creditor bank transaction"))
+
+ add_payment_to_transaction(transaction, payment_entry, gl_entry)
+ clear_payment_entry(transaction, payment_entry, gl_entry)
+
+ return 'reconciled'
+
+def add_payment_to_transaction(transaction, payment_entry, gl_entry):
+ transaction.append("payment_entries", {
+ "payment_document": payment_entry.doctype,
+ "payment_entry": payment_entry.name,
+ "allocated_amount": gl_entry.credit if gl_entry.credit > 0 else gl_entry.debit
+ })
+ transaction.save()
+
+def clear_payment_entry(transaction, payment_entry, gl_entry):
+ linked_bank_transactions = frappe.db.sql("""
+ SELECT
+ bt.credit, bt.debit
+ FROM
+ `tabBank Transaction Payments` as btp
+ LEFT JOIN
+ `tabBank Transaction` as bt on btp.parent=bt.name
+ WHERE
+ btp.payment_document = %s
+ AND
+ btp.payment_entry = %s
+ AND
+ bt.docstatus = 1
+ """, (payment_entry.doctype, payment_entry.name), as_dict=True)
+
+ amount_cleared = (flt(linked_bank_transactions[0].credit) - flt(linked_bank_transactions[0].debit))
+ amount_to_be_cleared = (flt(gl_entry.debit) - flt(gl_entry.credit))
+
+ if payment_entry.doctype == "Payment Entry":
+ clear_simple_entry(amount_cleared, amount_to_be_cleared, payment_entry, transaction)
+
+ elif payment_entry.doctype == "Journal Entry":
+ clear_simple_entry(amount_cleared, amount_to_be_cleared, payment_entry, transaction)
+
+ elif payment_entry.doctype == "Sales Invoice":
+ clear_sales_invoice(amount_cleared, amount_to_be_cleared, payment_entry, transaction)
+
+ elif payment_entry.doctype == "Purchase Invoice":
+ clear_simple_entry(amount_cleared, amount_to_be_cleared, payment_entry, transaction)
+
+ elif payment_entry.doctype == "Expense Claim":
+ clear_simple_entry(amount_cleared, amount_to_be_cleared, payment_entry, transaction)
+
+def clear_simple_entry(amount_cleared, amount_to_be_cleared, payment_entry, transaction):
+ if amount_cleared == amount_to_be_cleared:
+ frappe.db.set_value(payment_entry.doctype, payment_entry.name, "clearance_date", transaction.date)
+
+def clear_sales_invoice(amount_cleared, amount_to_be_cleared, payment_entry, transaction):
+ if amount_cleared == amount_to_be_cleared:
+ frappe.db.set_value("Sales Invoice Payment", dict(parenttype=payment_entry.doctype,
+ parent=payment_entry.name), "clearance_date", transaction.date)
+
+@frappe.whitelist()
+def get_linked_payments(bank_transaction):
+ transaction = frappe.get_doc("Bank Transaction", bank_transaction)
+ bank_account = frappe.db.get_values("Bank Account", transaction.bank_account, ["account", "company"], as_dict=True)
+
+ # Get all payment entries with a matching amount
+ amount_matching = check_matching_amount(bank_account[0].account, bank_account[0].company, transaction)
+
+ # Get some data from payment entries linked to a corresponding bank transaction
+ description_matching = get_matching_descriptions_data(bank_account[0].account, transaction)
+
+ if amount_matching:
+ return check_amount_vs_description(amount_matching, description_matching)
+
+ elif description_matching:
+ return sorted(description_matching, key = lambda x: x["posting_date"], reverse=True)
+
+ else:
+ return []
+
+def check_matching_amount(bank_account, company, transaction):
+ payments = []
+ amount = transaction.credit if transaction.credit > 0 else transaction.debit
+
+ payment_type = "Receive" if transaction.credit > 0 else "Pay"
+ account_from_to = "paid_to" if transaction.credit > 0 else "paid_from"
+ currency_field = "paid_to_account_currency as currency" if transaction.credit > 0 else "paid_from_account_currency as currency"
+
+ payment_entries = frappe.get_all("Payment Entry", fields=["'Payment Entry' as doctype", "name", "paid_amount", "payment_type", "reference_no", "reference_date",
+ "party", "party_type", "posting_date", "{0}".format(currency_field)], filters=[["paid_amount", "like", "{0}%".format(amount)],
+ ["docstatus", "=", "1"], ["payment_type", "=", payment_type], ["ifnull(clearance_date, '')", "=", ""], ["{0}".format(account_from_to), "=", "{0}".format(bank_account)]])
+
+ if transaction.credit > 0:
+ journal_entries = frappe.db.sql("""
+ SELECT
+ 'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
+ je.pay_to_recd_from as party, je.cheque_date as reference_date, jea.debit_in_account_currency as paid_amount
+ FROM
+ `tabJournal Entry Account` as jea
+ JOIN
+ `tabJournal Entry` as je
+ ON
+ jea.parent = je.name
+ WHERE
+ (je.clearance_date is null or je.clearance_date='0000-00-00')
+ AND
+ jea.account = %s
+ AND
+ jea.debit_in_account_currency like %s
+ AND
+ je.docstatus = 1
+ """, (bank_account, amount), as_dict=True)
+ else:
+ journal_entries = frappe.db.sql("""
+ SELECT
+ 'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
+ je.pay_to_recd_from as party, je.cheque_date as reference_date, jea.credit_in_account_currency as paid_amount
+ FROM
+ `tabJournal Entry Account` as jea
+ JOIN
+ `tabJournal Entry` as je
+ ON
+ jea.parent = je.name
+ WHERE
+ (je.clearance_date is null or je.clearance_date='0000-00-00')
+ AND
+ jea.account = %s
+ AND
+ jea.credit_in_account_currency like %s
+ AND
+ je.docstatus = 1
+ """, (bank_account, amount), as_dict=True)
+
+ if transaction.credit > 0:
+ sales_invoices = frappe.db.sql("""
+ SELECT
+ 'Sales Invoice' as doctype, si.name, si.customer as party,
+ si.posting_date, sip.amount as paid_amount
+ FROM
+ `tabSales Invoice Payment` as sip
+ JOIN
+ `tabSales Invoice` as si
+ ON
+ sip.parent = si.name
+ WHERE
+ (sip.clearance_date is null or sip.clearance_date='0000-00-00')
+ AND
+ sip.account = %s
+ AND
+ sip.amount like %s
+ AND
+ si.docstatus = 1
+ """, (bank_account, amount), as_dict=True)
+ else:
+ sales_invoices = []
+
+ if transaction.debit > 0:
+ purchase_invoices = frappe.get_all("Purchase Invoice", fields=["'Purchase Invoice' as doctype", "name", "paid_amount",
+ "supplier as party", "posting_date", "currency"], filters=[["paid_amount", "like", "{0}%".format(amount)],
+ ["docstatus", "=", "1"], ["is_paid", "=", "1"], ["ifnull(clearance_date, '')", "=", ""], ["cash_bank_account", "=", "{0}".format(bank_account)]])
+
+ mode_of_payments = [x["parent"] for x in frappe.db.get_list("Mode of Payment Account", filters={"default_account": bank_account}, fields=["parent"])]
+ company_currency = get_company_currency(company)
+
+ expense_claims = frappe.get_all("Expense Claim", fields=["'Expense Claim' as doctype", "name", "total_sanctioned_amount as paid_amount",
+ "employee as party", "posting_date", "'{0}' as currency".format(company_currency)], filters=[["total_sanctioned_amount", "like", "{0}%".format(amount)],
+ ["docstatus", "=", "1"], ["is_paid", "=", "1"], ["ifnull(clearance_date, '')", "=", ""], ["mode_of_payment", "in", "{0}".format(tuple(mode_of_payments))]])
+ else:
+ purchase_invoices = expense_claims = []
+
+ for data in [payment_entries, journal_entries, sales_invoices, purchase_invoices, expense_claims]:
+ if data:
+ payments.extend(data)
+
+ return payments
+
+def get_matching_descriptions_data(bank_account, transaction):
+ if not transaction.description :
+ return []
+
+ bank_transactions = frappe.db.sql("""
+ SELECT
+ bt.name, bt.description, bt.date, btp.payment_document, btp.payment_entry
+ FROM
+ `tabBank Transaction` as bt
+ LEFT JOIN
+ `tabBank Transaction Payments` as btp
+ ON
+ bt.name = btp.parent
+ WHERE
+ bt.allocated_amount > 0
+ AND
+ bt.docstatus = 1
+ """, as_dict=True)
+
+ selection = []
+ 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.6:
+ bank_transaction["ratio"] = seq.ratio()
+ selection.append(bank_transaction)
+
+ document_types = set([x["payment_document"] for x in selection])
+
+ links = {}
+ for document_type in document_types:
+ links[document_type] = [x["payment_entry"] for x in selection if x["payment_document"]==document_type]
+
+
+ data = []
+ for key, value in iteritems(links):
+ if key == "Payment Entry":
+ data.extend(frappe.get_all("Payment Entry", filters=[["name", "in", value]], fields=["'Payment Entry' as doctype", "posting_date", "party", "reference_no", "reference_date", "paid_amount"]))
+ if key == "Journal Entry":
+ data.extend(frappe.get_all("Journal Entry", filters=[["name", "in", value]], fields=["'Journal Entry' as doctype", "posting_date", "paid_to_recd_from as party", "cheque_no as reference_no", "cheque_date as reference_date"]))
+ if key == "Sales Invoice":
+ data.extend(frappe.get_all("Sales Invoice", filters=[["name", "in", value]], fields=["'Sales Invoice' as doctype", "posting_date", "customer_name as party"]))
+ if key == "Purchase Invoice":
+ data.append(frappe.get_all("Purchase Invoice", filters=[["name", "in", value]], fields=["'Purchase Invoice' as doctype", "posting_date", "supplier_name as party"]))
+ if key == "Purchase Invoice":
+ data.append(frappe.get_all("Expense Claim", filters=[["name", "in", value]], fields=["'Expense Claim' as doctype", "posting_date", "employee_name as party"]))
+
+ return data
+
+def check_amount_vs_description(amount_matching, description_matching):
+ result = []
+
+ if description_matching:
+ for am_match in amount_matching:
+ for des_match in description_matching:
+ if am_match["party"] == des_match["party"]:
+ if am_match not in result:
+ result.append(am_match)
+ continue
+
+ if hasattr(am_match, "reference_no") and hasattr(des_match, "reference_no"):
+ if difflib.SequenceMatcher(lambda x: x == " ", am_match["reference_no"], des_match["reference_no"]) > 70:
+ if am_match not in result:
+ result.append(am_match)
+ if result:
+ return sorted(result, key = lambda x: x["posting_date"], reverse=True)
+ else:
+ return sorted(amount_matching, key = lambda x: x["posting_date"], reverse=True)
+
+ else:
+ return sorted(amount_matching, 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:
+ reference_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(reference_payment_list, key=lambda x: payment_by_ratio[x["name"]])
+
+ else:
+ return []
+
+def journal_entry_query(doctype, txt, searchfield, start, page_len, filters):
+ account = frappe.db.get_value("Bank Account", filters.get("bank_account"), "account")
+
+ return frappe.db.sql("""
+ SELECT
+ jea.parent, je.pay_to_recd_from,
+ if(jea.debit_in_account_currency > 0, jea.debit_in_account_currency, jea.credit_in_account_currency)
+ FROM
+ `tabJournal Entry Account` as jea
+ LEFT JOIN
+ `tabJournal Entry` as je
+ ON
+ jea.parent = je.name
+ WHERE
+ (je.clearance_date is null or je.clearance_date='0000-00-00')
+ AND
+ jea.account = %(account)s
+ AND
+ (jea.parent like %(txt)s or je.pay_to_recd_from like %(txt)s)
+ AND
+ je.docstatus = 1
+ ORDER BY
+ if(locate(%(_txt)s, jea.parent), locate(%(_txt)s, jea.parent), 99999),
+ jea.parent
+ LIMIT
+ %(start)s, %(page_len)s""",
+ {
+ 'txt': "%%%s%%" % txt,
+ '_txt': txt.replace("%", ""),
+ 'start': start,
+ 'page_len': page_len,
+ 'account': account
+ }
+ )
+
+def sales_invoices_query(doctype, txt, searchfield, start, page_len, filters):
+ return frappe.db.sql("""
+ SELECT
+ sip.parent, si.customer, sip.amount, sip.mode_of_payment
+ FROM
+ `tabSales Invoice Payment` as sip
+ LEFT JOIN
+ `tabSales Invoice` as si
+ ON
+ sip.parent = si.name
+ WHERE
+ (sip.clearance_date is null or sip.clearance_date='0000-00-00')
+ AND
+ (sip.parent like %(txt)s or si.customer like %(txt)s)
+ ORDER BY
+ if(locate(%(_txt)s, sip.parent), locate(%(_txt)s, sip.parent), 99999),
+ sip.parent
+ LIMIT
+ %(start)s, %(page_len)s""",
+ {
+ 'txt': "%%%s%%" % txt,
+ '_txt': txt.replace("%", ""),
+ 'start': start,
+ 'page_len': page_len
+ }
+ )
\ 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..742b84c63f5
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/bank_transaction_row.html
@@ -0,0 +1,36 @@
+
+
+
+
+ {%= 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_header.html b/erpnext/accounts/page/bank_reconciliation/linked_payment_header.html
new file mode 100644
index 00000000000..4542c36e0dc
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/linked_payment_header.html
@@ -0,0 +1,21 @@
+
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..bdbc9fce033
--- /dev/null
+++ b/erpnext/accounts/page/bank_reconciliation/linked_payment_row.html
@@ -0,0 +1,36 @@
+
+
+
+ {{ name }}
+
+
+ {% if (typeof reference_date !== "undefined") %}
+ {%= frappe.datetime.str_to_user(reference_date) %}
+ {% else %}
+ {% if (typeof posting_date !== "undefined") %}
+ {%= frappe.datetime.str_to_user(posting_date) %}
+ {% endif %}
+ {% endif %}
+
+
+ {{ format_currency(paid_amount, currency) }}
+
+
+ {% if (typeof party !== "undefined") %}
+ {{ party }}
+ {% endif %}
+
+
+ {% if (typeof reference_no !== "undefined") %}
+ {{ reference_no }}
+ {% else %}
+ {{ "" }}
+ {% endif %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 42d0df0a06f..31366b4f1b7 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/config/integrations.py b/erpnext/config/integrations.py
index 01e077fba39..52c9ab8e46c 100644
--- a/erpnext/config/integrations.py
+++ b/erpnext/config/integrations.py
@@ -35,6 +35,11 @@ def get_data():
"type": "doctype",
"name": "Amazon MWS Settings",
"description": _("Connect Amazon with ERPNext"),
+ },
+ {
+ "type": "doctype",
+ "name": "Plaid Settings",
+ "description": _("Connect your bank accounts to ERPNext"),
}
]
}
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/__init__.py b/erpnext/erpnext_integrations/doctype/plaid_settings/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
new file mode 100644
index 00000000000..fbb0ebc2c80
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_connector.py
@@ -0,0 +1,81 @@
+# -*- 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 requests
+from plaid import Client
+from plaid.errors import APIError, ItemError
+
+class PlaidConnector():
+ def __init__(self, access_token=None):
+
+ if not(frappe.conf.get("plaid_client_id") and frappe.conf.get("plaid_secret") and frappe.conf.get("plaid_public_key")):
+ frappe.throw(_("Please complete your Plaid API configuration before synchronizing your account"))
+
+ self.config = {
+ "plaid_client_id": frappe.conf.get("plaid_client_id"),
+ "plaid_secret": frappe.conf.get("plaid_secret"),
+ "plaid_public_key": frappe.conf.get("plaid_public_key"),
+ "plaid_env": frappe.conf.get("plaid_env")
+ }
+
+ self.client = Client(client_id=self.config["plaid_client_id"],
+ secret=self.config["plaid_secret"],
+ public_key=self.config["plaid_public_key"],
+ environment=self.config["plaid_env"]
+ )
+
+ self.access_token = access_token
+
+ def get_access_token(self, public_token):
+ if public_token is None:
+ frappe.log_error(_("Public token is missing for this bank"), _("Plaid public token error"))
+
+ response = self.client.Item.public_token.exchange(public_token)
+ access_token = response['access_token']
+
+ return access_token
+
+ def auth(self):
+ try:
+ self.client.Auth.get(self.access_token)
+ print("Authentication successful.....")
+ except ItemError as e:
+ if e.code == 'ITEM_LOGIN_REQUIRED':
+ pass
+ else:
+ pass
+ except APIError as e:
+ if e.code == 'PLANNED_MAINTENANCE':
+ pass
+ else:
+ pass
+ except requests.Timeout:
+ pass
+ except Exception as e:
+ print(e)
+ frappe.log_error(frappe.get_traceback(), _("Plaid authentication error"))
+ frappe.msgprint({"title": _("Authentication Failed"), "message":e, "raise_exception":1, "indicator":'red'})
+
+ def get_transactions(self, start_date, end_date, account_id=None):
+ try:
+ self.auth()
+ if account_id:
+ account_ids = [account_id]
+
+ response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date, account_ids=account_ids)
+
+ else:
+ response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date)
+
+ transactions = response['transactions']
+
+ while len(transactions) < response['total_transactions']:
+ response = self.client.Transactions.get(self.access_token, start_date=start_date, end_date=end_date, offset=len(transactions))
+ transactions.extend(response['transactions'])
+ return transactions
+ except Exception:
+ frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
new file mode 100644
index 00000000000..76205e6c823
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js
@@ -0,0 +1,104 @@
+// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.provide("erpnext.integrations");
+
+frappe.ui.form.on('Plaid Settings', {
+ link_new_account: function(frm) {
+ new erpnext.integrations.plaidLink(frm);
+ }
+});
+
+erpnext.integrations.plaidLink = class plaidLink {
+ constructor(parent) {
+ this.frm = parent;
+ this.product = ["transactions", "auth"];
+ this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
+ this.init_config();
+ }
+
+ init_config() {
+ const me = this;
+ frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.plaid_configuration')
+ .then(result => {
+ if (result !== "disabled") {
+ me.plaid_env = result.plaid_env;
+ me.plaid_public_key = result.plaid_public_key;
+ me.client_name = result.client_name;
+ me.init_plaid();
+ } else {
+ frappe.throw(__("Please save your document before adding a new account"));
+ }
+ });
+ }
+
+ init_plaid() {
+ const me = this;
+ me.loadScript(me.plaidUrl)
+ .then(() => {
+ me.onScriptLoaded(me);
+ })
+ .then(() => {
+ if (me.linkHandler) {
+ me.linkHandler.open();
+ }
+ })
+ .catch((error) => {
+ me.onScriptError(error);
+ });
+ }
+
+ loadScript(src) {
+ return new Promise(function (resolve, reject) {
+ if (document.querySelector('script[src="' + src + '"]')) {
+ resolve();
+ return;
+ }
+ const el = document.createElement('script');
+ el.type = 'text/javascript';
+ el.async = true;
+ el.src = src;
+ el.addEventListener('load', resolve);
+ el.addEventListener('error', reject);
+ el.addEventListener('abort', reject);
+ document.head.appendChild(el);
+ });
+ }
+
+ onScriptLoaded(me) {
+ me.linkHandler = window.Plaid.create({
+ clientName: me.client_name,
+ env: me.plaid_env,
+ key: me.plaid_public_key,
+ onSuccess: me.plaid_success,
+ product: me.product
+ });
+ }
+
+ onScriptError(error) {
+ frappe.msgprint('There was an issue loading the link-initialize.js script');
+ frappe.msgprint(error);
+ }
+
+ plaid_success(token, response) {
+ const me = this;
+
+ frappe.prompt({
+ fieldtype:"Link",
+ options: "Company",
+ label:__("Company"),
+ fieldname:"company",
+ reqd:1
+ }, (data) => {
+ me.company = data.company;
+ frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_institution', {token: token, response: response})
+ .then((result) => {
+ frappe.xcall('erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.add_bank_accounts', {response: response,
+ bank: result, company: me.company});
+ })
+ .then(() => {
+ frappe.show_alert({message:__("Bank accounts added"), indicator:'green'});
+ });
+ }, __("Select a company"), __("Continue"));
+ }
+};
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
new file mode 100644
index 00000000000..ed51c4e8f80
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
@@ -0,0 +1,161 @@
+{
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2018-10-25 10:02:48.656165",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "enabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Enabled",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.enabled==1",
+ "fieldname": "automatic_sync",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Synchronize all accounts every hour",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.enabled==1)&&(!doc.__islocal)",
+ "fieldname": "link_new_account",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Link a new bank account",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ }
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-12-14 12:51:12.331395",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "Plaid Settings",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "System Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 0,
+ "track_seen": 0,
+ "track_views": 0
+}
\ 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
new file mode 100644
index 00000000000..8d31e24cd6c
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -0,0 +1,198 @@
+# -*- 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
+import json
+from frappe import _
+from frappe.model.document import Document
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+from erpnext.erpnext_integrations.doctype.plaid_settings.plaid_connector import PlaidConnector
+from frappe.utils import getdate, formatdate, today, add_months
+
+class PlaidSettings(Document):
+ pass
+
+@frappe.whitelist()
+def plaid_configuration():
+ 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)
+
+ plaid = PlaidConnector()
+ access_token = plaid.get_access_token(token)
+
+ if not frappe.db.exists("Bank", response["institution"]["name"]):
+ try:
+ bank = frappe.get_doc({
+ "doctype": "Bank",
+ "bank_name": response["institution"]["name"],
+ "plaid_access_token": access_token
+ })
+ bank.insert()
+ except Exception:
+ frappe.throw(frappe.get_traceback())
+
+ else:
+ bank = frappe.get_doc("Bank", response["institution"]["name"])
+ bank.plaid_access_token = access_token
+ bank.save()
+
+ return bank
+
+@frappe.whitelist()
+def add_bank_accounts(response, bank, company):
+ response = json.loads(response) if not "accounts" in response else response
+ bank = json.loads(bank)
+ 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"])
+ if not acc_type:
+ add_account_type(account["type"])
+
+ acc_subtype = frappe.db.get_value("Account Subtype", account["subtype"])
+ if not acc_subtype:
+ add_account_subtype(account["subtype"])
+
+ if not frappe.db.exists("Bank Account", dict(integration_id=account["id"])):
+ try:
+ new_account = frappe.get_doc({
+ "doctype": "Bank Account",
+ "bank": bank["bank_name"],
+ "account": default_gl_account.account,
+ "account_name": account["name"],
+ "account_type": account["type"] or "",
+ "account_subtype": account["subtype"] or "",
+ "mask": account["mask"] or "",
+ "integration_id": account["id"],
+ "is_company_account": 1,
+ "company": company
+ })
+ new_account.insert()
+
+ result.append(new_account.name)
+
+ except frappe.UniqueValidationError:
+ 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())
+
+ else:
+ result.append(frappe.db.get_value("Bank Account", dict(integration_id=account["id"]), "name"))
+
+ return result
+
+def add_account_type(account_type):
+ try:
+ frappe.get_doc({
+ "doctype": "Account Type",
+ "account_type": account_type
+ }).insert()
+ except Exception:
+ frappe.throw(frappe.get_traceback())
+
+
+def add_account_subtype(account_subtype):
+ try:
+ frappe.get_doc({
+ "doctype": "Account Subtype",
+ "account_subtype": account_subtype
+ }).insert()
+ except Exception:
+ frappe.throw(frappe.get_traceback())
+
+@frappe.whitelist()
+def sync_transactions(bank, bank_account):
+
+ last_sync_date = frappe.db.get_value("Bank Account", bank_account, "last_integration_date")
+ if last_sync_date:
+ start_date = formatdate(last_sync_date, "YYYY-MM-dd")
+ else:
+ start_date = formatdate(add_months(today(), -12), "YYYY-MM-dd")
+ end_date = formatdate(today(), "YYYY-MM-dd")
+
+ try:
+ transactions = get_transactions(bank=bank, bank_account=bank_account, start_date=start_date, end_date=end_date)
+ result = []
+ if transactions:
+ for transaction in transactions:
+ result.append(new_bank_transaction(transaction))
+
+ frappe.db.set_value("Bank Account", bank_account, "last_integration_date", getdate(end_date))
+
+ return result
+ except Exception:
+ frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
+
+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", 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
+
+ else:
+ access_token = frappe.db.get_value("Bank", bank, "plaid_access_token")
+ account_id = None
+
+ plaid = PlaidConnector(access_token)
+ transactions = plaid.get_transactions(start_date=start_date, end_date=end_date, account_id=account_id)
+
+ return transactions
+
+def new_bank_transaction(transaction):
+ result = []
+
+ bank_account = frappe.db.get_value("Bank Account", dict(integration_id=transaction["account_id"]))
+
+ if float(transaction["amount"]) >= 0:
+ debit = float(transaction["amount"])
+ credit = 0
+ else:
+ debit = 0
+ credit = abs(float(transaction["amount"]))
+
+ status = "Pending" if transaction["pending"] == "True" else "Settled"
+
+ if not frappe.db.exists("Bank Transaction", dict(transaction_id=transaction["transaction_id"])):
+ try:
+ new_transaction = frappe.get_doc({
+ "doctype": "Bank Transaction",
+ "date": getdate(transaction["date"]),
+ "status": status,
+ "bank_account": bank_account,
+ "debit": debit,
+ "credit": credit,
+ "currency": transaction["iso_currency_code"],
+ "description": transaction["name"]
+ })
+ new_transaction.insert()
+ new_transaction.submit()
+
+ result.append(new_transaction.name)
+
+ except Exception:
+ frappe.throw(frappe.get_traceback())
+
+ return result
+
+def automatic_synchronization():
+ settings = frappe.get_doc("Plaid Settings", "Plaid Settings")
+
+ if settings.enabled == 1 and settings.automatic_sync == 1:
+ plaid_accounts = frappe.get_all("Bank Account", filter={"integration_id": ["!=", ""]}, fields=["name", "bank"])
+
+ for plaid_account in plaid_accounts:
+ frappe.enqueue("erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.sync_transactions", bank=plaid_account.bank, bank_account=plaid_account.name)
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js
new file mode 100644
index 00000000000..dc91347336d
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Plaid Settings", function (assert) {
+ let done = assert.async();
+
+ // number of asserts
+ assert.expect(1);
+
+ frappe.run_serially([
+ // insert a new Plaid Settings
+ () => frappe.tests.make('Plaid Settings', [
+ // values to be set
+ {key: 'value'}
+ ]),
+ () => {
+ assert.equal(cur_frm.doc.key, 'value');
+ },
+ () => done()
+ ]);
+
+});
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
new file mode 100644
index 00000000000..29e8fa4fec8
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/test_plaid_settings.py
@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import unittest
+import frappe
+from erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings import plaid_configuration, add_account_type, add_account_subtype, new_bank_transaction, add_bank_accounts
+import json
+from frappe.utils.response import json_handler
+from erpnext.accounts.doctype.journal_entry.journal_entry import get_default_bank_cash_account
+
+class TestPlaidSettings(unittest.TestCase):
+ def setUp(self):
+ pass
+
+ def tearDown(self):
+ for bt in frappe.get_all("Bank Transaction"):
+ doc = frappe.get_doc("Bank Transaction", bt.name)
+ doc.cancel()
+ doc.delete()
+
+ for ba in frappe.get_all("Bank Account"):
+ frappe.get_doc("Bank Account", ba.name).delete()
+
+ for at in frappe.get_all("Account Type"):
+ frappe.get_doc("Account Type", at.name).delete()
+
+ for ast in frappe.get_all("Account Subtype"):
+ frappe.get_doc("Account Subtype", ast.name).delete()
+
+ def test_plaid_disabled(self):
+ frappe.db.set_value("Plaid Settings", None, "enabled", 0)
+ self.assertTrue(plaid_configuration() == "disabled")
+
+ def test_add_account_type(self):
+ add_account_type("brokerage")
+ self.assertEqual(frappe.get_doc("Account Type", "brokerage").name, "brokerage")
+
+ def test_add_account_subtype(self):
+ add_account_subtype("loan")
+ self.assertEqual(frappe.get_doc("Account Subtype", "loan").name, "loan")
+
+ def test_default_bank_account(self):
+ if not frappe.db.exists("Bank", "Citi"):
+ frappe.get_doc({
+ "doctype": "Bank",
+ "bank_name": "Citi"
+ }).insert()
+
+ bank_accounts = {
+ 'account': {
+ 'subtype': 'checking',
+ 'mask': '0000',
+ 'type': 'depository',
+ 'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'name': 'Plaid Checking'
+ },
+ 'account_id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'link_session_id': 'db673d75-61aa-442a-864f-9b3f174f3725',
+ 'accounts': [{
+ 'type': 'depository',
+ 'subtype': 'checking',
+ 'mask': '0000',
+ 'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'name': 'Plaid Checking'
+ }],
+ 'institution': {
+ 'institution_id': 'ins_6',
+ 'name': 'Citi'
+ }
+ }
+
+ bank = json.dumps(frappe.get_doc("Bank", "Citi").as_dict(), default=json_handler)
+ company = frappe.db.get_single_value('Global Defaults', 'default_company')
+ frappe.db.set_value("Company", company, "default_bank_account", None)
+
+ self.assertRaises(frappe.ValidationError, add_bank_accounts, response=bank_accounts, bank=bank, company=company)
+
+ def test_new_transaction(self):
+ if not frappe.db.exists("Bank", "Citi"):
+ frappe.get_doc({
+ "doctype": "Bank",
+ "bank_name": "Citi"
+ }).insert()
+
+ bank_accounts = {
+ 'account': {
+ 'subtype': 'checking',
+ 'mask': '0000',
+ 'type': 'depository',
+ 'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'name': 'Plaid Checking'
+ },
+ 'account_id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'link_session_id': 'db673d75-61aa-442a-864f-9b3f174f3725',
+ 'accounts': [{
+ 'type': 'depository',
+ 'subtype': 'checking',
+ 'mask': '0000',
+ 'id': '6GbM6RRQgdfy3lAqGz4JUnpmR948WZFg8DjQK',
+ 'name': 'Plaid Checking'
+ }],
+ 'institution': {
+ 'institution_id': 'ins_6',
+ 'name': 'Citi'
+ }
+ }
+
+ bank = json.dumps(frappe.get_doc("Bank", "Citi").as_dict(), default=json_handler)
+ company = frappe.db.get_single_value('Global Defaults', 'default_company')
+
+ if frappe.db.get_value("Company", company, "default_bank_account") is None:
+ frappe.db.set_value("Company", company, "default_bank_account", get_default_bank_cash_account(company, "Cash").get("account"))
+
+ add_bank_accounts(bank_accounts, bank, company)
+
+ transactions = {
+ 'account_owner': None,
+ 'category': ['Food and Drink', 'Restaurants'],
+ 'account_id': 'b4Jkp1LJDZiPgojpr1ansXJrj5Q6w9fVmv6ov',
+ 'pending_transaction_id': None,
+ 'transaction_id': 'x374xPa7DvUewqlR5mjNIeGK8r8rl3Sn647LM',
+ 'unofficial_currency_code': None,
+ 'name': 'INTRST PYMNT',
+ 'transaction_type': 'place',
+ 'amount': -4.22,
+ 'location': {
+ 'city': None,
+ 'zip': None,
+ 'store_number': None,
+ 'lon': None,
+ 'state': None,
+ 'address': None,
+ 'lat': None
+ },
+ 'payment_meta': {
+ 'reference_number': None,
+ 'payer': None,
+ 'payment_method': None,
+ 'reason': None,
+ 'payee': None,
+ 'ppd_id': None,
+ 'payment_processor': None,
+ 'by_order_of': None
+ },
+ 'date': '2017-12-22',
+ 'category_id': '13005000',
+ 'pending': False,
+ 'iso_currency_code': 'USD'
+ }
+
+ new_bank_transaction(transactions)
+
+ self.assertTrue(len(frappe.get_all("Bank Transaction")) == 1)
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index ccdd412c181..89eb85247b4 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -229,6 +229,7 @@ scheduler_events = {
'erpnext.hr.doctype.daily_work_summary_group.daily_work_summary_group.trigger_emails',
"erpnext.accounts.doctype.subscription.subscription.process_all",
"erpnext.erpnext_integrations.doctype.amazon_mws_settings.amazon_mws_settings.schedule_get_order_details",
+ "erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.automatic_synchronization",
"erpnext.projects.doctype.project.project.hourly_reminder",
"erpnext.projects.doctype.project.project.collect_project_status"
],
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 44b70c67a13..19b990d82fd 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -844,6 +844,38 @@
"translatable": 0,
"unique": 0
},
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "clearance_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Clearance Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
+ },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index c34eef25080..1f702e69cca 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -1,58 +1,58 @@
{
- "css/erpnext.css": [
- "public/less/erpnext.less",
- "public/less/hub.less"
- ],
- "css/marketplace.css": [
- "public/less/hub.less"
- ],
- "js/erpnext-web.min.js": [
- "public/js/website_utils.js",
- "public/js/shopping_cart.js"
- ],
+ "css/erpnext.css": [
+ "public/less/erpnext.less",
+ "public/less/hub.less"
+ ],
+ "css/marketplace.css": [
+ "public/less/hub.less"
+ ],
+ "js/erpnext-web.min.js": [
+ "public/js/website_utils.js",
+ "public/js/shopping_cart.js"
+ ],
"css/erpnext-web.css": [
"public/less/website.less"
],
- "js/marketplace.min.js": [
- "public/js/hub/marketplace.js"
- ],
- "js/erpnext.min.js": [
- "public/js/conf.js",
- "public/js/utils.js",
- "public/js/queries.js",
- "public/js/sms_manager.js",
- "public/js/utils/party.js",
- "public/js/templates/address_list.html",
- "public/js/templates/contact_list.html",
- "public/js/controllers/stock_controller.js",
- "public/js/payment/payments.js",
- "public/js/controllers/taxes_and_totals.js",
- "public/js/controllers/transaction.js",
- "public/js/pos/pos.html",
- "public/js/pos/pos_bill_item.html",
- "public/js/pos/pos_bill_item_new.html",
- "public/js/pos/pos_selected_item.html",
- "public/js/pos/pos_item.html",
- "public/js/pos/pos_tax_row.html",
- "public/js/pos/customer_toolbar.html",
- "public/js/pos/pos_invoice_list.html",
- "public/js/payment/pos_payment.html",
- "public/js/payment/payment_details.html",
- "public/js/templates/item_selector.html",
+ "js/marketplace.min.js": [
+ "public/js/hub/marketplace.js"
+ ],
+ "js/erpnext.min.js": [
+ "public/js/conf.js",
+ "public/js/utils.js",
+ "public/js/queries.js",
+ "public/js/sms_manager.js",
+ "public/js/utils/party.js",
+ "public/js/templates/address_list.html",
+ "public/js/templates/contact_list.html",
+ "public/js/controllers/stock_controller.js",
+ "public/js/payment/payments.js",
+ "public/js/controllers/taxes_and_totals.js",
+ "public/js/controllers/transaction.js",
+ "public/js/pos/pos.html",
+ "public/js/pos/pos_bill_item.html",
+ "public/js/pos/pos_bill_item_new.html",
+ "public/js/pos/pos_selected_item.html",
+ "public/js/pos/pos_item.html",
+ "public/js/pos/pos_tax_row.html",
+ "public/js/pos/customer_toolbar.html",
+ "public/js/pos/pos_invoice_list.html",
+ "public/js/payment/pos_payment.html",
+ "public/js/payment/payment_details.html",
+ "public/js/templates/item_selector.html",
"public/js/templates/employees_to_mark_attendance.html",
- "public/js/utils/item_selector.js",
- "public/js/help_links.js",
- "public/js/agriculture/ternary_plot.js",
- "public/js/templates/item_quick_entry.html",
- "public/js/utils/item_quick_entry.js",
+ "public/js/utils/item_selector.js",
+ "public/js/help_links.js",
+ "public/js/agriculture/ternary_plot.js",
+ "public/js/templates/item_quick_entry.html",
+ "public/js/utils/item_quick_entry.js",
"public/js/utils/customer_quick_entry.js",
- "public/js/education/student_button.html",
- "public/js/education/assessment_result_tool.html",
- "public/js/hub/hub_factory.js"
- ],
- "js/item-dashboard.min.js": [
- "stock/dashboard/item_dashboard.html",
- "stock/dashboard/item_dashboard_list.html",
- "stock/dashboard/item_dashboard.js"
- ]
+ "public/js/education/student_button.html",
+ "public/js/education/assessment_result_tool.html",
+ "public/js/hub/hub_factory.js"
+ ],
+ "js/item-dashboard.min.js": [
+ "stock/dashboard/item_dashboard.html",
+ "stock/dashboard/item_dashboard_list.html",
+ "stock/dashboard/item_dashboard.js"
+ ]
}
diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less
index b746cc138f6..8ed5f1adb05 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);
}
@@ -458,4 +458,4 @@ body[data-route="pos"] {
.list-item_content {
padding-right: 45px;
}
-}
+}
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 0fee6c10847..28ba9f676ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,5 @@ python-stdnum
braintree
gocardless_pro
woocommerce
-pandas
\ No newline at end of file
+pandas
+plaid-python
\ No newline at end of file