diff --git a/.travis.yml b/.travis.yml index c4e2ea57e0..73b758f72b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,13 @@ services: - mysql install: + - sudo service mysql stop + - sudo apt-get install python-software-properties + - sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db + - sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/5.5/ubuntu precise main' + - sudo apt-get update + - sudo apt-get purge -y mysql-common + - sudo apt-get install mariadb-server mariadb-common libmariadbclient-dev - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop && - pip install --editable . diff --git a/erpnext/accounts/doctype/chart_of_accounts/import_charts.py b/erpnext/accounts/doctype/chart_of_accounts/import_charts.py index c8049558cb..f95a4ed5fc 100644 --- a/erpnext/accounts/doctype/chart_of_accounts/import_charts.py +++ b/erpnext/accounts/doctype/chart_of_accounts/import_charts.py @@ -19,8 +19,8 @@ def import_charts(): "source_file": fname, "country": country }).insert() - print bean.doc.name + print bean.doc.name.encode("utf-8") else: - print "No chart for: " + chart.get("name") + print "No chart for: " + chart.get("name").encode("utf-8") frappe.db.commit() \ No newline at end of file