Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging' into develop

Browse Source
This commit is contained in:
Sagar Vora 2019-01-22 18:17:09 +05:30
commit c4bda9fac3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -33,16 +33,16 @@ before_script:
- cd ~/frappe-bench - cd ~/frappe-bench
- bench get-app erpnext $TRAVIS_BUILD_DIR - bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site - bench use test_site
jobs:
include:
- stage: test
script:
- bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
- bench scheduler disable - bench scheduler disable
- sed -i 's/9000/9001/g' sites/common_site_config.json - sed -i 's/9000/9001/g' sites/common_site_config.json
- bench start & - bench start &
- sleep 10 - sleep 10
jobs:
include:
- stage: test
script:
- set -e - set -e
- bench run-tests --app erpnext --coverage - bench run-tests --app erpnext --coverage
after_script: after_script:

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.78' __version__ = '10.1.79'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop' 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" error_report_email = "support@erpnext.com"