From 02edae8face02aa90204c8d0e2b462817b4e9198 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 12 May 2014 12:37:32 +0530 Subject: [PATCH 1/3] Added hook: setup_wizard_exception --- .../setup/page/setup_wizard/setup_wizard.py | 87 ++++++++++--------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py index aa96558c2ea..4b55f5bf874 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.py +++ b/erpnext/setup/page/setup_wizard/setup_wizard.py @@ -15,66 +15,73 @@ import install_fixtures @frappe.whitelist() def setup_account(args=None): - frappe.clear_cache() + try: + frappe.clear_cache() - if frappe.db.sql("select name from tabCompany"): - frappe.throw(_("Setup Already Complete!!")) + if frappe.db.sql("select name from tabCompany"): + frappe.throw(_("Setup Already Complete!!")) - if not args: - args = frappe.local.form_dict - if isinstance(args, basestring): - args = json.loads(args) - args = frappe._dict(args) + if not args: + args = frappe.local.form_dict + if isinstance(args, basestring): + args = json.loads(args) - if args.language != "english": - set_default_language(args.language) + args = frappe._dict(args) - install_fixtures.install(args.get("country")) + if args.language != "english": + set_default_language(args.language) - update_user_name(args) - frappe.local.message_log = [] + install_fixtures.install(args.get("country")) - create_fiscal_year_and_company(args) - frappe.local.message_log = [] + update_user_name(args) + frappe.local.message_log = [] - set_defaults(args) - frappe.local.message_log = [] + create_fiscal_year_and_company(args) + frappe.local.message_log = [] - create_territories() - frappe.local.message_log = [] + set_defaults(args) + frappe.local.message_log = [] - create_price_lists(args) - frappe.local.message_log = [] + create_territories() + frappe.local.message_log = [] - create_feed_and_todo() - frappe.local.message_log = [] + create_price_lists(args) + frappe.local.message_log = [] - create_email_digest() - frappe.local.message_log = [] + create_feed_and_todo() + frappe.local.message_log = [] - create_letter_head(args) - frappe.local.message_log = [] + create_email_digest() + frappe.local.message_log = [] - create_taxes(args) - frappe.local.message_log = [] + create_letter_head(args) + frappe.local.message_log = [] - create_items(args) - frappe.local.message_log = [] + create_taxes(args) + frappe.local.message_log = [] - create_customers(args) - frappe.local.message_log = [] + create_items(args) + frappe.local.message_log = [] - create_suppliers(args) - frappe.local.message_log = [] + create_customers(args) + frappe.local.message_log = [] - frappe.db.set_default('desktop:home_page', 'desktop') + create_suppliers(args) + frappe.local.message_log = [] - website_maker(args.company_name, args.company_tagline, args.name) - create_logo(args) + frappe.db.set_default('desktop:home_page', 'desktop') - frappe.clear_cache() - frappe.db.commit() + website_maker(args.company_name, args.company_tagline, args.name) + create_logo(args) + frappe.clear_cache() + frappe.db.commit() + except: + traceback = frappe.get_traceback() + for hook in frappe.get_hooks("setup_wizard_exception"): + frappe.get_attr(hook)(traceback, args) + + raise def update_user_name(args): if args.get("email"): From 37f54f9a3545d38ff684b725ffb8217f7ef41c8d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 12 May 2014 16:45:12 +0530 Subject: [PATCH 2/3] added description to letter head in setup wizard --- erpnext/setup/page/setup_wizard/setup_wizard.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js index 30de2c624bf..1ad3dd57ea3 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.js +++ b/erpnext/setup/page/setup_wizard/setup_wizard.js @@ -29,7 +29,7 @@ frappe.pages['setup-wizard'].onload = function(wrapper) { }, 2000); }, error: function(r) { - + var d = msgprint(__("There were errors.")); d.custom_onhide = function() { frappe.set_route(erpnext.wiz.page_name, "0"); @@ -223,8 +223,13 @@ frappe.pages['setup-wizard'].onload = function(wrapper) { title: __("Logo and Letter Heads"), help: __('Upload your letter head and logo - you can edit them later.'), fields: [ - {fieldtype:"Attach Image", fieldname:"attach_letterhead", label: __("Attach Letterhead")}, - {fieldtype:"Attach Image", fieldname:"attach_logo", label:__("Attach Logo")}, + {fieldtype:"Attach Image", fieldname:"attach_letterhead", + label: __("Attach Letterhead"), + description: __("Keep it web friendly 900px (w) by 100px (h)") + }, + {fieldtype:"Attach Image", fieldname:"attach_logo", + label:__("Attach Logo"), + description: __("100px by 100px")}, ], }, From 2fdb51f85ec2eb9c4985e05fa1a0b1d368380d65 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 12 May 2014 17:32:36 +0530 Subject: [PATCH 3/3] fixes frappe/erpnext#1627 --- erpnext/stock/doctype/item/item.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index d7b38534945..f42f35ccfa3 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -109,9 +109,9 @@ }, { "fieldname": "image", - "fieldtype": "Select", + "fieldtype": "Attach", "label": "Image", - "options": "attach_files:", + "options": "", "permlevel": 0, "read_only": 0 }, @@ -832,7 +832,7 @@ "icon": "icon-tag", "idx": 1, "max_attachments": 1, - "modified": "2014-05-07 05:29:42.155019", + "modified": "2014-05-12 07:54:58.118118", "modified_by": "Administrator", "module": "Stock", "name": "Item",