Merge branch 'master' into staging-fixes
diff --git a/.travis.yml b/.travis.yml
index 747de20..14260e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,16 +33,16 @@
- cd ~/frappe-bench
- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site
+ - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
+ - bench scheduler disable
+ - sed -i 's/9000/9001/g' sites/common_site_config.json
+ - bench start &
+ - sleep 10
jobs:
include:
- stage: test
script:
- - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
- - bench scheduler disable
- - sed -i 's/9000/9001/g' sites/common_site_config.json
- - bench start &
- - sleep 10
- set -e
- bench run-tests --app erpnext --coverage
after_script:
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 29e4244..f9df4ac 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.78'
+__version__ = '10.1.79'
def get_default_company(user=None):
'''Get default company for user'''