From 2b1d33f1783e9e53f24c710a0f44c69958a8b751 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 25 Jul 2013 17:17:47 +0530 Subject: [PATCH] [minor] [cleanup] [issue] webnotes/erpnext#438 - change user_type Partner to Website User --- .../july_2013/p10_change_partner_user_to_website_user.py | 9 +++++++++ patches/march_2013/p09_unset_user_type_partner.py | 6 ------ patches/patch_list.py | 2 +- startup/event_handlers.py | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 patches/july_2013/p10_change_partner_user_to_website_user.py delete mode 100644 patches/march_2013/p09_unset_user_type_partner.py diff --git a/patches/july_2013/p10_change_partner_user_to_website_user.py b/patches/july_2013/p10_change_partner_user_to_website_user.py new file mode 100644 index 0000000000..50bc67114a --- /dev/null +++ b/patches/july_2013/p10_change_partner_user_to_website_user.py @@ -0,0 +1,9 @@ +import webnotes + +def execute(): + webnotes.conn.sql("""update `tabProfile` set user_type="Website User" where user_type="Partner" """) + webnotes.conn.sql("""update `tabProfile` set user_type="System User" where ifnull(user_type, "")="" """) + + webnotes.conn.sql("""update `tabProfile` set user_type='System User' + where user_type='Website User' and exists (select name from `tabUserRole` + where parent=`tabProfile`.name)""") \ No newline at end of file diff --git a/patches/march_2013/p09_unset_user_type_partner.py b/patches/march_2013/p09_unset_user_type_partner.py deleted file mode 100644 index cc5cdce5c2..0000000000 --- a/patches/march_2013/p09_unset_user_type_partner.py +++ /dev/null @@ -1,6 +0,0 @@ -import webnotes - -def execute(): - webnotes.conn.sql("""update `tabProfile` set user_type='System User' - where user_type='Partner' and exists (select name from `tabUserRole` - where parent=`tabProfile`.name)""") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index d622cd648c..9b6bb0f2dd 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -194,7 +194,6 @@ patch_list = [ "execute:webnotes.reload_doc('website', 'doctype', 'web_page') #2013-03-25", "execute:webnotes.reload_doc('setup', 'doctype', 'sales_partner') #2013-06-25", "execute:webnotes.conn.set_value('Email Settings', None, 'send_print_in_body_and_attachment', 1)", - "patches.march_2013.p09_unset_user_type_partner", "patches.march_2013.p10_set_fiscal_year_for_stock", "patches.march_2013.p10_update_against_expense_account", "patches.march_2013.p11_update_attach_files", @@ -262,4 +261,5 @@ patch_list = [ "execute:webnotes.reload_doc('stock', 'Print Format', 'Delivery Note Spartan') # 2013-07-22", "patches.july_2013.p08_custom_print_format_net_total_export", "patches.july_2013.p09_remove_website_pyc", + "patches.july_2013.p10_change_partner_user_to_website_user", ] \ No newline at end of file diff --git a/startup/event_handlers.py b/startup/event_handlers.py index 3f145421c0..d19f9e6a1c 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -30,7 +30,7 @@ def on_login_post_session(login_manager): login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D') webnotes.conn.commit() - if webnotes.conn.get_value("Profile", webnotes.session.user, "user_type") == "Partner": + if webnotes.conn.get_value("Profile", webnotes.session.user, "user_type") == "Website User": from website.helpers.cart import set_cart_count set_cart_count()