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

fix: Share existing condition logic

Browse Source
This commit is contained in:
deepeshgarg007 2019-11-18 22:12:29 +05:30
parent 9c1c4ef3dd
commit 0debcf9f2f
2 changed files with 85 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/doctype/share_transfer/share_transfer.py
View File

@ -109,12 +109,12 @@ class ShareTransfer(Document):
if self.transfer_type == 'Issue': if self.transfer_type == 'Issue':
# validate share doesn't exist in company # validate share doesn't exist in company
ret_val = self.share_exists(self.get_company_shareholder().name) ret_val = self.share_exists(self.get_company_shareholder().name)
if ret_val: if ret_val in ('Complete', 'Partial'):
frappe.throw(_('The shares already exist'), frappe.DuplicateEntryError) frappe.throw(_('The shares already exist'), frappe.DuplicateEntryError)
else: else:
# validate share exists with from_shareholder # validate share exists with from_shareholder
ret_val = self.share_exists(self.from_shareholder) ret_val = self.share_exists(self.from_shareholder)
if not ret_val: if ret_val in ('Outside', 'Partial'):
frappe.throw(_("The shares don't exist with the {0}") frappe.throw(_("The shares don't exist with the {0}")
.format(self.from_shareholder), ShareDontExists) .format(self.from_shareholder), ShareDontExists)
@ -159,11 +159,13 @@ class ShareTransfer(Document):
entry.to_no < self.from_no: entry.to_no < self.from_no:
continue # since query lies outside bounds continue # since query lies outside bounds
elif entry.from_no <= self.from_no and entry.to_no >= self.to_no: #both inside elif entry.from_no <= self.from_no and entry.to_no >= self.to_no: #both inside
return True # absolute truth! return 'Complete' # absolute truth!
elif (entry.from_no <= self.from_no <= self.to_no) or entry.from_no <= self.to_no and entry.to_no: elif entry.from_no <= self.from_no <= self.to_no:
return True return 'Partial'
elif entry.from_no <= self.to_no <= entry.to_no:
return 'Partial'
return False return 'Outside'
def folio_no_validation(self): def folio_no_validation(self):
shareholders = ['from_shareholder', 'to_shareholder'] shareholders = ['from_shareholder', 'to_shareholder']