diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..bfd7ac5 --- /dev/null +++ b/.editorconfig @@ -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 diff --git a/.eslintrc.yml b/.eslintrc.yml new file mode 100644 index 0000000..fed88d7 --- /dev/null +++ b/.eslintrc.yml @@ -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 diff --git a/.gitea/workflows/pre-commit.yml b/.gitea/workflows/pre-commit.yml new file mode 100644 index 0000000..690f8f1 --- /dev/null +++ b/.gitea/workflows/pre-commit.yml @@ -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 \ No newline at end of file diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..c7de03e --- /dev/null +++ b/.pre-commit-config.yaml @@ -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 diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000..5b6d4b3 --- /dev/null +++ b/.prettierrc.yml @@ -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" diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..652a781 --- /dev/null +++ b/.pylintrc @@ -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 diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory new file mode 100644 index 0000000..14ca356 --- /dev/null +++ b/.pylintrc-mandatory @@ -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 diff --git a/.ruff.toml b/.ruff.toml new file mode 100644 index 0000000..7507d0e --- /dev/null +++ b/.ruff.toml @@ -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 diff --git a/event_generate_quotation_from_registration/__init__.py b/event_generate_quotation_from_registration/__init__.py index 9a7e03e..0650744 100644 --- a/event_generate_quotation_from_registration/__init__.py +++ b/event_generate_quotation_from_registration/__init__.py @@ -1 +1 @@ -from . import models \ No newline at end of file +from . import models diff --git a/event_generate_quotation_from_registration/__manifest__.py b/event_generate_quotation_from_registration/__manifest__.py index dfbc36b..1ffc260 100644 --- a/event_generate_quotation_from_registration/__manifest__.py +++ b/event_generate_quotation_from_registration/__manifest__.py @@ -5,18 +5,18 @@ "version": "16.0.1.0.0", "license": "AGPL-3", "author": "Elabore", - "website": "https://www.elabore.coop", + "website": "https://github.com/elabore-coop/event-tools", "category": "", - 'summary': 'Generate quotation from event registration', - 'description': """ - Generate quotation from event registration : + "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', - ], + "data": [ + "security/ir.model.access.csv", + "views/event_registration_views.xml", + "views/sale_order_views.xml", + "views/account_move_views.xml", + ], "installable": True, } diff --git a/event_generate_quotation_from_registration/models/__init__.py b/event_generate_quotation_from_registration/models/__init__.py index f035bf8..aa40f35 100644 --- a/event_generate_quotation_from_registration/models/__init__.py +++ b/event_generate_quotation_from_registration/models/__init__.py @@ -1,4 +1,4 @@ from . import event_registration from . import event_registration_financier from . import sale_order -from . import account_move \ No newline at end of file +from . import account_move diff --git a/event_generate_quotation_from_registration/models/account_move.py b/event_generate_quotation_from_registration/models/account_move.py index 86872c6..9087736 100644 --- a/event_generate_quotation_from_registration/models/account_move.py +++ b/event_generate_quotation_from_registration/models/account_move.py @@ -1,6 +1,7 @@ -from odoo import _, api, Command, fields, models +from odoo import fields, models + class AccountMove(models.Model): _inherit = "account.move" - event_registration_id = fields.Many2one('event.registration', string="Stagiaire") \ No newline at end of file + event_registration_id = fields.Many2one("event.registration", string="Stagiaire") diff --git a/event_generate_quotation_from_registration/models/event_registration.py b/event_generate_quotation_from_registration/models/event_registration.py index ec7e575..5e31e08 100644 --- a/event_generate_quotation_from_registration/models/event_registration.py +++ b/event_generate_quotation_from_registration/models/event_registration.py @@ -1,12 +1,17 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import fields, models, api, Command import logging + +from odoo import api, fields, models + _logger = logging.getLogger(__name__) + class EventRegistration(models.Model): _inherit = "event.registration" - - financier_ids = fields.One2many('event.registration.financier', 'registration_id', string="Financements") + + financier_ids = fields.One2many( + "event.registration.financier", "registration_id", string="Financements" + ) def name_get(self): result = [] @@ -15,32 +20,35 @@ class EventRegistration(models.Model): 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})" + registration.display_name = ( + f"{registration.partner_id.name} ({registration.event_id.name})" + ) else: - registration.display_name = super(EventRegistration, registration)._compute_display_name() - - + 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) + 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'), - ]) + 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()) - \ No newline at end of file diff --git a/event_generate_quotation_from_registration/models/event_registration_financier.py b/event_generate_quotation_from_registration/models/event_registration_financier.py index 6299dae..c58445f 100644 --- a/event_generate_quotation_from_registration/models/event_registration_financier.py +++ b/event_generate_quotation_from_registration/models/event_registration_financier.py @@ -1,44 +1,52 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import fields, models, api, Command import logging +from odoo import Command, fields, models from odoo.exceptions import UserError + _logger = logging.getLogger(__name__) + class EventRegistrationFinancier(models.Model): _name = "event.registration.financier" - _rec_name = 'financier_id' + _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") + 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', + related="quotation_id.state", string="Order Status", - copy=False, store=True, precompute=True) - + 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') + 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, + "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() - })] - + return [ + Command.create( + {"price_unit": self.amount, "product_id": self.get_product_id()} + ) + ] diff --git a/event_generate_quotation_from_registration/models/sale_order.py b/event_generate_quotation_from_registration/models/sale_order.py index 6e1f807..cb09385 100644 --- a/event_generate_quotation_from_registration/models/sale_order.py +++ b/event_generate_quotation_from_registration/models/sale_order.py @@ -1,39 +1,61 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import fields, models, api, Command import logging + +from odoo import fields, models + _logger = logging.getLogger(__name__) + class SaleOrder(models.Model): _inherit = "sale.order" - event_registration_id = fields.Many2one('event.registration', string="Stagiaire") + 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() + Copy event_registration_id to generated invoice. + """ + res = super()._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() + return ( + len( + self.env["event.registration.financier"].search( + [("quotation_id", "=", self.id)] + ) + ) + > 0 + ) - #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(): + def action_confirm(self): + res = super().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): + + 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) - - \ No newline at end of file + return super()._update_registrations( + confirm, cancel_to_draft, registration_data, mark_as_paid + ) diff --git a/event_generate_quotation_from_registration/security/ir.model.access.csv b/event_generate_quotation_from_registration/security/ir.model.access.csv index 93c0a20..46787ec 100644 --- a/event_generate_quotation_from_registration/security/ir.model.access.csv +++ b/event_generate_quotation_from_registration/security/ir.model.access.csv @@ -1,2 +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 \ No newline at end of file +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 diff --git a/event_generate_quotation_from_registration/views/account_move_views.xml b/event_generate_quotation_from_registration/views/account_move_views.xml index 8365787..86208da 100644 --- a/event_generate_quotation_from_registration/views/account_move_views.xml +++ b/event_generate_quotation_from_registration/views/account_move_views.xml @@ -1,4 +1,4 @@ - + view.move.form.inherit.event.generate.quotation @@ -12,7 +12,9 @@ - view.out.invoice.tree.inherit.event.generate.quotation + view.out.invoice.tree.inherit.event.generate.quotation account.move diff --git a/event_generate_quotation_from_registration/views/event_registration_views.xml b/event_generate_quotation_from_registration/views/event_registration_views.xml index 095df3b..74d22b8 100644 --- a/event_generate_quotation_from_registration/views/event_registration_views.xml +++ b/event_generate_quotation_from_registration/views/event_registration_views.xml @@ -1,26 +1,42 @@ - - - view.event.registration.form.event.generate.quotation.from.registration - event.registration + + + view.event.registration.form.event.generate.quotation.from.registration + event.registration - - - + + + -