Merge PR #245 into 14.0

Signed-off-by etobella
This commit is contained in:
OCA-git-bot
2023-10-28 13:04:03 +00:00
11 changed files with 38 additions and 27 deletions

View File

@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier # 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 _src_path: gh:oca/oca-addons-repo-template
ci: GitHub ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true generate_requirements_txt: true
github_check_license: true github_check_license: true
github_ci_extra_env: {} github_ci_extra_env: {}
@@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true github_enable_stale_action: true
github_enforce_dev_status_compatibility: true github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0 odoo_version: 14.0
org_name: Odoo Community Association (OCA) org_name: Odoo Community Association (OCA)
org_slug: OCA org_slug: OCA
@@ -19,6 +19,4 @@ repo_description: 'TODO: add repo description.'
repo_name: server-backend repo_name: server-backend
repo_slug: server-backend repo_slug: server-backend
repo_website: https://github.com/OCA/server-backend repo_website: https://github.com/OCA/server-backend
travis_apt_packages: []
travis_apt_sources: []

View File

@@ -22,6 +22,7 @@ globals:
odoo: readonly odoo: readonly
openerp: readonly openerp: readonly
owl: readonly owl: readonly
luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules; # 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 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

View File

@@ -13,8 +13,10 @@ jobs:
pre-commit: pre-commit:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1 - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit run: pip install pre-commit
- name: Run pre-commit - name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always 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 - name: Check that all files generated by pre-commit are in git
run: | run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)" newfiles="$(git ls-files --others --exclude-from=.gitignore)"

View File

@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Detect unreleased dependencies name: Detect unreleased dependencies
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- run: | - run: |
for reqfile in requirements.txt test-requirements.txt ; do for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
matrix: matrix:
include: include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
makepot: "true"
name: test with Odoo name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
name: test with OCB name: test with OCB
makepot: "true"
services: services:
postgres: postgres:
image: postgres:9.6 image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
ports: ports:
- 5432:5432 - 5432:5432
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
persist-credentials: false persist-credentials: false
- name: Install addons and dependencies - name: Install addons and dependencies

View File

@@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/| /static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying # Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$| ^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 # You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
@@ -33,12 +35,24 @@ repos:
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6 rev: 969238e47c07d0c40573acff81d170f63245d738
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://github.com/OCA/server-backend"] args: ["https://github.com/OCA/server-backend"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=server-backend
- --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 - repo: https://github.com/myint/autoflake
rev: v1.4 rev: v1.4
hooks: hooks:

View File

@@ -116,16 +116,6 @@ msgstr ""
msgid "Display Name" msgid "Display Name"
msgstr "" msgstr ""
#. module: base_external_dbsource
#: model_terms:ir.ui.view,arch_db:base_external_dbsource.view_dbsource_form
msgid "External DB Source"
msgstr ""
#. module: base_external_dbsource
#: model_terms:ir.ui.view,arch_db:base_external_dbsource.view_dbsource_tree
msgid "External DB Sources"
msgstr ""
#. module: base_external_dbsource #. module: base_external_dbsource
#: model:ir.actions.act_window,name:base_external_dbsource.action_dbsource #: model:ir.actions.act_window,name:base_external_dbsource.action_dbsource
#: model:ir.model,name:base_external_dbsource.model_base_external_dbsource #: model:ir.model,name:base_external_dbsource.model_base_external_dbsource

View File

@@ -6,7 +6,7 @@
<field name="model">base.external.dbsource</field> <field name="model">base.external.dbsource</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="External DB Sources"> <tree>
<field name="name" /> <field name="name" />
<field name="connector" /> <field name="connector" />
<field name="conn_string" /> <field name="conn_string" />
@@ -17,7 +17,7 @@
<field name="name">base.external.dbsource.form</field> <field name="name">base.external.dbsource.form</field>
<field name="model">base.external.dbsource</field> <field name="model">base.external.dbsource</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="External DB Source"> <form>
<sheet> <sheet>
<group> <group>
<group> <group>

View File

@@ -67,8 +67,6 @@ msgstr ""
#. module: base_global_discount #. module: base_global_discount
#: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree #: model:ir.actions.act_window,name:base_global_discount.action_global_discount_tree
#: model:ir.ui.menu,name:base_global_discount.menu_global_discount #: model:ir.ui.menu,name:base_global_discount.menu_global_discount
#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_form
#: model_terms:ir.ui.view,arch_db:base_global_discount.global_discount_view_tree
msgid "Global Discounts" msgid "Global Discounts"
msgstr "" msgstr ""

View File

@@ -5,7 +5,7 @@
<record id="global_discount_view_tree" model="ir.ui.view"> <record id="global_discount_view_tree" model="ir.ui.view">
<field name="model">global.discount</field> <field name="model">global.discount</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Global Discounts" editable="bottom"> <tree editable="bottom">
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="name" /> <field name="name" />
<field name="discount" /> <field name="discount" />
@@ -17,7 +17,7 @@
<record id="global_discount_view_form" model="ir.ui.view"> <record id="global_discount_view_form" model="ir.ui.view">
<field name="model">global.discount</field> <field name="model">global.discount</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Global Discounts"> <form>
<sheet> <sheet>
<group col="4"> <group col="4">
<field name="name" /> <field name="name" />

View File

@@ -106,7 +106,6 @@ msgstr ""
#: model:ir.ui.menu,name:base_import_match.match_menu #: model:ir.ui.menu,name:base_import_match.match_menu
#: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view #: model_terms:ir.ui.view,arch_db:base_import_match.match_form_view
#: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view #: model_terms:ir.ui.view,arch_db:base_import_match.match_search_view
#: model_terms:ir.ui.view,arch_db:base_import_match.match_tree_view
msgid "Import Match" msgid "Import Match"
msgstr "" msgstr ""

View File

@@ -44,7 +44,7 @@
<field name="name">Import match tree view</field> <field name="name">Import match tree view</field>
<field name="model">base_import.match</field> <field name="model">base_import.match</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Import Match"> <tree>
<field name="name" /> <field name="name" />
<field name="sequence" invisible="True" /> <field name="sequence" invisible="True" />
</tree> </tree>