Browse Source

Merge branch 'master' into staging-fixes

develop
Sagar Vora 6 years ago
parent
commit
c84e3fe21b
  1. 10
      .travis.yml
  2. 2
      erpnext/__init__.py

10
.travis.yml

@ -33,16 +33,16 @@ before_script:
- 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:

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

Loading…
Cancel
Save