nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1942 from anandpdoshi/anand-july-16

Browse Source 
Fixes in Setup Wizard and Support Ticket
This commit is contained in:
Anand Doshi
2014-07-16 13:17:50 +05:30
parent c58e6c0dff e73ed2afae
commit 75936cdde5
2 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,9 +113,11 @@ def update_user_name(args):
last_name=%(last_name)s WHERE name=%(name)s""", args) last_name=%(last_name)s WHERE name=%(name)s""", args)
if args.get("attach_user"): if args.get("attach_user"):
filename, filetype, content = args.get("attach_user").split(",") attach_user = args.get("attach_user").split(",")
fileurl = save_file(filename, content, "User", args.get("name"), decode=True).file_url if len(attach_user)==3:
frappe.db.set_value("User", args.get("name"), "user_image", fileurl) filename, filetype, content = attach_user
fileurl = save_file(filename, content, "User", args.get("name"), decode=True).file_url
frappe.db.set_value("User", args.get("name"), "user_image", fileurl)
add_all_roles_to(args.get("name")) add_all_roles_to(args.get("name"))
@@ -319,9 +321,11 @@ def create_items(args):
}).insert() }).insert()
if args.get("item_img_" + str(i)): if args.get("item_img_" + str(i)):
filename, filetype, content = args.get("item_img_" + str(i)).split(",") item_image = args.get("item_img_" + str(i)).split(",")
fileurl = save_file(filename, content, "Item", item, decode=True).file_url if len(item_image)==3:
frappe.db.set_value("Item", item, "image", fileurl) filename, filetype, content = item_image
fileurl = save_file(filename, content, "Item", item, decode=True).file_url
frappe.db.set_value("Item", item, "image", fileurl)
def create_customers(args): def create_customers(args):
for i in xrange(1,6): for i in xrange(1,6):
@@ -374,17 +378,21 @@ def create_letter_head(args):
"is_default": 1 "is_default": 1
}).insert() }).insert()
filename, filetype, content = args.get("attach_letterhead").split(",") attach_letterhead = args.get("attach_letterhead").split(",")
fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url if len(attach_letterhead)==3:
frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl) filename, filetype, content = attach_letterhead
fileurl = save_file(filename, content, "Letter Head", _("Standard"), decode=True).file_url
frappe.db.set_value("Letter Head", _("Standard"), "content", "<img src='%s' style='max-width: 100%%;'>" % fileurl)
def create_logo(args): def create_logo(args):
if args.get("attach_logo"): if args.get("attach_logo"):
filename, filetype, content = args.get("attach_logo").split(",") attach_logo = args.get("attach_logo").split(",")
fileurl = save_file(filename, content, "Website Settings", "Website Settings", if len(attach_logo)==3:
decode=True).file_url filename, filetype, content = attach_logo
frappe.db.set_value("Website Settings", "Website Settings", "banner_html", fileurl = save_file(filename, content, "Website Settings", "Website Settings",
"<img src='%s' style='max-width: 100%%;'>" % fileurl) decode=True).file_url
frappe.db.set_value("Website Settings", "Website Settings", "banner_html",
"<img src='%s' style='max-width: 100%%;'>" % fileurl)
def add_all_roles_to(name): def add_all_roles_to(name):
user = frappe.get_doc("User", name) user = frappe.get_doc("User", name)

3
erpnext/support/doctype/support_ticket/support_ticket.py
View File

@@ -53,7 +53,8 @@ class SupportTicket(TransactionBase):
if self.status=="Closed" and status !="Closed": if self.status=="Closed" and status !="Closed":
self.resolution_date = now() self.resolution_date = now()
if self.status=="Open" and status !="Open": if self.status=="Open" and status !="Open":
self.resolution_date = "" # if no date, it should be set as None and not a blank string "", as per mysql strict config
self.resolution_date = None
@frappe.whitelist() @frappe.whitelist()
def set_status(name, status): def set_status(name, status):