From f8395343f7e8e1293d4ba134cbd18eef3ceb2223 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 16 Feb 2012 12:07:38 +0530 Subject: [PATCH 1/5] fix in password not copied to server database during company creation --- erpnext/setup/doctype/setup_control/setup_control.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/setup_control/setup_control.py b/erpnext/setup/doctype/setup_control/setup_control.py index 8bfebd00e2..28558f09f6 100644 --- a/erpnext/setup/doctype/setup_control/setup_control.py +++ b/erpnext/setup/doctype/setup_control/setup_control.py @@ -42,7 +42,7 @@ class DocType: args = json.loads(args) self.set_cp_defaults(args['company'], args['industry'], args['time_zone'], args['country'], args['account_name']) - self.create_profile(args['user'], args['first_name'], args['last_name']) + self.create_profile(args['user'], args['first_name'], args['last_name'], args.get('pwd')) # Domain related updates try: @@ -168,13 +168,14 @@ class DocType: # Create Profile # -------------- - def create_profile(self, user_email, user_fname, user_lname): + def create_profile(self, user_email, user_fname, user_lname, pwd=None): pr = Document('Profile') pr.first_name = user_fname pr.last_name = user_lname pr.name = pr.email = user_email pr.enabled = 1 pr.save(1) + if pwd: webnotes.conn.sql("UPDATE `tabProfile` SET password=PASSWORD(%s) WHERE name=%s", (pwd, user_email)) self.add_roles(pr) def add_roles(self, pr): From 761a044cd7a91d70b4592741c5715dc79f36306f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 16 Feb 2012 12:47:11 +0530 Subject: [PATCH 2/5] fix in user addition email sending.. --- erpnext/home/page/my_company/my_company.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/home/page/my_company/my_company.py b/erpnext/home/page/my_company/my_company.py index fa77b6c6f5..a63e8d9019 100644 --- a/erpnext/home/page/my_company/my_company.py +++ b/erpnext/home/page/my_company/my_company.py @@ -102,7 +102,7 @@ def send_welcome_mail(email, args): 'account_url': webnotes.conn.get_default('account_url') }) if not args.get('last_name'): args['last_name'] = '' - sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args) + sendmail_md(pr.email, subject="Welcome to ERPNext", msg=welcome_txt % args, from_defs=1) # # post comment From 8425c87d5f48dcbe48e44415fad081efea3b959e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Feb 2012 13:01:28 +0530 Subject: [PATCH 3/5] fixed old style file names --- erpnext/patches/jan_mar_2012/website/file_data_rename.py | 1 - erpnext/setup/doctype/personalize/personalize.py | 4 +++- .../website/doctype/products_settings/products_settings.py | 5 ++++- erpnext/website/page/products/products.html | 2 +- erpnext/website/page/products/products.js | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/erpnext/patches/jan_mar_2012/website/file_data_rename.py b/erpnext/patches/jan_mar_2012/website/file_data_rename.py index aff25db702..2cd5e68cd3 100644 --- a/erpnext/patches/jan_mar_2012/website/file_data_rename.py +++ b/erpnext/patches/jan_mar_2012/website/file_data_rename.py @@ -12,7 +12,6 @@ def execute(): change_file_data_in_tabseries() replace_file_list_column_entries() - def replace_name_in_file_data(): """ Change / to - in tabFile Data name column entries diff --git a/erpnext/setup/doctype/personalize/personalize.py b/erpnext/setup/doctype/personalize/personalize.py index dc9ad66fd4..552532df87 100644 --- a/erpnext/setup/doctype/personalize/personalize.py +++ b/erpnext/setup/doctype/personalize/personalize.py @@ -29,4 +29,6 @@ class DocType: # def set_html_from_image(self): file_name = self.doc.file_list.split(',')[0] - self.doc.header_html = '
' + self.doc.header_html = """
+ +
""" % file_name diff --git a/erpnext/website/doctype/products_settings/products_settings.py b/erpnext/website/doctype/products_settings/products_settings.py index 195f37f8ac..118ba4f20c 100644 --- a/erpnext/website/doctype/products_settings/products_settings.py +++ b/erpnext/website/doctype/products_settings/products_settings.py @@ -12,4 +12,7 @@ class DocType: tmp = json.dumps({"item_group": d.item_group, "label":d.label}) break - webnotes.conn.set_default("default_product_category", tmp) \ No newline at end of file + webnotes.conn.set_default("default_product_category", tmp) + + from webnotes.session_cache import clear_cache + clear_cache('Guest') \ No newline at end of file diff --git a/erpnext/website/page/products/products.html b/erpnext/website/page/products/products.html index 6c4fa97b17..3e460d269b 100644 --- a/erpnext/website/page/products/products.html +++ b/erpnext/website/page/products/products.html @@ -1,7 +1,7 @@

-
+
diff --git a/erpnext/website/page/products/products.js b/erpnext/website/page/products/products.js index b9fa167514..28baaeca77 100644 --- a/erpnext/website/page/products/products.js +++ b/erpnext/website/page/products/products.js @@ -65,7 +65,7 @@ erpnext.products.make_product_list = function(wrapper) { parent.innerHTML = repl('
\
\
\ - %(title)s\ +

%(title)s

\

%(short_description)s

\
', data); } From 7b0502f9d383a2daf93511ac5e712aa6f97a4e5f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Feb 2012 15:09:14 +0530 Subject: [PATCH 4/5] build --- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 178ca27a50..e0da79b072 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -427,7 +427,7 @@ return"";else return decodeURIComponent(results[1]);},get_dict:function(){var d={} var t=window.location.href.split('?')[1];if(!t)return d;if(t.indexOf('#')!=-1)t=t.split('#')[0];if(!t)return d;t=t.split('&');for(var i=0;i Date: Thu, 16 Feb 2012 15:11:28 +0530 Subject: [PATCH 5/5] added patch --- .../jan_mar_2012/website/getfile_rename.py | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 erpnext/patches/jan_mar_2012/website/getfile_rename.py diff --git a/erpnext/patches/jan_mar_2012/website/getfile_rename.py b/erpnext/patches/jan_mar_2012/website/getfile_rename.py new file mode 100644 index 0000000000..8f7cede659 --- /dev/null +++ b/erpnext/patches/jan_mar_2012/website/getfile_rename.py @@ -0,0 +1,44 @@ +import webnotes + +def execute(): + """rename from getfle""" + l = [ + ('Quotation Detail', 'description'), + ('Sales Order Detail', 'description'), + ('Delivery Note Detail', 'description'), + ('RV Detail', 'description'), + ('Item', 'description_html'), + ('Letter Head', 'content') + ] + + import re + + for table in l: + for item in webnotes.conn.sql("""select name, %s from `tab%s` + where %s like '%s'""" % (table[1], table[0], table[1], '%cgi-bin/getfile.cgi%')): + txt = re.sub('\&acx=[^"\']*', '', item[1])\ + .replace('cgi-bin/getfile.cgi?name=', 'files/')\ + .replace('FileData/', 'FileData-') + + txt = get_file_id(txt) + + webnotes.conn.sql("""update `tab%s` set %s=%s where name=%s""" % \ + (table[0], table[1], '%s', '%s'), (txt, item[0]), debug=1) + + # control panel, client name + txt = webnotes.conn.get_value('Control Panel',None,'client_name') + txt = get_file_id(txt) + webnotes.conn.set_value('Control Panel', None, 'client_name', txt.replace('index.cgi?cmd=get_file&fname=', 'files/')) + +def get_file_id(txt): + """old file links may be from fileid or filename""" + import re + match = re.search('files/([^"\']*)', txt) + fname = match.groups()[0] + if not fname.startswith('FileData'): + fid = webnotes.conn.sql("""select name from `tabFile Data` + where file_name=%s""", fname) + if fid: + fid = fid[0][0].replace('/', '-') + txt = txt.replace(fname, fid) + return txt \ No newline at end of file