From 9fffe254fcbdb24168072cc88f205942f4040509 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 3 May 2020 19:10:02 +0530 Subject: [PATCH 1/2] refactor: Folio no validation --- .../accounts/doctype/share_transfer/share_transfer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.py b/erpnext/accounts/doctype/share_transfer/share_transfer.py index 65f248e7bd..d4aa0f0ef8 100644 --- a/erpnext/accounts/doctype/share_transfer/share_transfer.py +++ b/erpnext/accounts/doctype/share_transfer/share_transfer.py @@ -168,10 +168,12 @@ class ShareTransfer(Document): return 'Outside' def folio_no_validation(self): - shareholders = ['from_shareholder', 'to_shareholder'] - shareholders = [shareholder for shareholder in shareholders if self.get(shareholder) is not ''] - for shareholder in shareholders: - doc = self.get_shareholder_doc(self.get(shareholder)) + shareholder_fields = ['from_shareholder', 'to_shareholder'] + for shareholder_field in shareholder_fields: + shareholder_name = self.get(shareholder_field) + if not shareholder_name: + continue + doc = self.get_shareholder_doc(shareholder_name) if doc.company != self.company: frappe.throw(_('The shareholder does not belong to this company')) if not doc.folio_no: From 9a8512d01d0779fdf543de950a76d4f42c4feb51 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 3 May 2020 20:17:47 +0530 Subject: [PATCH 2/2] fix: NameError due to invalid variable --- erpnext/accounts/doctype/share_transfer/share_transfer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.py b/erpnext/accounts/doctype/share_transfer/share_transfer.py index d4aa0f0ef8..4024b8155a 100644 --- a/erpnext/accounts/doctype/share_transfer/share_transfer.py +++ b/erpnext/accounts/doctype/share_transfer/share_transfer.py @@ -178,10 +178,10 @@ class ShareTransfer(Document): frappe.throw(_('The shareholder does not belong to this company')) if not doc.folio_no: doc.folio_no = self.from_folio_no \ - if (shareholder == 'from_shareholder') else self.to_folio_no + if (shareholder_field == 'from_shareholder') else self.to_folio_no doc.save() else: - if doc.folio_no and doc.folio_no != (self.from_folio_no if (shareholder == 'from_shareholder') else self.to_folio_no): + if doc.folio_no and doc.folio_no != (self.from_folio_no if (shareholder_field == 'from_shareholder') else self.to_folio_no): frappe.throw(_('The folio numbers are not matching')) def autoname_folio(self, shareholder, is_company=False):