Merge branch 'staging' into develop

.travis.yml

@@ -33,16 +33,16 @@ before_script:
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench use test_site
-
-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
+
+jobs:
+  include:
+    - stage: test
+      script:
         - set -e
         - bench run-tests --app erpnext --coverage
       after_script:

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 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'''

erpnext/hooks.py

@@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.35'
+staging_version = '11.0.3-beta.36'
 
 error_report_email = "support@erpnext.com"