Merge PR #1014 into 14.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2023-10-30 08:08:09 +00:00
20 changed files with 43 additions and 51 deletions

View File

@@ -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: 'TODO: add repo description.'
repo_name: contract
repo_slug: contract
repo_website: https://github.com/OCA/contract
travis_apt_packages: []
travis_apt_sources: []

View File

@@ -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

View File

@@ -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)"

View File

@@ -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

View File

@@ -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/contract"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=contract
- --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:

View File

@@ -72,7 +72,6 @@ msgstr ""
#: model:ir.actions.act_window,name:agreement.agreement_type_action
#: model:ir.model,name:agreement.model_agreement_type
#: model:ir.ui.menu,name:agreement.agreement_type_menu
#: model_terms:ir.ui.view,arch_db:agreement.agreement_type_list_view
msgid "Agreement Types"
msgstr ""
@@ -80,7 +79,6 @@ msgstr ""
#: model:ir.actions.act_window,name:agreement.agreement_action
#: model:ir.ui.menu,name:agreement.agreement_menu
#: model:ir.ui.menu,name:agreement.agreement_menu_root
#: model_terms:ir.ui.view,arch_db:agreement.agreement_tree
msgid "Agreements"
msgstr ""
@@ -187,7 +185,6 @@ msgstr ""
#. module: agreement
#: model:ir.model.fields,help:agreement.field_agreement__message_has_error
#: model:ir.model.fields,help:agreement.field_agreement__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -319,11 +316,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""
#. module: agreement
#: model:ir.model.fields,field_description:agreement.field_agreement__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""
#. module: agreement
#: code:addons/agreement/models/agreement.py:0
#: model_terms:ir.ui.view,arch_db:agreement.agreement_search

View File

@@ -75,7 +75,7 @@
<field name="name">agreement.tree</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<tree string="Agreements">
<tree>
<field name="partner_id" />
<field name="code" />
<field name="name" />

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Type List</field>
<field name="model">agreement.type</field>
<field name="arch" type="xml">
<tree string="Agreement Types" default_order="name">
<tree>
<field name="name" string="Type Name" />
<field name="domain" />
<field name="active" widget="boolean_toggle" />

View File

@@ -160,7 +160,6 @@ msgstr ""
#: model:ir.ui.menu,name:agreement_legal.operations_agreements
#: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_graph_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_pivot_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_list_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_section_search_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_form
#: model_terms:ir.ui.view,arch_db:agreement_legal.res_config_settings_view_form
@@ -204,7 +203,6 @@ msgstr ""
#: model:ir.actions.act_window,name:agreement_legal.agreement_appendix_action
#: model:ir.model.fields,field_description:agreement_legal.field_agreement__appendix_ids
#: model:ir.ui.menu,name:agreement_legal.agreement_appendices
#: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_appendix_tree
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
msgid "Appendices"
msgstr ""
@@ -285,7 +283,6 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_legal.field_agreement__clauses_ids
#: model:ir.model.fields,field_description:agreement_legal.field_agreement_section__clauses_ids
#: model:ir.ui.menu,name:agreement_legal.agreement_clauses
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_clause_list_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_section_form_view
msgid "Clauses"
@@ -1043,7 +1040,6 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_legal.field_agreement__recital_ids
#: model:ir.ui.menu,name:agreement_legal.agreement_recitals
#: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_recital_search
#: model_terms:ir.ui.view,arch_db:agreement_legal.agreement_recital_tree
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.report_agreement_document
msgid "Recitals"
@@ -1140,7 +1136,6 @@ msgstr ""
#: model:ir.model.fields,field_description:agreement_legal.field_agreement__sections_ids
#: model:ir.ui.menu,name:agreement_legal.agreement_sections
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_form_view
#: model_terms:ir.ui.view,arch_db:agreement_legal.partner_agreement_section_list_view
msgid "Sections"
msgstr ""

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement List</field>
<field name="model">agreement</field>
<field name="arch" type="xml">
<tree string="Agreements" default_order="code desc, name">
<tree>
<field name="code" />
<field name="name" />
<field name="partner_id" />

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Appendix Tree</field>
<field name="model">agreement.appendix</field>
<field name="arch" type="xml">
<tree string="Appendices" default_order="agreement_id, sequence">
<tree>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="title" />

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Clause List</field>
<field name="model">agreement.clause</field>
<field name="arch" type="xml">
<tree string="Clauses" default_order="agreement_id, sequence">
<tree>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="title" />

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Recital Tree</field>
<field name="model">agreement.recital</field>
<field name="arch" type="xml">
<tree string="Recitals" default_order="agreement_id, sequence">
<tree>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="title" />

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Section List</field>
<field name="model">agreement.section</field>
<field name="arch" type="xml">
<tree string="Sections" default_order="agreement_id, sequence">
<tree>
<field name="sequence" widget="handle" />
<field name="name" />
<field name="title" />

