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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait 2013-10-01 18:14:49 +05:30
commit a37ff498fe
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/doctype/backup_manager/backup_dropbox.py
View File

@ -96,6 +96,7 @@ def backup_to_dropbox():
error_log = [] error_log = []
path = os.path.join(get_base_path(), "public", "files") path = os.path.join(get_base_path(), "public", "files")
for filename in os.listdir(path): for filename in os.listdir(path):
filename = cstr(filename)
if filename in ignore_list: if filename in ignore_list:
continue continue

1
setup/doctype/backup_manager/backup_googledrive.py
View File

@ -85,6 +85,7 @@ def backup_to_gdrive():
webnotes.conn.close() webnotes.conn.close()
path = os.path.join(get_base_path(), "public", "files") path = os.path.join(get_base_path(), "public", "files")
for filename in os.listdir(path): for filename in os.listdir(path):
filename = cstr(filename)
found = False found = False
filepath = os.path.join(path, filename) filepath = os.path.join(path, filename)
ext = filename.split('.')[-1] ext = filename.split('.')[-1]

2
setup/doctype/company/charts/import_from_openerp.py
View File

@ -9,6 +9,7 @@ from __future__ import unicode_literals
import os, json import os, json
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
from webnotes.utils.datautils import read_csv_content from webnotes.utils.datautils import read_csv_content
from webnotes.utils import cstr
path = "/Users/rmehta/Downloads/openerp/openerp/addons" path = "/Users/rmehta/Downloads/openerp/openerp/addons"
chart_roots = [] chart_roots = []
@ -108,6 +109,7 @@ def find_charts():
basename = os.path.basename(basepath) basename = os.path.basename(basepath)
if basename.startswith("l10n"): if basename.startswith("l10n"):
for fname in files: for fname in files:
fname = cstr(fname)
filepath = os.path.join(basepath, fname) filepath = os.path.join(basepath, fname)
if fname.endswith(".xml"): if fname.endswith(".xml"):
tree = ET.parse(filepath) tree = ET.parse(filepath)