Skip to content
Permalink
Browse files

Merge PR #559 into 11.0

Signed-off-by pedrobaeza
  • Loading branch information...
OCA-git-bot committed Aug 8, 2019
2 parents 82124c3 + eaddbfa commit 5092e01cfe65b6ff9ef9076d0ba7be793f79d7b8
Showing with 5 additions and 11 deletions.
  1. +4 −10 .travis.yml
  2. +1 −1 project_category/i18n/project_category.pot
@@ -7,6 +7,7 @@ sudo: false
cache: pip

addons:
postgresql: "9.6"
apt:
packages:
- expect-dev # provides unbuffer utility
@@ -17,24 +18,17 @@ addons:

env:
global:
- VERSION="11.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0"
- TRANSIFEX_USER='transbot@odoo-community.org'
- secure: "OCZHnpmr+dvwVzAHmfeOUa2/VuvepsdguW129zR7jEO5HJupI8imqq3D8JKStUVnAgpA+Igpni+mfFsmhvr7K6pdk9w15zWlO+ml/7EwRflnyWAdtLNv44PTfaOcuCkzf73HPKRiW+LLUOeDqSqF1BLdb7mgSpLFWMuO7pJK0aI="
- VERSION="11.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
- WKHTMLTOPDF_VERSION="0.12.4"
matrix:
- LINT_CHECK="1"
- TESTS="1" ODOO_REPO="OCA/OCB"
- TESTS="1" ODOO_REPO="odoo/odoo"
- TRANSIFEX="1"
- TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1"


before_install:
- "export DISPLAY=:911.0"
- "sh -e /etc/init.d/xvfb start"

install:
- git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
- export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
- export PATH=${HOME}/maintainer-quality-tools/travis:$PATH
- travis_install_nightly
- pip install criticalpath

@@ -111,7 +111,7 @@ msgstr ""
#. module: project_category
#: model:ir.actions.act_window,name:project_category.action_project_type
#: model:ir.model.fields,field_description:project_category.field_project_project_type_id
#: model:ir.model.fields,field_description:project_category.field_project_task_type_id_5025
#: model:ir.model.fields,field_description:project_category.field_project_task_type_id_5087
#: model:ir.ui.view,arch_db:project_category.project_search
#: model:ir.ui.view,arch_db:project_category.project_task_search
#: model:ir.ui.view,arch_db:project_category.project_type_form

0 comments on commit 5092e01

Please sign in to comment.
You can’t perform that action at this time.