View File

@@ -120,7 +120,6 @@ msgstr ""
#. module: agreement_serviceprofile
#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__message_has_error
#: model:ir.model.fields,help:agreement_serviceprofile.field_agreement_serviceprofile__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -228,11 +227,6 @@ msgstr ""
msgid "Product Variant"
msgstr ""
#. module: agreement_serviceprofile
#: model:ir.model.fields,field_description:agreement_serviceprofile.field_agreement_serviceprofile__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""
#. module: agreement_serviceprofile
#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.product_product_form_view
#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.product_template_form_view
@@ -262,7 +256,6 @@ msgstr ""
#: model:ir.ui.menu,name:agreement_serviceprofile.agreement_serviceprofiles
#: model:ir.ui.menu,name:agreement_serviceprofile.dashboard_serviceprofiles
#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_fsm_order_form_view
#: model_terms:ir.ui.view,arch_db:agreement_serviceprofile.agreement_serviceprofile_tree
msgid "Service Profiles"
msgstr ""

View File

@@ -5,7 +5,7 @@
<field name="name">Agreement Service Profile Tree</field>
<field name="model">agreement.serviceprofile</field>
<field name="arch" type="xml">
<tree string="Service Profiles" default_order='agreement_id'>
<tree default_order='agreement_id'>
<field name="name" />
<field name="agreement_id" />
<field name="partner_id" />

View File

@@ -1159,7 +1159,6 @@ msgstr ""
#. module: contract
#: model:ir.model.fields,help:contract.field_contract_contract__message_has_error
#: model:ir.model.fields,help:contract.field_contract_contract__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -1835,11 +1834,6 @@ msgstr ""
msgid "Responsible User"
msgstr ""
#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""
#. module: contract
#: model:ir.model.fields,field_description:contract.field_res_partner__sale_contract_count
#: model:ir.model.fields,field_description:contract.field_res_users__sale_contract_count

View File

@@ -1715,7 +1715,7 @@ msgstr ""
#: code:addons/contract/models/contract.py:0
#, fuzzy, python-format
msgid "Please define a %s journal for the company '%s'."
msgstr "Molimo definirajte dnevnik prodaje za poduzeće '%s'."
msgstr "Molimo definirajte dnevnik %s prodaje za poduzeće '%s'."
#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__access_url

View File

@@ -1713,7 +1713,7 @@ msgstr ""
#: code:addons/contract/models/contract.py:0
#, fuzzy, python-format
msgid "Please define a %s journal for the company '%s'."
msgstr "Lütfen '%s' şirketi için bir satış yevmiyesi tanımlayın."
msgstr "Lütfen '%s' şirketi için bir satış yevmiyesi tanımlayın %s."
#. module: contract
#: model:ir.model.fields,field_description:contract.field_contract_contract__access_url

View File

@@ -373,7 +373,6 @@ msgstr ""
#. module: subscription_oca
#: model:ir.model.fields,help:subscription_oca.field_sale_subscription__message_has_error
#: model:ir.model.fields,help:subscription_oca.field_sale_subscription__message_has_sms_error
msgid "If checked, some messages have a delivery error."
msgstr ""
@@ -672,11 +671,6 @@ msgstr ""
msgid "Rule count"
msgstr ""
#. module: subscription_oca
#: model:ir.model.fields,field_description:subscription_oca.field_sale_subscription__message_has_sms_error
msgid "SMS Delivery error"
msgstr ""
#. module: subscription_oca
#: model:ir.model.fields,field_description:subscription_oca.field_sale_subscription__sale_subscription_line_ids
msgid "Sale Subscription Line"