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

Merge branch 'develop' of github.com:frappe/erpnext into v4-hotfix

Browse Source
This commit is contained in:
Nabin Hait 2014-05-12 17:46:02 +05:30
commit b3bead2f06
3 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/setup/page/setup_wizard/setup_wizard.js
View File

@ -223,8 +223,13 @@ frappe.pages['setup-wizard'].onload = function(wrapper) {
title: __("Logo and Letter Heads"), title: __("Logo and Letter Heads"),
help: __('Upload your letter head and logo - you can edit them later.'), help: __('Upload your letter head and logo - you can edit them later.'),
fields: [ fields: [
{fieldtype:"Attach Image", fieldname:"attach_letterhead", label: __("Attach Letterhead")}, {fieldtype:"Attach Image", fieldname:"attach_letterhead",
{fieldtype:"Attach Image", fieldname:"attach_logo", label:__("Attach Logo")}, 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")},
], ],
}, },

7
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -15,6 +15,7 @@ import install_fixtures
@frappe.whitelist() @frappe.whitelist()
def setup_account(args=None): def setup_account(args=None):
try:
frappe.clear_cache() frappe.clear_cache()
if frappe.db.sql("select name from tabCompany"): if frappe.db.sql("select name from tabCompany"):
@ -24,6 +25,7 @@ def setup_account(args=None):
args = frappe.local.form_dict args = frappe.local.form_dict
if isinstance(args, basestring): if isinstance(args, basestring):
args = json.loads(args) args = json.loads(args)
args = frappe._dict(args) args = frappe._dict(args)
if args.language != "english": if args.language != "english":
@ -74,7 +76,12 @@ def setup_account(args=None):
frappe.clear_cache() frappe.clear_cache()
frappe.db.commit() 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): def update_user_name(args):
if args.get("email"): if args.get("email"):

6
erpnext/stock/doctype/item/item.json
View File

@ -109,9 +109,9 @@
}, },
{ {
"fieldname": "image", "fieldname": "image",
"fieldtype": "Select", "fieldtype": "Attach",
"label": "Image", "label": "Image",
"options": "attach_files:", "options": "",
"permlevel": 0, "permlevel": 0,
"read_only": 0 "read_only": 0
}, },
@ -832,7 +832,7 @@
"icon": "icon-tag", "icon": "icon-tag",
"idx": 1, "idx": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2014-05-07 05:29:42.155019", "modified": "2014-05-12 07:54:58.118118",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",