From 5dbf8a74188a62782c1d3b495b8347f414d199d7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 1 May 2015 11:51:03 +0530 Subject: [PATCH] [cleanup] frappe.get_user --- erpnext/accounts/doctype/account/account.py | 4 ++-- erpnext/accounts/doctype/gl_entry/gl_entry.py | 4 ++-- erpnext/accounts/party.py | 2 +- erpnext/selling/doctype/customer/customer.py | 2 +- .../doctype/authorization_control/authorization_control.py | 6 +++--- .../stock/doctype/stock_ledger_entry/stock_ledger_entry.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py index a824a129b7..683734b879 100644 --- a/erpnext/accounts/doctype/account/account.py +++ b/erpnext/accounts/doctype/account/account.py @@ -13,7 +13,7 @@ class Account(Document): def onload(self): frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings", "frozen_accounts_modifier") - if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.user.get_roles(): + if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles(): self.get("__onload").can_freeze_account = True def autoname(self): @@ -59,7 +59,7 @@ class Account(Document): if old_value and old_value != self.freeze_account: frozen_accounts_modifier = frappe.db.get_value('Accounts Settings', None, 'frozen_accounts_modifier') if not frozen_accounts_modifier or \ - frozen_accounts_modifier not in frappe.user.get_roles(): + frozen_accounts_modifier not in frappe.get_roles(): throw(_("You are not authorized to set Frozen value")) def validate_balance_must_be_debit_or_credit(self): diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py index b17d75bbc2..ae4dae0616 100644 --- a/erpnext/accounts/doctype/gl_entry/gl_entry.py +++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py @@ -110,7 +110,7 @@ def check_freezing_date(posting_date, adv_adj=False): if acc_frozen_upto: frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier') if getdate(posting_date) <= getdate(acc_frozen_upto) \ - and not frozen_accounts_modifier in frappe.user.get_roles(): + and not frozen_accounts_modifier in frappe.get_roles(): frappe.throw(_("You are not authorized to add or update entries before {0}").format(formatdate(acc_frozen_upto))) def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False): @@ -155,5 +155,5 @@ def validate_frozen_account(account, adv_adj=None): if not frozen_accounts_modifier: frappe.throw(_("Account {0} is frozen").format(account)) - elif frozen_accounts_modifier not in frappe.user.get_roles(): + elif frozen_accounts_modifier not in frappe.get_roles(): frappe.throw(_("Not authorized to edit frozen Account {0}").format(account)) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 7ea0c66e74..00e595fcb3 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -186,7 +186,7 @@ def validate_due_date(posting_date, due_date, party_type, party, company): frappe.throw(_("Due Date cannot be before Posting Date")) elif credit_days is not None and diff > flt(credit_days): is_credit_controller = frappe.db.get_value("Accounts Settings", None, - "credit_controller") in frappe.user.get_roles() + "credit_controller") in frappe.get_roles() if is_credit_controller: msgprint(_("Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s)") diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index 7e722fc4dd..2d0f850a5c 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -161,7 +161,7 @@ def check_credit_limit(customer, company): # If not authorized person raise exception credit_controller = frappe.db.get_value('Accounts Settings', None, 'credit_controller') - if not credit_controller or credit_controller not in frappe.user.get_roles(): + if not credit_controller or credit_controller not in frappe.get_roles(): throw(_("Please contact to the user who have Sales Master Manager {0} role") .format(" / " + credit_controller if credit_controller else "")) diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py index 5d937ac9ad..f1c198c2fa 100644 --- a/erpnext/setup/doctype/authorization_control/authorization_control.py +++ b/erpnext/setup/doctype/authorization_control/authorization_control.py @@ -32,7 +32,7 @@ class AuthorizationControl(TransactionBase): if(d[0]): appr_users.append(d[0]) if(d[1]): appr_roles.append(d[1]) - if not has_common(appr_roles, frappe.user.get_roles()) and not has_common(appr_users, [session['user']]): + if not has_common(appr_roles, frappe.get_roles()) and not has_common(appr_users, [session['user']]): frappe.msgprint(_("Not authroized since {0} exceeds limits").format(_(based_on))) frappe.throw(_("Can be approved by {0}").format(comma_or(appr_roles + appr_users))) @@ -77,7 +77,7 @@ class AuthorizationControl(TransactionBase): auth_value = av_dis if val == 1: add_cond += " and system_user = '"+session['user'].replace("'", "\\'")+"'" - elif val == 2: add_cond += " and system_role IN %s" % ("('"+"','".join(frappe.user.get_roles())+"')") + elif val == 2: add_cond += " and system_role IN %s" % ("('"+"','".join(frappe.get_roles())+"')") else: add_cond += " and ifnull(system_user,'') = '' and ifnull(system_role,'') = ''" if based_on == 'Grand Total': auth_value = total @@ -130,7 +130,7 @@ class AuthorizationControl(TransactionBase): where transaction = %s and system_role IN (%s) and based_on IN (%s) and (company = %s or ifnull(company,'')='') and docstatus != 2 - """ % ('%s', "'"+"','".join(frappe.user.get_roles())+"'", "'"+"','".join(final_based_on)+"'", '%s'), (doctype_name, company))] + """ % ('%s', "'"+"','".join(frappe.get_roles())+"'", "'"+"','".join(final_based_on)+"'", '%s'), (doctype_name, company))] for d in based_on: self.bifurcate_based_on_type(doctype_name, total, av_dis, d, doc_obj, 2, company) diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index 1b3dc06a95..97e7c20b34 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -82,14 +82,14 @@ class StockLedgerEntry(Document): stock_frozen_upto = frappe.db.get_value('Stock Settings', None, 'stock_frozen_upto') or '' if stock_frozen_upto: stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role') - if getdate(self.posting_date) <= getdate(stock_frozen_upto) and not stock_auth_role in frappe.user.get_roles(): + if getdate(self.posting_date) <= getdate(stock_frozen_upto) and not stock_auth_role in frappe.get_roles(): frappe.throw(_("Stock transactions before {0} are frozen").format(formatdate(stock_frozen_upto)), StockFreezeError) stock_frozen_upto_days = int(frappe.db.get_value('Stock Settings', None, 'stock_frozen_upto_days') or 0) if stock_frozen_upto_days: stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role') older_than_x_days_ago = (add_days(getdate(self.posting_date), stock_frozen_upto_days) <= date.today()) - if older_than_x_days_ago and not stock_auth_role in frappe.user.get_roles(): + if older_than_x_days_ago and not stock_auth_role in frappe.get_roles(): frappe.throw(_("Not allowed to update stock transactions older than {0}").format(stock_frozen_upto_days), StockFreezeError) def scrub_posting_time(self):