Skip to content

Commit

Permalink
Merge 18b3151 into 3968eb5
Browse files Browse the repository at this point in the history
  • Loading branch information
mileo committed Sep 11, 2019
2 parents 3968eb5 + 18b3151 commit 64a008d
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 784 deletions.
21 changes: 13 additions & 8 deletions .travis.yml
@@ -1,10 +1,10 @@
language: python
sudo: false
cache: pip

python:
- "3.5"

cache: pip

addons:
postgresql: "9.6"
apt:
Expand All @@ -16,16 +16,20 @@ addons:
- libxslt-dev

env:
- VERSION="12.0" LINT_CHECK="1"
- VERSION="12.0" ODOO_REPO="OCA/OCB" LINT_CHECK="0"
- VERSION="12.0" ODOO_REPO="odoo/odoo" LINT_CHECK="0"
global:
- VERSION="12.0" TESTS="0" LINT_CHECK="0"
- WKHTMLTOPDF_VERSION="0.12.5"

matrix:
- LINT_CHECK="1"
- TESTS="1" ODOO_REPO="odoo/odoo" MAKEPOT="1"
- TESTS="1" ODOO_REPO="OCA/OCB"


install:
- git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
- 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
- pip install -r requirements.txt

before_script:
- chmod +x configure_locale.sh
Expand All @@ -35,4 +39,5 @@ script:
- travis_run_tests

after_success:
coveralls
- travis_after_tests_success

1 change: 0 additions & 1 deletion l10n_br_base/__init__.py
Expand Up @@ -2,5 +2,4 @@
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

from . import models
from . import tools
from . import tests
5 changes: 4 additions & 1 deletion l10n_br_base/__manifest__.py
Expand Up @@ -39,6 +39,9 @@
],
'installable': True,
'external_dependencies': {
'python': ['num2words'],
'python': [
'num2words',
'erpbrasil.base',
],
}
}
10 changes: 9 additions & 1 deletion l10n_br_base/models/res_company.py
Expand Up @@ -6,8 +6,16 @@
# Copyright (C) Akretion (<http://www.akretion.com>)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

import logging

from odoo import models, fields, api
from ..tools import misc, fiscal

_logger = logging.getLogger(__name__)

try:
from erpbrasil.base import fiscal, misc
except ImportError:
_logger.error("Biblioteca erpbrasil.base não instalada")


class Company(models.Model):
Expand Down
9 changes: 8 additions & 1 deletion l10n_br_base/models/res_partner.py
Expand Up @@ -3,10 +3,17 @@
# Copyright (C) 2012 Raphaël Valyi (Akretion)
# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html

import logging

from odoo import models, fields, api, _
from odoo.exceptions import ValidationError

from ..tools import fiscal, misc
_logger = logging.getLogger(__name__)

try:
from erpbrasil.base import fiscal, misc
except ImportError:
_logger.error("Biblioteca erpbrasil.base não instalada")


class Partner(models.Model):
Expand Down
3 changes: 0 additions & 3 deletions l10n_br_base/tests/__init__.py
Expand Up @@ -5,9 +5,6 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from . import test_amount_to_text
from . import test_tools_fiscal
from . import test_valid_createid
from . import test_base_validate_ie
from . import test_base_onchange
from . import test_other_ie
from . import test_tools_misc
135 changes: 0 additions & 135 deletions l10n_br_base/tests/test_base_validate_ie.py

This file was deleted.

4 changes: 2 additions & 2 deletions l10n_br_base/tests/test_other_ie.py
Expand Up @@ -68,8 +68,8 @@ def test_included_invalid_ie(self):
try:
result = self.company.write({
'state_tax_number_ids': [(0, 0, {
'state_id': self.ref('base.state_br_ba'),
'inscr_est': 41902652,
'state_id': self.ref('base.state_br_am'),
'inscr_est': '042933681',
})]
})
except:
Expand Down
16 changes: 0 additions & 16 deletions l10n_br_base/tests/test_tools_fiscal.py

This file was deleted.

23 changes: 0 additions & 23 deletions l10n_br_base/tests/test_tools_misc.py

This file was deleted.

5 changes: 0 additions & 5 deletions l10n_br_base/tools/__init__.py

This file was deleted.

0 comments on commit 64a008d

Please sign in to comment.