Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bank statement import via google sheet (#25677)

Browse Source 
* fix: change links in workspace

* fix: google sheet bank statement import

* chore: quotes

* fix: capitalization

* fix: typo

* chore: add translation
This commit is contained in:
Mohammad Hasnain Mohsin Rajan 2021-05-13 17:28:49 +05:30 committed by GitHub
parent 6084baa9ae
commit 7c6de1a8ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js
View File

@ -239,6 +239,7 @@ frappe.ui.form.on("Bank Statement Import", {
"withdrawal", "withdrawal",
"description", "description",
"reference_number", "reference_number",
"bank_account"
], ],
}, },
}); });

6
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
View File

@ -146,7 +146,7 @@
}, },
{ {
"depends_on": "eval:!doc.__islocal && !doc.import_file\n", "depends_on": "eval:!doc.__islocal && !doc.import_file\n",
"description": "Must be a publicly accessible Google Sheets URL", "description": "Must be a publicly accessible Google Sheets URL and adding Bank Account column is necessary for importing via Google Sheets",
"fieldname": "google_sheets_url", "fieldname": "google_sheets_url",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Import from Google Sheets" "label": "Import from Google Sheets"
@ -202,7 +202,7 @@
], ],
"hide_toolbar": 1, "hide_toolbar": 1,
"links": [], "links": [],
"modified": "2021-02-10 19:29:59.027325", "modified": "2021-05-12 14:17:37.777246",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Statement Import", "name": "Bank Statement Import",
@ -224,4 +224,4 @@
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }

18
erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
View File

@ -47,6 +47,13 @@ class BankStatementImport(DataImport):
def start_import(self): def start_import(self):
preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
self.import_file, self.google_sheets_url
)
if 'Bank Account' not in json.dumps(preview):
frappe.throw(_("Please add the Bank Account column"))
from frappe.core.page.background_jobs.background_jobs import get_info from frappe.core.page.background_jobs.background_jobs import get_info
from frappe.utils.scheduler import is_scheduler_inactive from frappe.utils.scheduler import is_scheduler_inactive
@ -67,6 +74,7 @@ class BankStatementImport(DataImport):
data_import=self.name, data_import=self.name,
bank_account=self.bank_account, bank_account=self.bank_account,
import_file_path=self.import_file, import_file_path=self.import_file,
google_sheets_url=self.google_sheets_url,
bank=self.bank, bank=self.bank,
template_options=self.template_options, template_options=self.template_options,
now=frappe.conf.developer_mode or frappe.flags.in_test, now=frappe.conf.developer_mode or frappe.flags.in_test,
@ -90,18 +98,20 @@ def download_errored_template(data_import_name):
data_import = frappe.get_doc("Bank Statement Import", data_import_name) data_import = frappe.get_doc("Bank Statement Import", data_import_name)
data_import.export_errored_rows() data_import.export_errored_rows()
def start_import(data_import, bank_account, import_file_path, bank, template_options): def start_import(data_import, bank_account, import_file_path, google_sheets_url, bank, template_options):
"""This method runs in background job""" """This method runs in background job"""
update_mapping_db(bank, template_options) update_mapping_db(bank, template_options)
data_import = frappe.get_doc("Bank Statement Import", data_import) data_import = frappe.get_doc("Bank Statement Import", data_import)
file = import_file_path if import_file_path else google_sheets_url
import_file = ImportFile("Bank Transaction", file = import_file_path, import_type="Insert New Records") import_file = ImportFile("Bank Transaction", file = file, import_type="Insert New Records")
data = import_file.raw_data data = import_file.raw_data
add_bank_account(data, bank_account) if import_file_path:
write_files(import_file, data) add_bank_account(data, bank_account)
write_files(import_file, data)
try: try:
i = Importer(data_import.reference_doctype, data_import=data_import) i = Importer(data_import.reference_doctype, data_import=data_import)