Rename Bank Statement Settings appropriately and allow auto

populating some settings for supported banks

erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.json

@@ -18,8 +18,8 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "bank_account", 
+   "fieldname": "bank", 
-   "fieldtype": "Link", 
+   "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -27,10 +27,10 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Bank Account", 
+   "label": "Bank Name", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Account", 
+   "options": "", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -72,6 +73,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -102,6 +104,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -133,6 +136,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -163,6 +167,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -194,6 +199,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -207,7 +213,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-01-12 10:34:32.840487", 
+ "modified": "2018-03-31 10:08:46.971367", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Statement Settings", 

erpnext/accounts/doctype/bank_statement_settings/bank_statement_settings.py

@@ -8,4 +8,4 @@ from frappe.model.document import Document
 
 class BankStatementSettings(Document):
 	def autoname(self):
-		self.name = self.bank_account + "-Mappings"
+		self.name = self.bank + "-Statement-Settings"

erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.json

@@ -41,6 +41,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -71,6 +72,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -101,6 +103,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -109,7 +112,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "bank_data_mapper", 
+   "fieldname": "bank_settings", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -118,7 +121,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Bank Data Mapper", 
+   "label": "Bank Statement Settings", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Bank Statement Settings", 
@@ -132,6 +135,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -161,6 +165,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -192,6 +197,7 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -223,6 +229,39 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bank", 
+   "fieldtype": "Select", 
+   "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": "Bank Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Syndicate", 
+   "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
   }, 
   {
@@ -253,6 +292,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -283,6 +323,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -314,6 +355,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -343,6 +385,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -373,6 +416,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -402,6 +446,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -432,6 +477,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -461,6 +507,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -491,6 +538,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -521,6 +569,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -552,6 +601,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -582,6 +632,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -613,6 +664,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
@@ -643,6 +695,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -656,7 +709,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-11-15 20:00:43.389008", 
+ "modified": "2018-03-31 10:11:46.533629", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Statement Transaction Entry", 

erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py

@@ -16,16 +16,19 @@ import copy
 class BankStatementTransactionEntry(Document):
 	def autoname(self):
 		self.name = self.bank_account + "-" + self.from_date + "-" + self.to_date
-		mapper_name = self.bank_account + "-Mappings"
+		mapper_name = self.bank + "-Statement-Settings"
 		if not frappe.db.exists("Bank Statement Settings", mapper_name):
+			self.create_settings(self.bank)
+		self.bank_settings = mapper_name
+
+	def create_settings(self, bank):
 		mapper = frappe.new_doc("Bank Statement Settings")
-			mapper.bank_account = self.bank_account
+		mapper.bank = bank
 		mapper.date_format = "%Y-%m-%d"
 		for header in ["Date", "Particulars", "Withdrawals", "Deposits", "Balance"]:
 			header_item = mapper.append("header_items", {})
 			header_item.mapped_header = header_item.stmt_header = header
 		mapper.save()
-		self.bank_data_mapper = mapper_name
 
 	def on_update(self):
 		if (not self.bank_statement):
@@ -38,9 +41,9 @@ class BankStatementTransactionEntry(Document):
 			self.match_invoice_to_payment()
 
 	def get_statement_headers(self):
-		if not self.bank_data_mapper:
+		if not self.bank_settings:
 			frappe.throw("Bank Data mapper doesn't exist")
-		mapper_doc = frappe.get_doc("Bank Statement Settings", self.bank_data_mapper)
+		mapper_doc = frappe.get_doc("Bank Statement Settings", self.bank_settings)
 		headers = [entry.stmt_header for entry in mapper_doc.header_items]
 		return headers
 
@@ -50,11 +53,11 @@ class BankStatementTransactionEntry(Document):
 		if (len(self.new_transaction_items + self.reconciled_transaction_items) > 0):
 			frappe.throw("Transactions already retreived from the statement")
 
-		date_format = frappe.get_value("Bank Statement Settings", self.bank_data_mapper, "date_format")
+		date_format = frappe.get_value("Bank Statement Settings", self.bank_settings, "date_format")
 		if (date_format is None):
 			date_format = '%Y-%m-%d'
-		if self.bank_data_mapper:
+		if self.bank_settings:
-			mapped_items = frappe.get_doc("Bank Statement Settings", self.bank_data_mapper).mapped_items
+			mapped_items = frappe.get_doc("Bank Statement Settings", self.bank_settings).mapped_items
 		transactions = get_transaction_entries(filename, self.get_statement_headers())
 		for entry in transactions:
 			date = entry["Date"].strip()

erpnext/accounts/doctype/bank_statement_transaction_payment_item/bank_statement_transaction_payment_item.py

@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
 
-class BankStatementTransactionPaymentEntry(Document):
+class BankStatementTransactionPaymentItem(Document):
 	pass