diff --git a/.copier-answers.yml b/.copier-answers.yml
index 492c4aa29..93c5b5d13 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -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: {}
@@ -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: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
@@ -19,6 +19,4 @@ repo_description: Manage brands in Odoo
repo_name: brand
repo_slug: brand
repo_website: https://github.com/OCA/brand
-travis_apt_packages: []
-travis_apt_sources: []
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 9429bc688..fed88d70d 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -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
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 755f8a225..602ecbca2 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -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
@@ -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)"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 215b84b0f..326c12556 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -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
@@ -36,10 +36,10 @@ jobs:
matrix:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
- makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB
+ makepot: "true"
services:
postgres:
image: postgres:9.6
@@ -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
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2be95f01b..788ceddc2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -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:
@@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
- rev: ab1d7f6
+ 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/brand"]
+ - id: oca-gen-addon-readme
+ args:
+ - --addons-dir=.
+ - --branch=14.0
+ - --org-name=OCA
+ - --repo-name=brand
+ - --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.4
hooks:
diff --git a/brand/i18n/brand.pot b/brand/i18n/brand.pot
index 084c1f405..077f3593e 100644
--- a/brand/i18n/brand.pot
+++ b/brand/i18n/brand.pot
@@ -70,11 +70,6 @@ msgstr ""
msgid "Activity Type Icon"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__additional_info
-msgid "Additional info"
-msgstr ""
-
#. module: brand
#: model_terms:ir.ui.view,arch_db:brand.res_brand_form_view
msgid "Address"
@@ -129,16 +124,6 @@ msgstr ""
msgid "Blacklist"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__mobile_blacklisted
-msgid "Blacklisted Phone Is Mobile"
-msgstr ""
-
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__phone_blacklisted
-msgid "Blacklisted Phone is Phone"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__message_bounce
msgid "Bounce"
@@ -250,11 +235,6 @@ msgstr ""
msgid "Company Type"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__partner_gid
-msgid "Company database ID"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__contact_address
msgid "Complete Address"
@@ -374,13 +354,6 @@ msgstr ""
msgid "Employee"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,help:brand.field_res_brand__phone_sanitized
-msgid ""
-"Field used to store sanitized phone number. Helps speeding up searches and "
-"comparisons."
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__property_account_position_id
msgid "Fiscal Position"
@@ -462,7 +435,6 @@ msgstr ""
#. module: brand
#: model:ir.model.fields,help:brand.field_res_brand__message_has_error
-#: model:ir.model.fields,help:brand.field_res_brand__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -480,13 +452,6 @@ msgid ""
"mailing anymore, from any list"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,help:brand.field_res_brand__phone_sanitized_blacklisted
-msgid ""
-"If the sanitized phone number is on the blacklist, the contact won't receive"
-" mass mailing sms anymore, from any list"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__image_1920
msgid "Image"
@@ -512,22 +477,6 @@ msgstr ""
msgid "Image 512"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,help:brand.field_res_brand__mobile_blacklisted
-msgid ""
-"Indicates if a blacklisted sanitized phone number is a mobile number. Helps "
-"distinguish which number is blacklisted when there is both a "
-"mobile and phone field in a model."
-msgstr ""
-
-#. module: brand
-#: model:ir.model.fields,help:brand.field_res_brand__phone_blacklisted
-msgid ""
-"Indicates if a blacklisted sanitized phone number is a phone number. Helps "
-"distinguish which number is blacklisted when there is both a "
-"mobile and phone field in a model."
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__industry_id
msgid "Industry"
@@ -751,11 +700,6 @@ msgstr ""
msgid "Phone"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__phone_sanitized_blacklisted
-msgid "Phone Blacklisted"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,help:brand.field_res_brand__property_payment_method_id
msgid ""
@@ -809,11 +753,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__message_has_sms_error
-msgid "SMS Delivery error"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,field_description:brand.field_res_brand__sale_contract_count
msgid "Sale Contracts"
@@ -844,11 +783,6 @@ msgstr ""
msgid "Salesperson"
msgstr ""
-#. module: brand
-#: model:ir.model.fields,field_description:brand.field_res_brand__phone_sanitized
-msgid "Sanitized Number"
-msgstr ""
-
#. module: brand
#: model:ir.model.fields,help:brand.field_res_brand__invoice_warn
#: model:ir.model.fields,help:brand.field_res_brand__purchase_warn
diff --git a/product_brand/i18n/product_brand.pot b/product_brand/i18n/product_brand.pot
index 9dd06fa4b..aebc5c4ed 100644
--- a/product_brand/i18n/product_brand.pot
+++ b/product_brand/i18n/product_brand.pot
@@ -151,8 +151,3 @@ msgstr ""
#: model:ir.model.fields,help:product_brand.field_product_brand__partner_id
msgid "Select a partner for this brand if any."
msgstr ""
-
-#. module: product_brand
-#: model_terms:ir.ui.view,arch_db:product_brand.view_product_brand_tree
-msgid "product.brand"
-msgstr ""
diff --git a/product_brand/views/product_brand_view.xml b/product_brand/views/product_brand_view.xml
index 6cb8cf950..c6d0fc417 100644
--- a/product_brand/views/product_brand_view.xml
+++ b/product_brand/views/product_brand_view.xml
@@ -69,7 +69,7 @@
product.brand.tree
product.brand
-
+
diff --git a/product_brand_social_responsibility/i18n/product_brand_social_responsibility.pot b/product_brand_social_responsibility/i18n/product_brand_social_responsibility.pot
index c72739e16..0a5e31ec0 100644
--- a/product_brand_social_responsibility/i18n/product_brand_social_responsibility.pot
+++ b/product_brand_social_responsibility/i18n/product_brand_social_responsibility.pot
@@ -33,11 +33,6 @@ msgstr ""
msgid "CSR"
msgstr ""
-#. module: product_brand_social_responsibility
-#: model_terms:ir.ui.view,arch_db:product_brand_social_responsibility.view_product_brand_tag_csr_tree
-msgid "CSR tags"
-msgstr ""
-
#. module: product_brand_social_responsibility
#: model:ir.model.fields,field_description:product_brand_social_responsibility.field_product_brand_tag_csr__code
msgid "Code"
diff --git a/product_brand_social_responsibility/views/product_brand_tag_csr_view.xml b/product_brand_social_responsibility/views/product_brand_tag_csr_view.xml
index 410d7ccee..dfb0cb30b 100644
--- a/product_brand_social_responsibility/views/product_brand_tag_csr_view.xml
+++ b/product_brand_social_responsibility/views/product_brand_tag_csr_view.xml
@@ -5,7 +5,7 @@
product.brand.tag.csr.tree
product.brand.tag.csr
-
+