commit 4d418b98f3c006a0d7db0880bf219f172b420859
author Sagar Vora <sagar@resilient.tech> Tue Jan 22 18:17:09 2019 +0530
committer Sagar Vora <sagar@resilient.tech> Tue Jan 22 18:17:09 2019 +0530
tree 30dac3a4147d850893a67e81ad9ab31b8f26b2d8
parent 815c575a0b89d40255fce90178c253aa45cd22ee
parent 5555b2802f6d3e91f03cce562c9457604528c0d7

Merge branch 'staging-fixes' into staging

.travis.yml

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:

erpnext/__init__.py

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'''

erpnext/hooks.py

diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index bbadd7f..cd352de 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -12,7 +12,7 @@
 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"