From 78b273af43637b5d9bb157c966e303b06ec6c903 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 <42651287+deepeshgarg007@users.noreply.github.com> Date: Wed, 31 Oct 2018 18:12:03 +0530 Subject: [PATCH] [Bug-Fix] Cannot Save Bank Statement Transaction Entry (#15793) * Create bank settings only if bank name is available * Minor bug-fix in validate_overlap --- .../bank_statement_transaction_entry.py | 9 +++++---- erpnext/hr/utils.py | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py index 7a7d7d226c..f5581941ba 100644 --- a/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py +++ b/erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py @@ -16,10 +16,11 @@ import copy class BankStatementTransactionEntry(Document): def autoname(self): self.name = self.bank_account + "-" + self.from_date + "-" + self.to_date - 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 + if self.bank: + 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") diff --git a/erpnext/hr/utils.py b/erpnext/hr/utils.py index 281b7fcb5d..f35eb5919e 100644 --- a/erpnext/hr/utils.py +++ b/erpnext/hr/utils.py @@ -178,7 +178,8 @@ def validate_overlap(doc, from_date, to_date, company = None): }, as_dict = 1) if overlap_doc: - exists_for = doc.employee + if doc.get("employee"): + exists_for = doc.employee if company: exists_for = company throw_overlap_error(doc, exists_for, overlap_doc[0].name, from_date, to_date)