Compare commits
22 Commits
14.0
...
16.0-ci-pr
Author | SHA1 | Date | |
---|---|---|---|
|
b63c4b5335 | ||
|
1d4364b048 | ||
|
6b36376f6f | ||
|
39aef0d942 | ||
|
3d67b41a58 | ||
|
17e1f2f375 | ||
|
56723348db | ||
|
a123c3cc88 | ||
|
c8e2f102ee | ||
|
b8bc91f7bc | ||
|
ddefa78b49 | ||
|
85cb66c6d9 | ||
|
0207cd5845 | ||
|
eecfd25614 | ||
|
bc014155fa | ||
|
a72126d0a8 | ||
|
269c6b106b | ||
|
ee20c84f8b | ||
|
a94e819f8c | ||
|
5fadf2c769 | ||
|
70527dbb63 | ||
|
756f907ac8 |
20
.editorconfig
Normal file
20
.editorconfig
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# Configuration for known file extensions
|
||||||
|
[*.{css,js,json,less,md,py,rst,sass,scss,xml,yaml,yml}]
|
||||||
|
charset = utf-8
|
||||||
|
end_of_line = lf
|
||||||
|
indent_size = 4
|
||||||
|
indent_style = space
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
|
||||||
|
[*.{json,yml,yaml,rst,md}]
|
||||||
|
indent_size = 2
|
||||||
|
|
||||||
|
# Do not configure editor for libs and autogenerated content
|
||||||
|
[{*/static/{lib,src/lib}/**,*/static/description/index.html,*/readme/../README.rst}]
|
||||||
|
charset = unset
|
||||||
|
end_of_line = unset
|
||||||
|
indent_size = unset
|
||||||
|
indent_style = unset
|
||||||
|
insert_final_newline = false
|
||||||
|
trim_trailing_whitespace = false
|
188
.eslintrc.yml
Normal file
188
.eslintrc.yml
Normal file
@@ -0,0 +1,188 @@
|
|||||||
|
env:
|
||||||
|
browser: true
|
||||||
|
es6: true
|
||||||
|
|
||||||
|
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
|
||||||
|
parserOptions:
|
||||||
|
ecmaVersion: 2019
|
||||||
|
|
||||||
|
overrides:
|
||||||
|
- files:
|
||||||
|
- "**/*.esm.js"
|
||||||
|
parserOptions:
|
||||||
|
sourceType: module
|
||||||
|
|
||||||
|
# Globals available in Odoo that shouldn't produce errorings
|
||||||
|
globals:
|
||||||
|
_: readonly
|
||||||
|
$: readonly
|
||||||
|
fuzzy: readonly
|
||||||
|
jQuery: readonly
|
||||||
|
moment: readonly
|
||||||
|
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
|
||||||
|
rules:
|
||||||
|
accessor-pairs: warn
|
||||||
|
array-callback-return: warn
|
||||||
|
callback-return: warn
|
||||||
|
capitalized-comments:
|
||||||
|
- warn
|
||||||
|
- always
|
||||||
|
- ignoreConsecutiveComments: true
|
||||||
|
ignoreInlineComments: true
|
||||||
|
complexity:
|
||||||
|
- warn
|
||||||
|
- 15
|
||||||
|
constructor-super: warn
|
||||||
|
dot-notation: warn
|
||||||
|
eqeqeq: warn
|
||||||
|
global-require: warn
|
||||||
|
handle-callback-err: warn
|
||||||
|
id-blacklist: warn
|
||||||
|
id-match: warn
|
||||||
|
init-declarations: error
|
||||||
|
max-depth: warn
|
||||||
|
max-nested-callbacks: warn
|
||||||
|
max-statements-per-line: warn
|
||||||
|
no-alert: warn
|
||||||
|
no-array-constructor: warn
|
||||||
|
no-caller: warn
|
||||||
|
no-case-declarations: warn
|
||||||
|
no-class-assign: warn
|
||||||
|
no-cond-assign: error
|
||||||
|
no-const-assign: error
|
||||||
|
no-constant-condition: warn
|
||||||
|
no-control-regex: warn
|
||||||
|
no-debugger: error
|
||||||
|
no-delete-var: warn
|
||||||
|
no-div-regex: warn
|
||||||
|
no-dupe-args: error
|
||||||
|
no-dupe-class-members: error
|
||||||
|
no-dupe-keys: error
|
||||||
|
no-duplicate-case: error
|
||||||
|
no-duplicate-imports: error
|
||||||
|
no-else-return: warn
|
||||||
|
no-empty-character-class: warn
|
||||||
|
no-empty-function: error
|
||||||
|
no-empty-pattern: error
|
||||||
|
no-empty: warn
|
||||||
|
no-eq-null: error
|
||||||
|
no-eval: error
|
||||||
|
no-ex-assign: error
|
||||||
|
no-extend-native: warn
|
||||||
|
no-extra-bind: warn
|
||||||
|
no-extra-boolean-cast: warn
|
||||||
|
no-extra-label: warn
|
||||||
|
no-fallthrough: warn
|
||||||
|
no-func-assign: error
|
||||||
|
no-global-assign: error
|
||||||
|
no-implicit-coercion:
|
||||||
|
- warn
|
||||||
|
- allow: ["~"]
|
||||||
|
no-implicit-globals: warn
|
||||||
|
no-implied-eval: warn
|
||||||
|
no-inline-comments: warn
|
||||||
|
no-inner-declarations: warn
|
||||||
|
no-invalid-regexp: warn
|
||||||
|
no-irregular-whitespace: warn
|
||||||
|
no-iterator: warn
|
||||||
|
no-label-var: warn
|
||||||
|
no-labels: warn
|
||||||
|
no-lone-blocks: warn
|
||||||
|
no-lonely-if: error
|
||||||
|
no-mixed-requires: error
|
||||||
|
no-multi-str: warn
|
||||||
|
no-native-reassign: error
|
||||||
|
no-negated-condition: warn
|
||||||
|
no-negated-in-lhs: error
|
||||||
|
no-new-func: warn
|
||||||
|
no-new-object: warn
|
||||||
|
no-new-require: warn
|
||||||
|
no-new-symbol: warn
|
||||||
|
no-new-wrappers: warn
|
||||||
|
no-new: warn
|
||||||
|
no-obj-calls: warn
|
||||||
|
no-octal-escape: warn
|
||||||
|
no-octal: warn
|
||||||
|
no-param-reassign: warn
|
||||||
|
no-path-concat: warn
|
||||||
|
no-process-env: warn
|
||||||
|
no-process-exit: warn
|
||||||
|
no-proto: warn
|
||||||
|
no-prototype-builtins: warn
|
||||||
|
no-redeclare: warn
|
||||||
|
no-regex-spaces: warn
|
||||||
|
no-restricted-globals: warn
|
||||||
|
no-restricted-imports: warn
|
||||||
|
no-restricted-modules: warn
|
||||||
|
no-restricted-syntax: warn
|
||||||
|
no-return-assign: error
|
||||||
|
no-script-url: warn
|
||||||
|
no-self-assign: warn
|
||||||
|
no-self-compare: warn
|
||||||
|
no-sequences: warn
|
||||||
|
no-shadow-restricted-names: warn
|
||||||
|
no-shadow: warn
|
||||||
|
no-sparse-arrays: warn
|
||||||
|
no-sync: warn
|
||||||
|
no-this-before-super: warn
|
||||||
|
no-throw-literal: warn
|
||||||
|
no-undef-init: warn
|
||||||
|
no-undef: error
|
||||||
|
no-unmodified-loop-condition: warn
|
||||||
|
no-unneeded-ternary: error
|
||||||
|
no-unreachable: error
|
||||||
|
no-unsafe-finally: error
|
||||||
|
no-unused-expressions: error
|
||||||
|
no-unused-labels: error
|
||||||
|
no-unused-vars: error
|
||||||
|
no-use-before-define: error
|
||||||
|
no-useless-call: warn
|
||||||
|
no-useless-computed-key: warn
|
||||||
|
no-useless-concat: warn
|
||||||
|
no-useless-constructor: warn
|
||||||
|
no-useless-escape: warn
|
||||||
|
no-useless-rename: warn
|
||||||
|
no-void: warn
|
||||||
|
no-with: warn
|
||||||
|
operator-assignment: [error, always]
|
||||||
|
prefer-const: warn
|
||||||
|
radix: warn
|
||||||
|
require-yield: warn
|
||||||
|
sort-imports: warn
|
||||||
|
spaced-comment: [error, always]
|
||||||
|
strict: [error, function]
|
||||||
|
use-isnan: error
|
||||||
|
valid-jsdoc:
|
||||||
|
- warn
|
||||||
|
- prefer:
|
||||||
|
arg: param
|
||||||
|
argument: param
|
||||||
|
augments: extends
|
||||||
|
constructor: class
|
||||||
|
exception: throws
|
||||||
|
func: function
|
||||||
|
method: function
|
||||||
|
prop: property
|
||||||
|
return: returns
|
||||||
|
virtual: abstract
|
||||||
|
yield: yields
|
||||||
|
preferType:
|
||||||
|
array: Array
|
||||||
|
bool: Boolean
|
||||||
|
boolean: Boolean
|
||||||
|
number: Number
|
||||||
|
object: Object
|
||||||
|
str: String
|
||||||
|
string: String
|
||||||
|
requireParamDescription: false
|
||||||
|
requireReturn: false
|
||||||
|
requireReturnDescription: false
|
||||||
|
requireReturnType: false
|
||||||
|
valid-typeof: warn
|
||||||
|
yoda: warn
|
42
.github/workflows/pre-commit.yml
vendored
Normal file
42
.github/workflows/pre-commit.yml
vendored
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
name: pre-commit
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- "16.0*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
pre-commit:
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.11"
|
||||||
|
- name: Get python version
|
||||||
|
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||||
|
- uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: ~/.cache/pre-commit
|
||||||
|
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||||
|
- name: Install pre-commit
|
||||||
|
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)"
|
||||||
|
if [ "$newfiles" != "" ] ; then
|
||||||
|
echo "Please check-in the following files:"
|
||||||
|
echo "$newfiles"
|
||||||
|
exit 1
|
||||||
|
fi
|
146
.pre-commit-config.yaml
Normal file
146
.pre-commit-config.yaml
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
exclude: |
|
||||||
|
(?x)
|
||||||
|
# NOT INSTALLABLE ADDONS
|
||||||
|
# END NOT INSTALLABLE ADDONS
|
||||||
|
# Files and folders generated by bots, to avoid loops
|
||||||
|
^setup/|/static/description/index\.html$|
|
||||||
|
# We don't want to mess with tool-generated files
|
||||||
|
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
|
||||||
|
# Maybe reactivate this when all README files include prettier ignore tags?
|
||||||
|
^README\.md$|
|
||||||
|
# Library files can have extraneous formatting (even minimized)
|
||||||
|
/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)$|
|
||||||
|
# Ignore build and dist directories in addons
|
||||||
|
/build/|/dist/|
|
||||||
|
# Ignore test files in addons
|
||||||
|
/tests/samples/.*|
|
||||||
|
# You don't usually want a bot to modify your legal texts
|
||||||
|
(LICENSE.*|COPYING.*)
|
||||||
|
default_language_version:
|
||||||
|
python: python3
|
||||||
|
node: "16.17.0"
|
||||||
|
repos:
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
# These files are most likely copier diff rejection junks; if found,
|
||||||
|
# review them manually, fix the problem (if needed) and remove them
|
||||||
|
- id: forbidden-files
|
||||||
|
name: forbidden files
|
||||||
|
entry: found forbidden files; remove them
|
||||||
|
language: fail
|
||||||
|
files: "\\.rej$"
|
||||||
|
- id: en-po-files
|
||||||
|
name: en.po files cannot exist
|
||||||
|
entry: found a en.po file
|
||||||
|
language: fail
|
||||||
|
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
|
||||||
|
- repo: https://github.com/oca/maintainer-tools
|
||||||
|
rev: f9b919b9868143135a9c9cb03021089cabba8223
|
||||||
|
hooks:
|
||||||
|
# update the NOT INSTALLABLE ADDONS section above
|
||||||
|
- id: oca-update-pre-commit-excluded-addons
|
||||||
|
- id: oca-fix-manifest-website
|
||||||
|
args: ["https://github.com/elabore-coop/event-tools"]
|
||||||
|
- id: oca-gen-addon-readme
|
||||||
|
args:
|
||||||
|
- --addons-dir=.
|
||||||
|
- --branch=16.0
|
||||||
|
- --org-name=OCA
|
||||||
|
- --repo-name=event-tools
|
||||||
|
- --if-source-changed
|
||||||
|
- --keep-source-digest
|
||||||
|
- repo: https://github.com/OCA/odoo-pre-commit-hooks
|
||||||
|
rev: v0.1.4
|
||||||
|
hooks:
|
||||||
|
- id: oca-checks-odoo-module
|
||||||
|
- id: oca-checks-po
|
||||||
|
args:
|
||||||
|
- --disable=po-pretty-format
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
- id: prettier
|
||||||
|
name: prettier (with plugin-xml)
|
||||||
|
entry: prettier
|
||||||
|
args:
|
||||||
|
- --write
|
||||||
|
- --list-different
|
||||||
|
- --ignore-unknown
|
||||||
|
types: [text]
|
||||||
|
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
|
||||||
|
language: node
|
||||||
|
additional_dependencies:
|
||||||
|
- "prettier@2.7.1"
|
||||||
|
- "@prettier/plugin-xml@2.2.0"
|
||||||
|
- repo: local
|
||||||
|
hooks:
|
||||||
|
- id: eslint
|
||||||
|
name: eslint
|
||||||
|
entry: eslint
|
||||||
|
args:
|
||||||
|
- --color
|
||||||
|
- --fix
|
||||||
|
verbose: true
|
||||||
|
types: [javascript]
|
||||||
|
language: node
|
||||||
|
additional_dependencies:
|
||||||
|
- "eslint@8.24.0"
|
||||||
|
- "eslint-plugin-jsdoc@"
|
||||||
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
|
rev: v5.0.0
|
||||||
|
hooks:
|
||||||
|
- id: trailing-whitespace
|
||||||
|
# exclude autogenerated files
|
||||||
|
exclude: /README\.rst$|\.pot?$
|
||||||
|
- id: end-of-file-fixer
|
||||||
|
# exclude autogenerated files
|
||||||
|
exclude: /README\.rst$|\.pot?$
|
||||||
|
- id: debug-statements
|
||||||
|
- id: fix-encoding-pragma
|
||||||
|
args: ["--remove"]
|
||||||
|
- id: check-case-conflict
|
||||||
|
- id: check-docstring-first
|
||||||
|
- id: check-executables-have-shebangs
|
||||||
|
- id: check-merge-conflict
|
||||||
|
# exclude files where underlines are not distinguishable from merge conflicts
|
||||||
|
exclude: /README\.rst$|^docs/.*\.rst$
|
||||||
|
- id: check-symlinks
|
||||||
|
- id: check-xml
|
||||||
|
- id: mixed-line-ending
|
||||||
|
args: ["--fix=lf"]
|
||||||
|
- repo: https://github.com/PyCQA/docformatter
|
||||||
|
rev: v1.7.7
|
||||||
|
hooks:
|
||||||
|
- id: docformatter
|
||||||
|
args: [
|
||||||
|
"--in-place", # modify the files
|
||||||
|
"--recursive", # run on all the files
|
||||||
|
"--wrap-summaries",
|
||||||
|
"88", # max length of 1st line
|
||||||
|
"--wrap-descriptions",
|
||||||
|
"88", # max length of other lines
|
||||||
|
"--pre-summary-newline", # new line before a long summary
|
||||||
|
"--make-summary-multi-line", # force summary on multilines
|
||||||
|
]
|
||||||
|
additional_dependencies: ["tomli"] # if Python <3.11
|
||||||
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
|
rev: v0.12.0
|
||||||
|
hooks:
|
||||||
|
- id: ruff
|
||||||
|
args: [--fix, --exit-non-zero-on-fix]
|
||||||
|
- id: ruff-format
|
||||||
|
- repo: https://github.com/OCA/pylint-odoo
|
||||||
|
rev: v9.1.3
|
||||||
|
hooks:
|
||||||
|
- id: pylint_odoo
|
||||||
|
name: pylint with optional checks
|
||||||
|
args:
|
||||||
|
- --rcfile=.pylintrc
|
||||||
|
- --exit-zero
|
||||||
|
verbose: true
|
||||||
|
- id: pylint_odoo
|
||||||
|
args:
|
||||||
|
- --rcfile=.pylintrc-mandatory
|
8
.prettierrc.yml
Normal file
8
.prettierrc.yml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# Defaults for all prettier-supported languages.
|
||||||
|
# Prettier will complete this with settings from .editorconfig file.
|
||||||
|
bracketSpacing: false
|
||||||
|
printWidth: 88
|
||||||
|
proseWrap: always
|
||||||
|
semi: true
|
||||||
|
trailingComma: "es5"
|
||||||
|
xmlWhitespaceSensitivity: "strict"
|
123
.pylintrc
Normal file
123
.pylintrc
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
|
||||||
|
|
||||||
|
[MASTER]
|
||||||
|
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=Elabore
|
||||||
|
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
|
||||||
|
|
||||||
|
# This .pylintrc contains optional AND mandatory checks and is meant to be
|
||||||
|
# loaded in an IDE to have it check everything, in the hope this will make
|
||||||
|
# optional checks more visible to contributors who otherwise never look at a
|
||||||
|
# green travis to see optional checks that failed.
|
||||||
|
# .pylintrc-mandatory containing only mandatory checks is used the pre-commit
|
||||||
|
# config as a blocking check.
|
||||||
|
|
||||||
|
enable=anomalous-backslash-in-string,
|
||||||
|
api-one-deprecated,
|
||||||
|
api-one-multi-together,
|
||||||
|
assignment-from-none,
|
||||||
|
attribute-deprecated,
|
||||||
|
class-camelcase,
|
||||||
|
dangerous-default-value,
|
||||||
|
dangerous-view-replace-wo-priority,
|
||||||
|
development-status-allowed,
|
||||||
|
duplicate-id-csv,
|
||||||
|
duplicate-key,
|
||||||
|
duplicate-xml-fields,
|
||||||
|
duplicate-xml-record-id,
|
||||||
|
eval-referenced,
|
||||||
|
eval-used,
|
||||||
|
incoherent-interpreter-exec-perm,
|
||||||
|
license-allowed,
|
||||||
|
manifest-author-string,
|
||||||
|
manifest-deprecated-key,
|
||||||
|
manifest-required-author,
|
||||||
|
manifest-required-key,
|
||||||
|
manifest-version-format,
|
||||||
|
method-compute,
|
||||||
|
method-inverse,
|
||||||
|
method-required-super,
|
||||||
|
method-search,
|
||||||
|
openerp-exception-warning,
|
||||||
|
pointless-statement,
|
||||||
|
pointless-string-statement,
|
||||||
|
print-used,
|
||||||
|
redundant-keyword-arg,
|
||||||
|
redundant-modulename-xml,
|
||||||
|
reimported,
|
||||||
|
relative-import,
|
||||||
|
return-in-init,
|
||||||
|
rst-syntax-error,
|
||||||
|
sql-injection,
|
||||||
|
too-few-format-args,
|
||||||
|
translation-field,
|
||||||
|
translation-required,
|
||||||
|
unreachable,
|
||||||
|
use-vim-comment,
|
||||||
|
wrong-tabs-instead-of-spaces,
|
||||||
|
xml-syntax-error,
|
||||||
|
attribute-string-redundant,
|
||||||
|
character-not-valid-in-resource-link,
|
||||||
|
consider-merging-classes-inherited,
|
||||||
|
context-overridden,
|
||||||
|
create-user-wo-reset-password,
|
||||||
|
dangerous-filter-wo-user,
|
||||||
|
dangerous-qweb-replace-wo-priority,
|
||||||
|
deprecated-data-xml-node,
|
||||||
|
deprecated-openerp-xml-node,
|
||||||
|
duplicate-po-message-definition,
|
||||||
|
except-pass,
|
||||||
|
file-not-used,
|
||||||
|
invalid-commit,
|
||||||
|
manifest-maintainers-list,
|
||||||
|
missing-newline-extrafiles,
|
||||||
|
missing-readme,
|
||||||
|
missing-return,
|
||||||
|
odoo-addons-relative-import,
|
||||||
|
old-api7-method-defined,
|
||||||
|
po-msgstr-variables,
|
||||||
|
po-syntax-error,
|
||||||
|
renamed-field-parameter,
|
||||||
|
resource-not-exist,
|
||||||
|
str-format-used,
|
||||||
|
test-folder-imported,
|
||||||
|
translation-contains-variable,
|
||||||
|
translation-positional-used,
|
||||||
|
unnecessary-utf8-coding-comment,
|
||||||
|
website-manifest-key-not-valid-uri,
|
||||||
|
xml-attribute-translatable,
|
||||||
|
xml-deprecated-qweb-directive,
|
||||||
|
xml-deprecated-tree-attribute,
|
||||||
|
external-request-timeout,
|
||||||
|
# messages that do not cause the lint step to fail
|
||||||
|
consider-merging-classes-inherited,
|
||||||
|
create-user-wo-reset-password,
|
||||||
|
dangerous-filter-wo-user,
|
||||||
|
deprecated-module,
|
||||||
|
file-not-used,
|
||||||
|
invalid-commit,
|
||||||
|
missing-manifest-dependency,
|
||||||
|
missing-newline-extrafiles,
|
||||||
|
missing-readme,
|
||||||
|
no-utf8-coding-comment,
|
||||||
|
odoo-addons-relative-import,
|
||||||
|
old-api7-method-defined,
|
||||||
|
redefined-builtin,
|
||||||
|
too-complex,
|
||||||
|
unnecessary-utf8-coding-comment
|
||||||
|
|
||||||
|
|
||||||
|
[REPORTS]
|
||||||
|
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
|
||||||
|
output-format=colorized
|
||||||
|
reports=no
|
98
.pylintrc-mandatory
Normal file
98
.pylintrc-mandatory
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
|
||||||
|
[MASTER]
|
||||||
|
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=Elabore
|
||||||
|
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
|
||||||
|
|
||||||
|
enable=anomalous-backslash-in-string,
|
||||||
|
api-one-deprecated,
|
||||||
|
api-one-multi-together,
|
||||||
|
assignment-from-none,
|
||||||
|
attribute-deprecated,
|
||||||
|
class-camelcase,
|
||||||
|
dangerous-default-value,
|
||||||
|
dangerous-view-replace-wo-priority,
|
||||||
|
development-status-allowed,
|
||||||
|
duplicate-id-csv,
|
||||||
|
duplicate-key,
|
||||||
|
duplicate-xml-fields,
|
||||||
|
duplicate-xml-record-id,
|
||||||
|
eval-referenced,
|
||||||
|
eval-used,
|
||||||
|
incoherent-interpreter-exec-perm,
|
||||||
|
license-allowed,
|
||||||
|
manifest-author-string,
|
||||||
|
manifest-deprecated-key,
|
||||||
|
manifest-required-author,
|
||||||
|
manifest-required-key,
|
||||||
|
manifest-version-format,
|
||||||
|
method-compute,
|
||||||
|
method-inverse,
|
||||||
|
method-required-super,
|
||||||
|
method-search,
|
||||||
|
openerp-exception-warning,
|
||||||
|
pointless-statement,
|
||||||
|
pointless-string-statement,
|
||||||
|
print-used,
|
||||||
|
redundant-keyword-arg,
|
||||||
|
redundant-modulename-xml,
|
||||||
|
reimported,
|
||||||
|
relative-import,
|
||||||
|
return-in-init,
|
||||||
|
rst-syntax-error,
|
||||||
|
sql-injection,
|
||||||
|
too-few-format-args,
|
||||||
|
translation-field,
|
||||||
|
translation-required,
|
||||||
|
unreachable,
|
||||||
|
use-vim-comment,
|
||||||
|
wrong-tabs-instead-of-spaces,
|
||||||
|
xml-syntax-error,
|
||||||
|
attribute-string-redundant,
|
||||||
|
character-not-valid-in-resource-link,
|
||||||
|
consider-merging-classes-inherited,
|
||||||
|
context-overridden,
|
||||||
|
create-user-wo-reset-password,
|
||||||
|
dangerous-filter-wo-user,
|
||||||
|
dangerous-qweb-replace-wo-priority,
|
||||||
|
deprecated-data-xml-node,
|
||||||
|
deprecated-openerp-xml-node,
|
||||||
|
duplicate-po-message-definition,
|
||||||
|
except-pass,
|
||||||
|
file-not-used,
|
||||||
|
invalid-commit,
|
||||||
|
manifest-maintainers-list,
|
||||||
|
missing-newline-extrafiles,
|
||||||
|
missing-readme,
|
||||||
|
missing-return,
|
||||||
|
odoo-addons-relative-import,
|
||||||
|
old-api7-method-defined,
|
||||||
|
po-msgstr-variables,
|
||||||
|
po-syntax-error,
|
||||||
|
renamed-field-parameter,
|
||||||
|
resource-not-exist,
|
||||||
|
str-format-used,
|
||||||
|
test-folder-imported,
|
||||||
|
translation-contains-variable,
|
||||||
|
translation-positional-used,
|
||||||
|
unnecessary-utf8-coding-comment,
|
||||||
|
website-manifest-key-not-valid-uri,
|
||||||
|
xml-attribute-translatable,
|
||||||
|
xml-deprecated-qweb-directive,
|
||||||
|
xml-deprecated-tree-attribute,
|
||||||
|
external-request-timeout
|
||||||
|
|
||||||
|
[REPORTS]
|
||||||
|
msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
|
||||||
|
output-format=colorized
|
||||||
|
reports=no
|
42
.ruff.toml
Normal file
42
.ruff.toml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
|
||||||
|
target-version = "py310"
|
||||||
|
fix = true
|
||||||
|
|
||||||
|
[lint]
|
||||||
|
extend-select = [
|
||||||
|
"B",
|
||||||
|
"C90",
|
||||||
|
"E501", # line too long (default 88)
|
||||||
|
"I", # isort
|
||||||
|
"UP", # pyupgrade
|
||||||
|
]
|
||||||
|
extend-safe-fixes = ["UP008"]
|
||||||
|
exclude = ["setup/*"]
|
||||||
|
|
||||||
|
[format]
|
||||||
|
exclude = ["setup/*"]
|
||||||
|
|
||||||
|
[lint.per-file-ignores]
|
||||||
|
"__init__.py" = [
|
||||||
|
"F401",
|
||||||
|
"I001",
|
||||||
|
] # ignore unused and unsorted imports in __init__.py
|
||||||
|
"__manifest__.py" = ["B018"] # useless expression
|
||||||
|
|
||||||
|
[lint.isort]
|
||||||
|
section-order = [
|
||||||
|
"future",
|
||||||
|
"standard-library",
|
||||||
|
"third-party",
|
||||||
|
"odoo",
|
||||||
|
"odoo-addons",
|
||||||
|
"first-party",
|
||||||
|
"local-folder",
|
||||||
|
]
|
||||||
|
|
||||||
|
[lint.isort.sections]
|
||||||
|
"odoo" = ["odoo"]
|
||||||
|
"odoo-addons" = ["odoo.addons"]
|
||||||
|
|
||||||
|
[lint.mccabe]
|
||||||
|
max-complexity = 16
|
1
event_generate_quotation_from_registration/__init__.py
Normal file
1
event_generate_quotation_from_registration/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from . import models
|
22
event_generate_quotation_from_registration/__manifest__.py
Normal file
22
event_generate_quotation_from_registration/__manifest__.py
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "event_generate_quotation_from_registration",
|
||||||
|
"version": "16.0.1.0.0",
|
||||||
|
"license": "AGPL-3",
|
||||||
|
"author": "Elabore",
|
||||||
|
"website": "https://www.elabore.coop",
|
||||||
|
"category": "",
|
||||||
|
'summary': 'Generate quotation from event registration',
|
||||||
|
'description': """
|
||||||
|
Generate quotation from event registration :
|
||||||
|
""",
|
||||||
|
"depends": ["event_sale"],
|
||||||
|
"data": [
|
||||||
|
'security/ir.model.access.csv',
|
||||||
|
'views/event_registration_views.xml',
|
||||||
|
'views/sale_order_views.xml',
|
||||||
|
'views/account_move_views.xml',
|
||||||
|
],
|
||||||
|
"installable": True,
|
||||||
|
}
|
@@ -0,0 +1,4 @@
|
|||||||
|
from . import event_registration
|
||||||
|
from . import event_registration_financier
|
||||||
|
from . import sale_order
|
||||||
|
from . import account_move
|
@@ -0,0 +1,6 @@
|
|||||||
|
from odoo import _, api, Command, fields, models
|
||||||
|
|
||||||
|
class AccountMove(models.Model):
|
||||||
|
_inherit = "account.move"
|
||||||
|
|
||||||
|
event_registration_id = fields.Many2one('event.registration', string="Stagiaire")
|
@@ -0,0 +1,46 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
import logging
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
class EventRegistration(models.Model):
|
||||||
|
_inherit = "event.registration"
|
||||||
|
|
||||||
|
financier_ids = fields.One2many('event.registration.financier', 'registration_id', string="Financements")
|
||||||
|
|
||||||
|
def name_get(self):
|
||||||
|
result = []
|
||||||
|
for registration in self:
|
||||||
|
if registration.partner_id and registration.event_id:
|
||||||
|
name = f"{registration.partner_id.name} ({registration.event_id.name})"
|
||||||
|
result.append((registration.id, name))
|
||||||
|
return result
|
||||||
|
|
||||||
|
@api.depends("partner_id", "event_id")
|
||||||
|
def _compute_display_name(self):
|
||||||
|
for registration in self:
|
||||||
|
if registration.partner_id and registration.event_id:
|
||||||
|
registration.display_name = f"{registration.partner_id.name} ({registration.event_id.name})"
|
||||||
|
else:
|
||||||
|
registration.display_name = super(EventRegistration, registration)._compute_display_name()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def generate_quotation(self):
|
||||||
|
for registration in self:
|
||||||
|
for financier in registration.financier_ids:
|
||||||
|
if not financier.quotation_id:
|
||||||
|
so_values = financier.get_sale_order_values()
|
||||||
|
so_values['order_line'] = financier.get_sale_order_line_values()
|
||||||
|
sale_order = self.env['sale.order'].create(so_values)
|
||||||
|
financier.quotation_id = sale_order
|
||||||
|
else:
|
||||||
|
order_lines = self.env['sale.order.line'].search([
|
||||||
|
('order_id','=',financier.quotation_id.id),
|
||||||
|
('product_id','=',financier.get_product_id()),
|
||||||
|
('state', '!=', 'done'),
|
||||||
|
])
|
||||||
|
if order_lines:
|
||||||
|
order_lines[0].price_unit = financier.amount
|
||||||
|
financier.quotation_id.write(financier.get_sale_order_values())
|
||||||
|
|
@@ -0,0 +1,44 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from odoo.exceptions import UserError
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
class EventRegistrationFinancier(models.Model):
|
||||||
|
_name = "event.registration.financier"
|
||||||
|
|
||||||
|
_rec_name = 'financier_id'
|
||||||
|
|
||||||
|
company_id = fields.Many2one("res.company")
|
||||||
|
company_currency_id = fields.Many2one('res.currency', related="company_id.currency_id")
|
||||||
|
registration_id = fields.Many2one('event.registration')
|
||||||
|
quotation_id = fields.Many2one('sale.order', string="Devis")
|
||||||
|
financier_id = fields.Many2one('res.partner', string="Financeur", required=True)
|
||||||
|
terms = fields.Char('Modalités')
|
||||||
|
amount = fields.Monetary('Montant', currency_field="company_currency_id")
|
||||||
|
state = fields.Selection(
|
||||||
|
related='quotation_id.state',
|
||||||
|
string="Order Status",
|
||||||
|
copy=False, store=True, precompute=True)
|
||||||
|
|
||||||
|
|
||||||
|
def get_product_id(self):
|
||||||
|
if self.registration_id.event_ticket_id:
|
||||||
|
return self.registration_id.event_ticket_id.product_id.id
|
||||||
|
elif self.registration_id.event_id.event_ticket_ids:
|
||||||
|
return self.registration_id.event_id.event_ticket_ids[0].product_id.id
|
||||||
|
raise UserError('Un ticket doit être défini dans la session de formation afin de générer le devis')
|
||||||
|
|
||||||
|
def get_sale_order_values(self):
|
||||||
|
return {
|
||||||
|
'event_registration_id':self.registration_id.id,
|
||||||
|
'partner_id':self.financier_id.id,
|
||||||
|
}
|
||||||
|
|
||||||
|
def get_sale_order_line_values(self):
|
||||||
|
return [Command.create({
|
||||||
|
"price_unit": self.amount,
|
||||||
|
"product_id": self.get_product_id()
|
||||||
|
})]
|
||||||
|
|
@@ -0,0 +1,39 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
import logging
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
class SaleOrder(models.Model):
|
||||||
|
_inherit = "sale.order"
|
||||||
|
|
||||||
|
event_registration_id = fields.Many2one('event.registration', string="Stagiaire")
|
||||||
|
|
||||||
|
def _prepare_invoice(self):
|
||||||
|
"""Copy event_registration_id to generated invoice
|
||||||
|
"""
|
||||||
|
res = super(SaleOrder, self)._prepare_invoice()
|
||||||
|
res["event_registration_id"] = self.event_registration_id.id
|
||||||
|
return res
|
||||||
|
|
||||||
|
def linked_to_registration(self):
|
||||||
|
return len(self.env['event.registration.financier'].search([('quotation_id','=',self.id)])) > 0
|
||||||
|
|
||||||
|
def action_confirm(self):
|
||||||
|
res = super(SaleOrder, self).action_confirm()
|
||||||
|
|
||||||
|
#if sale order is linked to event.registration.financier, don't open wizard
|
||||||
|
if isinstance(res, dict) and res.get('xml_id') == 'event_sale.action_sale_order_event_registration' and self.linked_to_registration():
|
||||||
|
return True
|
||||||
|
|
||||||
|
return res
|
||||||
|
|
||||||
|
class SaleOrderLine(models.Model):
|
||||||
|
_inherit = "sale.order.line"
|
||||||
|
|
||||||
|
def _update_registrations(self, confirm=True, cancel_to_draft=False, registration_data=None, mark_as_paid=False):
|
||||||
|
# bypass _update_registrations if order generated by event registration
|
||||||
|
if self.order_id.linked_to_registration():
|
||||||
|
return
|
||||||
|
return super(SaleOrderLine, self)._update_registrations(confirm, cancel_to_draft, registration_data, mark_as_paid)
|
||||||
|
|
||||||
|
|
@@ -0,0 +1,2 @@
|
|||||||
|
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
|
||||||
|
access_event_registration_financier,access.event.registration.financier,model_event_registration_financier,sales_team.group_sale_salesman,1,1,1,1
|
|
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<record id="view_move_form" model="ir.ui.view">
|
||||||
|
<field name="name">view.move.form.inherit.event.generate.quotation</field>
|
||||||
|
<field name="model">account.move</field>
|
||||||
|
<field name="inherit_id" ref="account.view_move_form" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="partner_shipping_id" position="after">
|
||||||
|
<field name="event_registration_id" />
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="view_out_invoice_tree" model="ir.ui.view">
|
||||||
|
<field name="name">view.out.invoice.tree.inherit.event.generate.quotation</field>
|
||||||
|
<field name="model">account.move</field>
|
||||||
|
<field name="inherit_id" ref="account.view_out_invoice_tree" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="invoice_date" position="before">
|
||||||
|
<field name="event_registration_id" />
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</odoo>
|
@@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<odoo>
|
||||||
|
|
||||||
|
<record model="ir.ui.view" id="view_event_registration_form_event_generate_quotation_from_registration">
|
||||||
|
<field name="name">view.event.registration.form.event.generate.quotation.from.registration</field>
|
||||||
|
<field name="model">event.registration</field>
|
||||||
|
<field name="inherit_id" ref="event_sale.event_registration_ticket_view_form" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<sheet position="inside">
|
||||||
|
<group name="quotation" string="Financement" colspan="1">
|
||||||
|
<field name="financier_ids" nolabel="1" colspan="2">
|
||||||
|
<tree editable="bottom">
|
||||||
|
<field name="state" invisible="1"/>
|
||||||
|
<field name="financier_id" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}"/>
|
||||||
|
<field name="amount" attrs="{'readonly': [('state', 'in', ['done', 'cancel'])]}" />
|
||||||
|
<field name="terms" />
|
||||||
|
<field name="quotation_id" readonly="True" />
|
||||||
|
</tree>
|
||||||
|
</field>
|
||||||
|
<button name="generate_quotation" type="object" string="Créer/adapter les devis" colspan="2" />
|
||||||
|
</group>
|
||||||
|
</sheet>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
</odoo>
|
@@ -0,0 +1,24 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<odoo>
|
||||||
|
<record id="sale_order_view_form" model="ir.ui.view">
|
||||||
|
<field name="name">sale.order.form.inherit.event.generate.quotation</field>
|
||||||
|
<field name="model">sale.order</field>
|
||||||
|
<field name="inherit_id" ref="sale.view_order_form" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<group name="order_details" position="inside">
|
||||||
|
<field name="event_registration_id" />
|
||||||
|
</group>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
|
||||||
|
<record id="view_quotation_tree" model="ir.ui.view">
|
||||||
|
<field name="name">view.quotation.tree.inherit.event.generate.quotation</field>
|
||||||
|
<field name="model">sale.order</field>
|
||||||
|
<field name="inherit_id" ref="sale.view_quotation_tree" />
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<field name="partner_id" position="after">
|
||||||
|
<field name="event_registration_id" />
|
||||||
|
</field>
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</odoo>
|
@@ -1,5 +1,3 @@
|
|||||||
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
|
|
||||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
|
||||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -8,6 +6,7 @@
|
|||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://www.elabore.coop",
|
"website": "https://www.elabore.coop",
|
||||||
|
'summary': 'Not usefull anymore for CTL',
|
||||||
"category": "",
|
"category": "",
|
||||||
"depends": ["website_event_track"],
|
"depends": ["website_event_track"],
|
||||||
"data": [
|
"data": [
|
||||||
|
@@ -1,5 +1,3 @@
|
|||||||
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
|
|
||||||
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
|
||||||
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@@ -13,5 +13,6 @@ class CalendarEvent(models.Model):
|
|||||||
for event in res:
|
for event in res:
|
||||||
if event.event_track_id:
|
if event.event_track_id:
|
||||||
event.event_track_id.sync_calendar_event()
|
event.event_track_id.sync_calendar_event()
|
||||||
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
@@ -6,11 +6,9 @@ _logger = logging.getLogger(__name__)
|
|||||||
class EventEvent(models.Model):
|
class EventEvent(models.Model):
|
||||||
_inherit = "event.event"
|
_inherit = "event.event"
|
||||||
|
|
||||||
def write(self, vals):
|
def write(self, vals):
|
||||||
_logger.warning("call write...")
|
|
||||||
res = super().write(vals)
|
res = super().write(vals)
|
||||||
for event in self:
|
for event in self:
|
||||||
for track in event.track_ids:
|
for track in event.track_ids:
|
||||||
track.sync_calendar_event()
|
track.sync_calendar_event()
|
||||||
_logger.warning("called !")
|
|
||||||
return res
|
return res
|
||||||
|
@@ -6,14 +6,11 @@ _logger = logging.getLogger(__name__)
|
|||||||
class EventRegistration(models.Model):
|
class EventRegistration(models.Model):
|
||||||
_inherit = "event.registration"
|
_inherit = "event.registration"
|
||||||
|
|
||||||
def write(self, vals):
|
def write(self, vals):
|
||||||
_logger.warning("call write...")
|
res = super(EventRegistration,self).write(vals)
|
||||||
res = super(EventRegistration,self).write(vals)
|
|
||||||
_logger.warning("Super Write OK")
|
|
||||||
for registration in self:
|
for registration in self:
|
||||||
for track in registration.event_id.track_ids:
|
for track in registration.event_id.track_ids:
|
||||||
track.sync_calendar_event()
|
track.sync_calendar_event()
|
||||||
_logger.warning("called !")
|
|
||||||
return res
|
return res
|
||||||
|
|
||||||
@api.model_create_multi
|
@api.model_create_multi
|
||||||
|
@@ -9,7 +9,7 @@ _logger = logging.getLogger(__name__)
|
|||||||
class EventTrack(models.Model):
|
class EventTrack(models.Model):
|
||||||
_inherit = "event.track"
|
_inherit = "event.track"
|
||||||
|
|
||||||
calendar_event_ids = fields.One2many('calendar.event', 'event_track_id', 'Days')
|
calendar_event_ids = fields.One2many('calendar.event', 'event_track_id', 'Time slot', copy=True)
|
||||||
date = fields.Datetime(compute="_compute_date")
|
date = fields.Datetime(compute="_compute_date")
|
||||||
|
|
||||||
def _compute_date(self):
|
def _compute_date(self):
|
||||||
@@ -25,9 +25,13 @@ class EventTrack(models.Model):
|
|||||||
"""return default values of calendar events
|
"""return default values of calendar events
|
||||||
"""
|
"""
|
||||||
return {
|
return {
|
||||||
'partner_ids':[Command.set(self.get_calendar_event_partner_value())],
|
# due to google calendar unexpected notifications, for the moment we disable attendees of calendar event
|
||||||
|
# uncomment following line to re-enable
|
||||||
|
#'partner_ids':[Command.set(self.get_calendar_event_partner_value())],
|
||||||
|
'partner_ids':[Command.set([])],
|
||||||
'location':self.location_id.name if self.location_id else '',
|
'location':self.location_id.name if self.location_id else '',
|
||||||
'user_id':self.user_id.id
|
#'user_id':self.user_id.id,
|
||||||
|
'privacy':"confidential"
|
||||||
}
|
}
|
||||||
|
|
||||||
def get_calendar_event_partner_value(self):
|
def get_calendar_event_partner_value(self):
|
||||||
@@ -51,7 +55,7 @@ class EventTrack(models.Model):
|
|||||||
"""
|
"""
|
||||||
_logger.warning("sync_calendar_event...")
|
_logger.warning("sync_calendar_event...")
|
||||||
for track in self:
|
for track in self:
|
||||||
track.calendar_event_ids.write(track.get_calendar_event_values())
|
track.calendar_event_ids.with_context(no_mail_to_attendees=True).write(track.get_calendar_event_values())
|
||||||
_logger.warning("sync_calendar_event done !")
|
_logger.warning("sync_calendar_event done !")
|
||||||
|
|
||||||
|
|
||||||
@@ -71,3 +75,10 @@ class EventTrack(models.Model):
|
|||||||
res = super().write(vals)
|
res = super().write(vals)
|
||||||
self.sync_calendar_event()
|
self.sync_calendar_event()
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
||||||
|
def unlink(self):
|
||||||
|
for track in self:
|
||||||
|
for calendar_event in track.calendar_event_ids:
|
||||||
|
calendar_event.unlink()
|
||||||
|
return super(EventTrack, self).unlink()
|
@@ -1,24 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<record model="ir.ui.view" id="view_event_track_form_ctl_training_customization">
|
<record model="ir.ui.view" id="view_event_track_form_event_track_calendar_event">
|
||||||
<field name="name">event.track.form.ctl.training.customization</field>
|
<field name="name">event.track.form.event.track.calendar.event</field>
|
||||||
<field name="inherit_id" ref="website_event_track.view_event_track_form" />
|
<field name="inherit_id" ref="website_event_track.view_event_track_form" />
|
||||||
<field name="model">event.track</field>
|
<field name="model">event.track</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<!--
|
<!--
|
||||||
Replace date with calendar events
|
Replace date with calendar events
|
||||||
-->
|
-->
|
||||||
<field name="date" position="replace" />
|
<!-- <field name="date" position="replace" /> -->
|
||||||
<page name="speaker" position="before">
|
<page name="speaker" position="before">
|
||||||
<page name="calendar_events" string="Dates">
|
<page name="calendar_events" string="Plages horaires">
|
||||||
<field name="calendar_event_ids" context="{'default_name':name}" colspan="2">
|
<field name="calendar_event_ids" context="{'default_name':name}" colspan="2">
|
||||||
<tree default_order="start,stop">
|
<tree default_order="start,stop" editable="bottom">
|
||||||
<field name="name" string="Name" invisible="1" />
|
<field name="name" string="Name" invisible="1" />
|
||||||
<field name="start" string="From" />
|
<field name="start" string="From" />
|
||||||
<field name="stop" string="To" />
|
<field name="stop" string="To" />
|
||||||
<field name="description" />
|
<field name="description" />
|
||||||
</tree>
|
</tree>
|
||||||
<form>
|
<!-- <form>
|
||||||
<group>
|
<group>
|
||||||
<field name="name" string="Name" invisible="True" />
|
<field name="name" string="Name" invisible="True" />
|
||||||
<label for="start" string="Date"/>
|
<label for="start" string="Date"/>
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<field name="description" />
|
<field name="description" />
|
||||||
</group>
|
</group>
|
||||||
</form>
|
</form> -->
|
||||||
</field>
|
</field>
|
||||||
</page>
|
</page>
|
||||||
</page>
|
</page>
|
||||||
|
@@ -9,9 +9,10 @@
|
|||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://www.elabore.coop",
|
"website": "https://www.elabore.coop",
|
||||||
"category": "",
|
"category": "",
|
||||||
'summary': 'Event track calendar event adaptation when event_speaker module installed',
|
'summary': 'Speaker management in calendar events of event tracks',
|
||||||
"depends": ["event_track_calendar_event","event_speaker"],
|
"depends": ["event_track_calendar_event"],
|
||||||
"data": [
|
"data": [
|
||||||
|
"views/event_track_views.xml"
|
||||||
],
|
],
|
||||||
"installable": True,
|
"installable": True,
|
||||||
"auto_install":True
|
"auto_install":True
|
||||||
|
@@ -1 +1,2 @@
|
|||||||
from . import event_track
|
from . import event_track
|
||||||
|
from . import calendar_event
|
@@ -0,0 +1,10 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
|
||||||
|
|
||||||
|
class CalendarEvent(models.Model):
|
||||||
|
_inherit = 'calendar.event'
|
||||||
|
|
||||||
|
speaker_ids = fields.Many2many(
|
||||||
|
'res.partner', "calendar_event_speaker_rel", "calendar_event_id", "speaker_id", string="Intervenants", domain="[('is_company','=',False)]"
|
||||||
|
)
|
@@ -5,6 +5,19 @@ from odoo import fields, models, api, Command
|
|||||||
class EventTrack(models.Model):
|
class EventTrack(models.Model):
|
||||||
_inherit = "event.track"
|
_inherit = "event.track"
|
||||||
|
|
||||||
|
speaker_ids = fields.Many2many(
|
||||||
|
'res.partner', string="Intervenants", compute="compute_speaker_ids"
|
||||||
|
)
|
||||||
|
|
||||||
|
def compute_speaker_ids(self):
|
||||||
|
"""set speaker_ids as concat of all speakers of all events"""
|
||||||
|
for track in self:
|
||||||
|
speaker_ids = set()
|
||||||
|
for event in track.calendar_event_ids:
|
||||||
|
speaker_ids.update(event.speaker_ids.ids)
|
||||||
|
track.speaker_ids = list(speaker_ids)
|
||||||
|
|
||||||
|
|
||||||
def get_calendar_event_partner_value(self):
|
def get_calendar_event_partner_value(self):
|
||||||
"""Add speaker ids to calendar event partners
|
"""Add speaker ids to calendar event partners
|
||||||
"""
|
"""
|
||||||
|
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<odoo>
|
||||||
|
<record model="ir.ui.view" id="view_event_track_form_event_track_calendar_event_event_speaker">
|
||||||
|
<field name="name">event.track.form.event.track.calendar.event.event.speaker</field>
|
||||||
|
<field name="inherit_id" ref="event_track_calendar_event.view_event_track_form_event_track_calendar_event" />
|
||||||
|
<field name="model">event.track</field>
|
||||||
|
<field name="arch" type="xml">
|
||||||
|
<xpath expr="//field[@name='calendar_event_ids']/tree/field[@name='description']" position="after">
|
||||||
|
<field name="speaker_ids" widget="many2many_tags"/>
|
||||||
|
</xpath>
|
||||||
|
|
||||||
|
<!-- <xpath expr="//field[@name='calendar_event_ids']/form//field[@name='description']" position="after">
|
||||||
|
<field name="speaker_ids" />
|
||||||
|
</xpath> -->
|
||||||
|
|
||||||
|
</field>
|
||||||
|
</record>
|
||||||
|
</odoo>
|
@@ -17,15 +17,24 @@ class EventTrack(models.Model):
|
|||||||
location_already_in_use = False
|
location_already_in_use = False
|
||||||
location_already_in_use_message = ""
|
location_already_in_use_message = ""
|
||||||
|
|
||||||
|
already_found_other_calendar_event_ids = []
|
||||||
|
|
||||||
for calendar_event in track.calendar_event_ids:
|
for calendar_event in track.calendar_event_ids:
|
||||||
if track.location_id and calendar_event.start:
|
if track.location_id and calendar_event.start:
|
||||||
|
|
||||||
#search if other calendar event exists for same day on same location
|
#search if other calendar event exists for same day on same location
|
||||||
search_other_calendar_events = [('event_track_id.location_id','=',track.location_id.id),('start','>=',calendar_event.start.replace(hour=0,minute=0)),('start','<=',calendar_event.start.replace(hour=23,minute=59))]
|
search_other_calendar_events = [('event_track_id.location_id','=',track.location_id.id),('start','>=',calendar_event.start.replace(hour=0,minute=0)),('start','<=',calendar_event.start.replace(hour=23,minute=59))]
|
||||||
|
|
||||||
|
#search only on other event tracks
|
||||||
if track.id or track.id.origin:
|
if track.id or track.id.origin:
|
||||||
search_other_calendar_events.append(('event_track_id','!=',track.id or track.id.origin))
|
search_other_calendar_events.append(('event_track_id','!=',track.id or track.id.origin))
|
||||||
|
|
||||||
|
#search calendar events not already founded
|
||||||
|
if already_found_other_calendar_event_ids:
|
||||||
|
search_other_calendar_events.append(('id','not in',already_found_other_calendar_event_ids))
|
||||||
|
|
||||||
other_calendar_events = self.env["calendar.event"].search(search_other_calendar_events)
|
other_calendar_events = self.env["calendar.event"].search(search_other_calendar_events)
|
||||||
|
already_found_other_calendar_event_ids.extend(other_calendar_events.ids)
|
||||||
|
|
||||||
if other_calendar_events:
|
if other_calendar_events:
|
||||||
location_already_in_use = True
|
location_already_in_use = True
|
||||||
|
1
event_track_copy/__init__.py
Normal file
1
event_track_copy/__init__.py
Normal file
@@ -0,0 +1 @@
|
|||||||
|
from . import models
|
21
event_track_copy/__manifest__.py
Normal file
21
event_track_copy/__manifest__.py
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
# Copyright 2016-2020 Akretion France (<https://www.akretion.com>)
|
||||||
|
# @author: Alexis de Lattre <alexis.delattre@akretion.com>
|
||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "Event track copy",
|
||||||
|
"version": "16.0.1.0.0",
|
||||||
|
"license": "AGPL-3",
|
||||||
|
"author": "Elabore",
|
||||||
|
"website": "https://www.elabore.coop",
|
||||||
|
"category": "",
|
||||||
|
'summary': 'Copy website event tracks when copy event',
|
||||||
|
'description': """Copy website event tracks when copy event
|
||||||
|
|
||||||
|
""",
|
||||||
|
"depends": ["website_event_track"],
|
||||||
|
"data": [
|
||||||
|
|
||||||
|
],
|
||||||
|
"installable": True,
|
||||||
|
}
|
2
event_track_copy/models/__init__.py
Normal file
2
event_track_copy/models/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
from . import event_track
|
||||||
|
from . import event_event
|
9
event_track_copy/models/event_event.py
Normal file
9
event_track_copy/models/event_event.py
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
import logging
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
class EventEvent(models.Model):
|
||||||
|
_inherit = "event.event"
|
||||||
|
|
||||||
|
track_ids = fields.One2many(copy=True) #enable copy for event tracks
|
12
event_track_copy/models/event_track.py
Normal file
12
event_track_copy/models/event_track.py
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
|
||||||
|
from odoo import fields, models, api, Command
|
||||||
|
from datetime import timedelta
|
||||||
|
import logging
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class EventTrack(models.Model):
|
||||||
|
_inherit = "event.track"
|
||||||
|
|
||||||
|
event_id = fields.Many2one(ondelete='cascade') #delete event tracks when delete event
|
Reference in New Issue
Block a user