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 develop

Browse Source
This commit is contained in:
Nabin Hait 2014-03-25 19:36:16 +05:30
commit 6fa0f25e7c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -7,6 +7,13 @@ services:
- mysql - mysql
install: 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 && - CFLAGS=-O0 pip install git+https://github.com/frappe/frappe.git@develop &&
- pip install --editable . - pip install --editable .

4
erpnext/accounts/doctype/chart_of_accounts/import_charts.py
View File

@ -19,8 +19,8 @@ def import_charts():
"source_file": fname, "source_file": fname,
"country": country "country": country
}).insert() }).insert()
print bean.doc.name print bean.doc.name.encode("utf-8")
else: else:
print "No chart for: " + chart.get("name") print "No chart for: " + chart.get("name").encode("utf-8")
frappe.db.commit() frappe.db.commit()