Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ addons:
- python-simplejson
- python-serial
- python-yaml
- libcups2-dev # for aeroo
# Search your packages here:
# https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise
# - wkhtmltopdf # only add if needed and check the before_install section below
Expand Down Expand Up @@ -55,15 +54,6 @@ virtualenv:
system_site_packages: true

install:
# aeroo reports
- pip install git+https://github.com/aeroo/aeroolib.git@master pycups==1.9.68

# for infra
- pip install fabtools

# repository requirements
- pip install -r requirements.txt

- git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
- export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
- travis_install_nightly
Expand Down
4 changes: 2 additions & 2 deletions database_tools/models/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@ def check_automatic_backup_enable(self):
2. Que haya un parametro database.backups.enable = 'True'
"""
if get_mode():
_logger.warning(
_logger.info(
'Backups are disable by server_mode test or develop. '
'If you want to enable it you should remove develop or test '
'value for server_mode key on openerp server config file')
return False
backups_enable = self.env['ir.config_parameter'].get_param(
'database.backups.enable')
if backups_enable != 'True':
_logger.warning(
_logger.info(
'Backups are disable. If you want to enable it you should add '
'the parameter database.backups.enable with value True')
return False
Expand Down
2 changes: 1 addition & 1 deletion oca_dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
odoo-infrastructure https://github.com/ingadhoc/odoo-infrastructure.git
odoo-web https://github.com/ingadhoc/odoo-web.git
odoo-addons https://github.com/ingadhoc/odoo-addons.git
adhoc-miscellaneous https://github.com/ingadhoc/miscellaneous.git
web https://github.com/oca/web.git