Skip to content

Commit

Permalink
Merge PR #97 into 16.0
Browse files Browse the repository at this point in the history
Signed-off-by dreispt
  • Loading branch information
OCA-git-bot committed Nov 17, 2023
2 parents 7f6d8f3 + a48ea12 commit 43e8979
Show file tree
Hide file tree
Showing 11 changed files with 67 additions and 36 deletions.
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 16.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand All @@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
repo_name: l10n-portugal
repo_slug: l10n-portugal
repo_website: https://github.com/OCA/l10n-portugal
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand All @@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:12.0
Expand All @@ -50,7 +50,7 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
18 changes: 16 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: 4cd2b852214dead80822e93e6749b16f2785b2fe
rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/l10n-portugal"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=16.0
- --org-name=OCA
- --repo-name=l10n-portugal
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.6.1
hooks:
Expand Down Expand Up @@ -125,7 +139,7 @@ repos:
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2
rev: v8.0.19
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
12 changes: 6 additions & 6 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0

[MESSAGES CONTROL]
disable=all
Expand Down
12 changes: 6 additions & 6 deletions .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n

[ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Odoo Community Association (OCA)
manifest_required_keys=license
manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest-required-authors=Odoo Community Association (OCA)
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=16.0

[MESSAGES CONTROL]
disable=all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ msgstr ""
#. odoo-python
#: code:addons/l10n_pt_account_invoicexpress/models/account_move.py:0
#, python-format
msgid "Email sent by InvoiceXpress:<ul><li>To: {}</li><li>Cc: {}</li></ul>"
msgid ""
"Email sent by InvoiceXpress:<ul><li>To: %(email)s</li><li>Cc: "
"%(cc)s</li></ul>"
msgstr ""

#. module: l10n_pt_account_invoicexpress
Expand Down
7 changes: 4 additions & 3 deletions l10n_pt_account_invoicexpress/models/account_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,11 @@ def action_send_invoicexpress_email(self, ignore_no_config=False):
if payload:
InvoiceXpress.call(invoice.company_id, endpoint, "PUT", payload=payload)
msg = _(
"Email sent by InvoiceXpress:<ul><li>To: {}</li><li>Cc: {}</li></ul>"
"Email sent by InvoiceXpress:<ul><li>To: "
"%(email)s</li><li>Cc: %(cc)s</li></ul>"
).format(
payload["message"]["client"]["email"],
payload["message"]["cc"] or _("None"),
email=payload["message"]["client"]["email"],
cc=payload["message"]["cc"] or _("None"),
)
invoice.message_post(body=msg)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ msgstr ""
#. odoo-python
#: code:addons/l10n_pt_stock_invoicexpress/models/stock_picking.py:0
#, python-format
msgid "<a class='btn btn-info mr-2' target='new' href={}>{}</a>"
msgid "<a class='btn btn-info mr-2' target='new' href=%(link)s>%(name)s</a>"
msgstr ""

#. module: l10n_pt_stock_invoicexpress
Expand Down Expand Up @@ -82,7 +82,9 @@ msgstr ""
#. odoo-python
#: code:addons/l10n_pt_stock_invoicexpress/models/stock_picking.py:0
#, python-format
msgid "Email sent by InvoiceXpress:<ul><li>To: {}</li><li>Cc: {}</li></ul>"
msgid ""
"Email sent by InvoiceXpress:<ul><li>To: %(email)s/li><li>Cc: "
"%(cc)s</li></ul>"
msgstr ""

#. module: l10n_pt_stock_invoicexpress
Expand Down Expand Up @@ -157,7 +159,8 @@ msgstr ""
#, python-format
msgid ""
"InvoiceXpress record has been created for this delivery "
"order:<ul><li>Number: {inv_xpress_num}</li><li>{inv_xpress_link}</li></ul>"
"order:<ul><li>Number: "
"%(inv_xpress_num)s</li><li>%(inv_xpress_link)s</li></ul>"
msgstr ""

#. module: l10n_pt_stock_invoicexpress
Expand Down
15 changes: 8 additions & 7 deletions l10n_pt_stock_invoicexpress/models/stock_picking.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ def _prepare_invoicexpress_vals(self):
def _update_invoicexpress_status(self):
inv_xpress_link_name = _("View Document")
inv_xpress_link = _(
"<a class='btn btn-info mr-2' target='new' href={}>{}</a>"
).format(self.invoicexpress_permalink, inv_xpress_link_name)
"<a class='btn btn-info mr-2' target='new' href=%(link)s>%(name)s</a>"
).format(link=self.invoicexpress_permalink, name=inv_xpress_link_name)
msg = _(
"InvoiceXpress record has been created for this delivery order:<ul>"
"<li>Number: {inv_xpress_num}</li>"
"<li>{inv_xpress_link}</li></ul>"
"<li>Number: %(inv_xpress_num)s</li>"
"<li>%(inv_xpress_link)s</li></ul>"
).format(
inv_xpress_num=self.invoicexpress_number, inv_xpress_link=inv_xpress_link
)
Expand Down Expand Up @@ -269,10 +269,11 @@ def action_send_invoicexpress_delivery(self, ignore_no_config=False):
delivery.company_id, endpoint, "PUT", payload=payload
)
msg = _(
"Email sent by InvoiceXpress:<ul><li>To: {}</li><li>Cc: {}</li></ul>"
"Email sent by InvoiceXpress:<ul><li>To: "
"%(email)s/li><li>Cc: %(cc)s</li></ul>"
).format(
payload["message"]["client"]["email"],
payload["message"]["cc"] or _("None"),
email=payload["message"]["client"]["email"],
cc=payload["message"]["cc"] or _("None"),
)
delivery.message_post(body=msg)

Expand Down

0 comments on commit 43e8979

Please sign in to comment.