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

fix: Ignore account permission check

Browse Source
This commit is contained in:
Suraj Shetty 2019-08-13 12:05:22 +05:30
parent 3234f0d299
commit 1a2600c9ea
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -763,12 +763,16 @@ def get_account_details(account, date, cost_center=None):
'name': account 'name': account
}, reference_doctype='Payment Entry', limit=1) }, reference_doctype='Payment Entry', limit=1)
account_balance = get_balance_on(account, date, cost_center=cost_center, ignore_account_permission=True)
# There might be some user permissions which will allow account under certain doctypes
# except for Payment Entry, only in such case we should throw permission error
if not account_list: if not account_list:
frappe.throw(_('Account: {0} is not permitted under Payment Entry').format(account)) frappe.throw(_('Account: {0} is not permitted under Payment Entry').format(account))
return frappe._dict({ return frappe._dict({
"account_currency": get_account_currency(account), "account_currency": get_account_currency(account),
"account_balance": get_balance_on(account, date, cost_center=cost_center), "account_balance": account_balance,
"account_type": frappe.db.get_value("Account", account, "account_type") "account_type": frappe.db.get_value("Account", account, "account_type")
}) })

6
erpnext/accounts/utils.py
View File

@ -84,7 +84,8 @@ def validate_fiscal_year(date, fiscal_year, company, label="Date", doc=None):
throw(_("{0} '{1}' not in Fiscal Year {2}").format(label, formatdate(date), fiscal_year)) throw(_("{0} '{1}' not in Fiscal Year {2}").format(label, formatdate(date), fiscal_year))
@frappe.whitelist() @frappe.whitelist()
def get_balance_on(account=None, date=None, party_type=None, party=None, company=None, in_account_currency=True, cost_center=None): def get_balance_on(account=None, date=None, party_type=None, party=None, company=None,
in_account_currency=True, cost_center=None, ignore_account_permission=False):
if not account and frappe.form_dict.get("account"): if not account and frappe.form_dict.get("account"):
account = frappe.form_dict.get("account") account = frappe.form_dict.get("account")
if not date and frappe.form_dict.get("date"): if not date and frappe.form_dict.get("date"):
@ -140,7 +141,8 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, company
if account: if account:
if not frappe.flags.ignore_account_permission: if not (frappe.flags.ignore_account_permission
or ignore_account_permission):
acc.check_permission("read") acc.check_permission("read")
if report_type == 'Profit and Loss': if report_type == 'Profit and Loss':