Merge branch 'develop'

.travis.yml

@@ -0,0 +1,30 @@
+language: python
+
+python:
+  - "2.7"
+
+services:
+  - mysql
+
+install:
+  - pip install git+https://github.com/webnotes/wnframework.git@4.0.0-wip &&
+  - pip install --editable .
+
+script: 
+    cd ./test_sites/ &&
+    webnotes --reinstall -v test_site &&
+    webnotes --install_app erpnext -v test_site &&
+    webnotes --run_tests -v test_site --app erpnext
+
+branches:
+  except:
+    - develop
+    - master
+    - 3.x.x
+    - slow
+    - webshop_refactor
+
+before_script:
+  - mysql -e 'create database travis' &&
+  - echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis') WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root
+

config.json

@@ -1,6 +1,6 @@
 {
  "app_name": "ERPNext", 
- "app_version": "3.8.2", 
+ "app_version": "3.8.3", 
  "base_template": "app/portal/templates/base.html", 
  "modules": {
   "Accounts": {
@@ -74,5 +74,5 @@
    "type": "module"
   }
  }, 
- "requires_framework_version": "==3.9.1"
+ "requires_framework_version": "==3.9.2"
 }