From 39a9c7095a16c77a82f67ca10b0670d0214f8810 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Mon, 16 Dec 2019 09:29:58 +0100 Subject: [PATCH 1/3] [8.0][FIX] .travis: Update to latest template --- .travis.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69ee019a..fb802a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,12 @@ language: python sudo: false -cache: - apt: true - directories: - - $HOME/.cache/pip +cache: pip python: - "2.7" addons: + postgresql: "9.6" apt: packages: - expect-dev # provides unbuffer utility @@ -19,21 +17,20 @@ addons: env: global: - - VERSION="8.0" TESTS="0" LINT_CHECK="0" TRANSIFEX="0" - - TRANSIFEX_USER='transbot@odoo-community.org' - - secure: HgKcIRHgUR14+T9TRJvGAd2jn9cSChN87zrYPSZ2p63i/6+MU+WaK3lFf6T0NIjHQUvMMpZ1Cu+OFymvjbIEtvPeglaBVUA9ZED5vrW6ED2p24c09ADdQa3LeBoqLxholaYtbbaQrLNWEnZF0pY4Qk9ZQsHkj2LTpV+M+tOYwpM= + - VERSION="8.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" + - WKHTMLTOPDF_VERSION="0.12.5" + - PHANTOMJS_VERSION="latest" matrix: - LINT_CHECK="1" - - TRANSIFEX="1" - - TESTS="1" ODOO_REPO="odoo/odoo" + - TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1" - TESTS="1" ODOO_REPO="OCA/OCB" 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 + - 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 script: From 8ed5961938f0d128be14c9207268306663b08e29 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 24 Dec 2019 09:30:50 +0100 Subject: [PATCH 2/3] [8.0][FIX] crm_rma_claim_make_claim: Fix po file --- crm_rma_claim_make_claim/i18n/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crm_rma_claim_make_claim/i18n/es.po b/crm_rma_claim_make_claim/i18n/es.po index 65caf150..3d64d06e 100644 --- a/crm_rma_claim_make_claim/i18n/es.po +++ b/crm_rma_claim_make_claim/i18n/es.po @@ -19,8 +19,8 @@ msgstr "" #: help:crm.claim,claim_ids:0 msgid " - For a Vendor Claim means the RMA-C that generate the current RMA-V.\n" " - For a Custtomer Claim means the RMA-V generated to fullfill the current RMA-C." -msgstr " - Para un reclamo a proveedor corresponde a los reclamos a cliente relacionados con él.\n - - Para un reclamo a cliente, corresponde a los reclamos a proveedor que fueron generados a partir de él." +msgstr " - Para un reclamo a proveedor corresponde a los reclamos a cliente relacionados con él.\n" +" - Para un reclamo a cliente, corresponde a los reclamos a proveedor que fueron generados a partir de él." #. module: crm_rma_claim_make_claim #: model:ir.model,name:crm_rma_claim_make_claim.model_crm_claim From b00ca8cfbe8f63a619c9e30f973ecc3e3dae7e67 Mon Sep 17 00:00:00 2001 From: Denis Roussel Date: Tue, 24 Dec 2019 10:05:15 +0100 Subject: [PATCH 3/3] [8.0][FIX] crm_rma_claim_make_claim: Fix pylint --- crm_rma_claim_make_claim/__openerp__.py | 2 +- .../tests/test_crm_rma_claim_make_claim.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crm_rma_claim_make_claim/__openerp__.py b/crm_rma_claim_make_claim/__openerp__.py index 3d39e8e0..a61c136c 100644 --- a/crm_rma_claim_make_claim/__openerp__.py +++ b/crm_rma_claim_make_claim/__openerp__.py @@ -22,7 +22,7 @@ { 'name': 'CRM RMA Claim Make Claim', 'version': '8.0.1.0.0', - 'author': 'Vauxoo', + 'author': 'Vauxoo, Odoo Community Association (OCA)', 'website': 'http://www.vauxoo.com/', 'license': 'AGPL-3', 'category': '', diff --git a/crm_rma_claim_make_claim/tests/test_crm_rma_claim_make_claim.py b/crm_rma_claim_make_claim/tests/test_crm_rma_claim_make_claim.py index 34794624..b347881c 100644 --- a/crm_rma_claim_make_claim/tests/test_crm_rma_claim_make_claim.py +++ b/crm_rma_claim_make_claim/tests/test_crm_rma_claim_make_claim.py @@ -20,6 +20,7 @@ ############################################################################## from openerp.tests.common import TransactionCase +from odoo.tools.safe_eval import safe_eval class TestCrmRmaClaimMakeClaim(TransactionCase): @@ -73,5 +74,5 @@ class TestCrmRmaClaimMakeClaim(TransactionCase): def test_01_claim_make_claim(self): claim_id = self.create_customer_claim() res = claim_id.claim_line_ids.button_create_line_rma_vendor() - lines_added = eval(res[0]['domain'])[0][2] + lines_added = safe_eval(res[0]['domain'])[0][2] self.assertEquals(len(claim_id.claim_line_ids), len(lines_added))