mirror of
https://github.com/frappe/erpnext.git
synced 2026-09-03 00:23:21 +00:00
rename Profile to User frappe/frappe#470
This commit is contained in:
@@ -16,13 +16,13 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# default settings that can be made for a profile.
|
||||
# default settings that can be made for a user.
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import frappe
|
||||
|
||||
product_name = "ERPNext"
|
||||
profile_defaults = {
|
||||
user_defaults = {
|
||||
"Company": "company",
|
||||
"Territory": "territory"
|
||||
}
|
||||
|
||||
@@ -14,9 +14,9 @@ def on_session_creation(login_manager):
|
||||
if frappe.session['user'] not in ('Guest'):
|
||||
# create feed
|
||||
from frappe.utils import nowtime
|
||||
from frappe.profile import get_user_fullname
|
||||
from frappe.utils.user import get_user_fullname
|
||||
frappe.db.begin()
|
||||
make_feed('Login', 'Profile', login_manager.user, login_manager.user,
|
||||
make_feed('Login', 'User', login_manager.user, login_manager.user,
|
||||
'%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()),
|
||||
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')
|
||||
frappe.db.commit()
|
||||
Reference in New Issue
Block a user