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

Merge pull request #39651 from RitvikSardana/develop-ritvik-ignore-permission-flag

Browse Source 
fix: add ignore_permissions flag while creating a payment entry.
This commit is contained in:
RitvikSardana 2024-02-05 11:45:02 +05:30 committed by GitHub
commit 955098c4c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1169,7 +1169,9 @@ class JournalEntry(AccountsController):
@frappe.whitelist() @frappe.whitelist()
def get_default_bank_cash_account(company, account_type=None, mode_of_payment=None, account=None): def get_default_bank_cash_account(
company, account_type=None, mode_of_payment=None, account=None, ignore_permissions=False
):
from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account from erpnext.accounts.doctype.sales_invoice.sales_invoice import get_bank_cash_account
if mode_of_payment: if mode_of_payment:
@ -1207,7 +1209,7 @@ def get_default_bank_cash_account(company, account_type=None, mode_of_payment=No
return frappe._dict( return frappe._dict(
{ {
"account": account, "account": account,
"balance": get_balance_on(account), "balance": get_balance_on(account, ignore_account_permission=ignore_permissions),
"account_currency": account_details.account_currency, "account_currency": account_details.account_currency,
"account_type": account_details.account_type, "account_type": account_details.account_type,
} }

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

@ -2220,6 +2220,7 @@ def get_payment_entry(
party_type=None, party_type=None,
payment_type=None, payment_type=None,
reference_date=None, reference_date=None,
ignore_permissions=False,
): ):
doc = frappe.get_doc(dt, dn) doc = frappe.get_doc(dt, dn)
over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance") over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
@ -2242,14 +2243,14 @@ def get_payment_entry(
) )
# bank or cash # bank or cash
bank = get_bank_cash_account(doc, bank_account) bank = get_bank_cash_account(doc, bank_account, ignore_permissions=ignore_permissions)
# if default bank or cash account is not set in company master and party has default company bank account, fetch it # if default bank or cash account is not set in company master and party has default company bank account, fetch it
if party_type in ["Customer", "Supplier"] and not bank: if party_type in ["Customer", "Supplier"] and not bank:
party_bank_account = get_party_bank_account(party_type, doc.get(scrub(party_type))) party_bank_account = get_party_bank_account(party_type, doc.get(scrub(party_type)))
if party_bank_account: if party_bank_account:
account = frappe.db.get_value("Bank Account", party_bank_account, "account") account = frappe.db.get_value("Bank Account", party_bank_account, "account")
bank = get_bank_cash_account(doc, account) bank = get_bank_cash_account(doc, account, ignore_permissions=ignore_permissions)
paid_amount, received_amount = set_paid_amount_and_received_amount( paid_amount, received_amount = set_paid_amount_and_received_amount(
dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc dt, party_account_currency, bank, outstanding_amount, payment_type, bank_amount, doc
@ -2389,9 +2390,13 @@ def update_accounting_dimensions(pe, doc):
pe.set(dimension, doc.get(dimension)) pe.set(dimension, doc.get(dimension))
def get_bank_cash_account(doc, bank_account): def get_bank_cash_account(doc, bank_account, ignore_permissions=False):
bank = get_default_bank_cash_account( bank = get_default_bank_cash_account(
doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"), account=bank_account doc.company,
"Bank",
mode_of_payment=doc.get("mode_of_payment"),
account=bank_account,
ignore_permissions=ignore_permissions,
) )
if not bank: if not bank: