Merge remote-tracking branch 'upstream/6.1' into 6.1_fix_e265

Conflicts:
	web_ckeditor4/__openerp__.py

.coveragerc

@@ -0,0 +1,16 @@
+# Config file .coveragerc
+
+[report]
+include = 
+    */OCA/web/*
+omit =
+    */tests/*
+    *__init__.py
+
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about null context checking
+    if context is None:

.gitignore

@@ -0,0 +1,56 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Pycharm
+.idea
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Sphinx documentation
+docs/_build/
+
+# Backup files
+*~
+*.swp

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+python:
+  - "2.7"
+
+virtualenv:
+  system_site_packages: true
+
+install:
+ - git clone https://github.com/OCA/maintainer-quality-tools.git $HOME/maintainer-quality-tools
+ - export PATH=$HOME/maintainer-quality-tools/travis:$PATH
+ - travis_install_nightly 6.1
+ - pip install coveralls flake8
+
+script:
+    - travis_run_flake8
+    - travis_run_tests 6.1
+
+after_success:
+  coveralls

README

@@ -1,8 +0,0 @@
-This project aim to deal with modules related to the webclient of OpenERP. You'll find modules that:
-
- - Add facilities to the UI
- - Ease the import/export features
- - Add tabs
- - ...
-
-

README.md

@@ -0,0 +1,12 @@
+[![Build Status](https://travis-ci.org/OCA/web.svg?branch=6.1)](https://travis-ci.org/OCA/web)
+[![Coverage Status](https://coveralls.io/repos/OCA/web/badge.png?branch=6.1)](https://coveralls.io/r/OCA/web?branch=6.1)
+
+Web addons for Odoo
+===================
+
+This project aims to deal with modules related to the webclient of Odoo. You'll find modules that:
+
+- Add facilities to the UI
+- Add widgets
+- Ease the import/export features
+- Generally add clientside functionality

hide_duplicate_button/__openerp__.py

@@ -23,7 +23,9 @@
     'name': 'Hide duplicate button',
     'version': '0.1',
     'category': 'Web',
-    'description': """As 'duplicate' button often produce inconveniences when modules don't correctly handle the 'copy' methods, this module allow to hide 'duplicate' button for every form view""",
+    'description': """As 'duplicate' button often produce inconveniences when
+modules don't correctly handle the 'copy' methods, this module allow to hide
+'duplicate' button for every form view""",
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
     'license': 'AGPL-3',
@@ -39,4 +41,3 @@
         "static/css/duplicate_button.css",
     ],
 }
-

web_ckeditor4/__init__.py

@@ -19,4 +19,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-

web_export_view/__openerp__.py

@@ -28,13 +28,22 @@
 WEB EXPORT VIEW
 ===============
 
-One of the best OpenERP’s features is exporting custom data to CSV/XLS. You can do it by clicking on the export link in the sidebar. The export action allows use to configure what to be exported by selecting fields, etc, and allows you to save your export as a template so that you can export it once again without having to configure it again.
+One of the best OpenERP’s features is exporting custom data to CSV/XLS. You can
+do it by clicking on the export link in the sidebar. The export action allows
+use to configure what to be exported by selecting fields, etc, and allows you
+to save your export as a template so that you can export it once again without
+having to configure it again.
 
-That feature is as great and advanced as limited for an everyday-customer-experience. A lot of customers want simply to export the tree view they are looking to.
+That feature is as great and advanced as limited for an
+everyday-customer-experience. A lot of customers want simply to export the tree
+view they are looking to.
 
-If you miss this feature as us, probably you’ll find an answer into our web_export_view module.
+If you miss this feature as us, probably you’ll find an answer into our
+web_export_view module.
 
-After you installed it, you’ll find an additional link ‘Export current view’ right below the ‘Export’ one. By clicking on it you’ll get a XLS file contains the same data of the tree view you are looking at, headers included.
+After you installed it, you’ll find an additional link ‘Export current view’
+right below the ‘Export’ one. By clicking on it you’ll get a XLS file contains
+the same data of the tree view you are looking at, headers included.
 """,
     'author': 'Agile Business Group',
     'website': 'http://www.agilebg.com',
@@ -50,4 +59,3 @@ After you installed it, you’ll find an additional link ‘Export current view
         'static/js/web_advanced_export.js',
     ],
 }
-

web_import_models_with_inherits/model/basemodel.py

@@ -20,6 +20,7 @@
 ##############################################################################
 from openerp.osv.orm import BaseModel
 
+
 def get_fields_inherits(self, cr, uid, context=None):
     """
     Pass the values of the _inherits dictionary

web_print_from_browser/__init__.py

@@ -19,4 +19,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-