From e92db32e48d0a84db613eb736a54b477b5843b14 Mon Sep 17 00:00:00 2001 From: Lorenzo Battistini Date: Wed, 3 Sep 2014 17:19:15 +0200 Subject: [PATCH 1/2] [FIX] .travis for account_constraints conflicts --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4595bd085..1e69e1763 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,15 +6,15 @@ python: - "2.7" env: - - VERSION="7.0" ODOO_REPO="odoo/odoo" EXCLUDE="account_constraints,account_partner_required,async_move_line_importer" - - VERSION="7.0" ODOO_REPO="odoo/odoo" INCLUDE="account_constraints" + - VERSION="7.0" ODOO_REPO="odoo/odoo" EXCLUDE="account_constraints,account_partner_required,async_move_line_importer,account_move_validation_improvement,account_default_draft_move,account_move_batch_validate" + - VERSION="7.0" ODOO_REPO="odoo/odoo" INCLUDE="account_constraints,account_move_validation_improvement,account_default_draft_move,account_move_batch_validate" - VERSION="7.0" ODOO_REPO="odoo/odoo" INCLUDE="account_partner_required" - VERSION="7.0" ODOO_REPO="odoo/odoo" INCLUDE="async_move_line_importer" - - VERSION="7.0" ODOO_REPO="OCA/OCB" EXCLUDE="account_constraints, account_partner_required,async_move_line_importer" - - VERSION="7.0" ODOO_REPO="OCA/OCB" INCLUDE="account_constraints" + - VERSION="7.0" ODOO_REPO="OCA/OCB" EXCLUDE="account_constraints, account_partner_required,async_move_line_importer,account_move_validation_improvement,account_default_draft_move,account_move_batch_validate" + - VERSION="7.0" ODOO_REPO="OCA/OCB" INCLUDE="account_constraints,account_move_validation_improvement,account_default_draft_move,account_move_batch_validate" - VERSION="7.0" ODOO_REPO="OCA/OCB" INCLUDE="account_partner_required" - - VERSION="7.0" ODOO_REPO="odoo/odoo" INCLUDE="async_move_line_importer" + - VERSION="7.0" ODOO_REPO="OCA/OCB" INCLUDE="async_move_line_importer" virtualenv: system_site_packages: true From 45770975f5b83645534c110f7c7b3cda833adba5 Mon Sep 17 00:00:00 2001 From: Lorenzo Battistini Date: Wed, 3 Sep 2014 17:29:08 +0200 Subject: [PATCH 2/2] [FIX] PEP8 --- account_chart_update/__init__.py | 3 ++- account_chart_update/wizard/__init__.py | 3 ++- currency_rate_update/__init__.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/account_chart_update/__init__.py b/account_chart_update/__init__.py index 36d5407d0..6ca12272a 100644 --- a/account_chart_update/__init__.py +++ b/account_chart_update/__init__.py @@ -2,7 +2,8 @@ ############################################################################## # # Copyright (c) 2010 Zikzakmedia S.L. (http://www.zikzakmedia.com) -# Copyright (c) 2010 Pexego Sistemas Informáticos S.L. (http://www.pexego.es) +# Copyright (c) 2010 Pexego Sistemas Informáticos S.L. +# (http://www.pexego.es) # @authors: Jordi Esteve (Zikzakmedia), Borja López Soilán (Pexego) # # This program is free software: you can redistribute it and/or modify diff --git a/account_chart_update/wizard/__init__.py b/account_chart_update/wizard/__init__.py index 8d0cfc9ed..7adb37845 100644 --- a/account_chart_update/wizard/__init__.py +++ b/account_chart_update/wizard/__init__.py @@ -2,7 +2,8 @@ ############################################################################## # # Copyright (c) 2010 Zikzakmedia S.L. (http://www.zikzakmedia.com) -# Copyright (c) 2010 Pexego Sistemas Informáticos S.L. (http://www.pexego.es) +# Copyright (c) 2010 Pexego Sistemas Informáticos S.L. +# (http://www.pexego.es) # @authors: Jordi Esteve (Zikzakmedia), Borja López Soilán (Pexego) # # This program is free software: you can redistribute it and/or modify diff --git a/currency_rate_update/__init__.py b/currency_rate_update/__init__.py index c23a2a0de..965f9e31a 100644 --- a/currency_rate_update/__init__.py +++ b/currency_rate_update/__init__.py @@ -3,7 +3,8 @@ # # Copyright (c) 2008 Camtocamp SA # @author JB Aubort, Nicolas Bessi, Joel Grand-Guillaume -# European Central Bank and Polish National Bank invented by Grzegorz Grzelak +# European Central Bank and Polish National Bank +# invented by Grzegorz Grzelak # Banxico implemented by Agustin Cruz openpyme.mx # # This program is free software: you can redistribute it and/or modify