diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..bfd7ac53df9f103f6dc8853738c63fd364445fde --- /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 0000000000000000000000000000000000000000..d4cc423ccda9db9691205c9da83307af97b2670f --- /dev/null +++ b/.eslintrc.yml @@ -0,0 +1,187 @@ +env: + browser: true + es6: true + +# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 +parserOptions: + ecmaVersion: 2017 + +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 + +# 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/.flake8 b/.flake8 new file mode 100644 index 0000000000000000000000000000000000000000..e397e8ed4e3e7f7fe7785dd391bb80aa6d85575e --- /dev/null +++ b/.flake8 @@ -0,0 +1,12 @@ +[flake8] +max-line-length = 88 +max-complexity = 16 +# B = bugbear +# B9 = bugbear opinionated (incl line length) +select = C,E,F,W,B,B9 +# E203: whitespace before ':' (black behaviour) +# E501: flake8 line length (covered by bugbear B950) +# W503: line break before binary operator (black behaviour) +ignore = E203,E501,W503 +per-file-ignores= + __init__.py:F401 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..818770fb1bdc0a144e924c9a5940f0b035df8a0d --- /dev/null +++ b/.gitignore @@ -0,0 +1,75 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +/.venv +/.pytest_cache + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg +*.eggs + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.cache +nosetests.xml +coverage.xml + +# Translations +*.mo + +# Pycharm +.idea + +# Eclipse +.settings + +# Visual Studio cache/options directory +.vs/ +.vscode + +# OSX Files +.DS_Store + +# Django stuff: +*.log + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# Rope +.ropeproject + +# Sphinx documentation +docs/_build/ + +# Backup files +*~ +*.swp + +# OCA rules +!static/lib/ diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000000000000000000000000000000000..0ec187efd1bf802844749f508cda0c8f138970f9 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,13 @@ +[settings] +; see https://github.com/psf/black +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +combine_as_imports=True +use_parentheses=True +line_length=88 +known_odoo=odoo +known_odoo_addons=odoo.addons +sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER +default_section=THIRDPARTY +ensure_newline_before_comments = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1c6434bfc2274c73d98dbf62b6de9baccdc353ce --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,127 @@ +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/| + # 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$| + # You don't usually want a bot to modify your legal texts + (LICENSE.*|COPYING.*) +default_language_version: + python: python3 + node: "14.13.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$" + - repo: https://github.com/oca/maintainer-tools + rev: ab1d7f6 + hooks: + # update the NOT INSTALLABLE ADDONS section above + - id: oca-update-pre-commit-excluded-addons + - id: oca-fix-manifest-website + args: ["https://le-filament.com"] + - repo: https://github.com/myint/autoflake + rev: v1.4 + hooks: + - id: autoflake + args: + - --expand-star-imports + - --ignore-init-module-imports + - --in-place + - --remove-all-unused-imports + - --remove-duplicate-keys + - --remove-unused-variables + - repo: https://github.com/psf/black + rev: 20.8b1 + hooks: + - id: black + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.1.2 + hooks: + - id: prettier + name: prettier (with plugin-xml) + additional_dependencies: + - "prettier@2.1.2" + - "@prettier/plugin-xml@0.12.0" + args: + - --plugin=@prettier/plugin-xml + files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ + - repo: https://github.com/pre-commit/mirrors-eslint + rev: v7.8.1 + hooks: + - id: eslint + verbose: true + args: + - --color + - --fix + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.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/asottile/pyupgrade + rev: v2.7.2 + hooks: + - id: pyupgrade + args: ["--keep-percent-format"] + - repo: https://github.com/PyCQA/isort + rev: 5.5.1 + hooks: + - id: isort + name: isort except __init__.py + args: + - --settings=. + exclude: /__init__\.py$ + - repo: https://gitlab.com/PyCQA/flake8 + rev: 3.8.3 + hooks: + - id: flake8 + name: flake8 + additional_dependencies: ["flake8-bugbear==20.1.4"] + - repo: https://github.com/PyCQA/pylint + rev: pylint-2.5.3 + hooks: + - id: pylint + name: pylint with optional checks + args: + - --rcfile=.pylintrc + - --exit-zero + verbose: true + additional_dependencies: &pylint_deps + - pylint-odoo==3.5.0 + - id: pylint + name: pylint with mandatory checks + args: + - --rcfile=.pylintrc-mandatory + additional_dependencies: *pylint_deps diff --git a/.prettierrc.yml b/.prettierrc.yml new file mode 100644 index 0000000000000000000000000000000000000000..5b6d4b361ace92f3877993bf2848fac190d8fab6 --- /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 0000000000000000000000000000000000000000..542c686d3824ecbc48c169d1bf3b146afb2acb70 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,87 @@ +[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=Le Filament +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=13.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, + # 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, + 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 0000000000000000000000000000000000000000..74be5fff287bdab1da64e3e5a2ad43a99999e1cc --- /dev/null +++ b/.pylintrc-mandatory @@ -0,0 +1,64 @@ +[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=Le Filament +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=13.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 + +[REPORTS] +msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg} +output-format=colorized +reports=no diff --git a/README.rst b/README.rst old mode 100755 new mode 100644 index 65bb9108a9f7c2acd06dcdf5cb25928aec44716b..3a3bec346f309c5e8e5cf58df9cff948a1ca1e96 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ DIGITANIE - Projet et Feuilles de temps ======================================= - - Ajout d'un champ Rest à Faire à la table *project.task*, affiche dans les vues associées + - Ajout d'un champ Reste à Faire à la table *project.task*, affiche dans les vues associées - Ajout d'un champ Date de revue à la table *project.task*, affiche dans les vues asociées - Ajout d'un champ Type de tâche à la table *account.analytic.line*, affiche dans les vues asociées - Ajout du champ département dans les vues listes des feuilles de temps @@ -30,4 +30,3 @@ Maintainer :target: https://le-filament.com This module is maintained by Le Filament - diff --git a/__init__.py b/__init__.py old mode 100755 new mode 100644 index 89ea6b351828ea5099fe39160539e731917e5a6f..820f706b349ab54ad546151f7cbab15dcb19e1d9 --- a/__init__.py +++ b/__init__.py @@ -1,5 +1,4 @@ # Copyright 2022 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import models -from . import report \ No newline at end of file +from . import models, report diff --git a/__manifest__.py b/__manifest__.py old mode 100755 new mode 100644 index 0b6e79f295c66a7e4f2fdc118b4b6b0c86b4cdd3..b46f9d412b59b6d134a956e28c538fdb1047be35 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,15 +1,14 @@ { - 'name': "DIGITANIE - Projets et Feuilles de temps", - 'summary': """Gestion des projets et Feuilles de temps""", - 'author': "Le Filament", - 'website': "https://www.le-filament.com", - 'version': '12.0.0.1.0', - 'license': "AGPL-3", - 'depends': ['hr_timesheet', 'project_category'], - 'data': [ - 'views/hr_timesheet_views.xml', - 'views/project_task.xml', - 'report/project_report_view.xml', + "name": "DIGITANIE - Projets et Feuilles de temps", + "summary": """Gestion des projets et Feuilles de temps""", + "author": "Le Filament", + "website": "https://www.le-filament.com", + "version": "13.0.1.0.0", + "license": "AGPL-3", + "depends": ["hr_timesheet", "project_category"], + "data": [ + "views/hr_timesheet_views.xml", + "views/project_task.xml", + "report/project_report_view.xml", ], - } diff --git a/models/__init__.py b/models/__init__.py old mode 100755 new mode 100644 index 531e5e339328803375422684947106f3b902ae3c..8b661f3037e958858dfb0140d508b6dcd80831db --- a/models/__init__.py +++ b/models/__init__.py @@ -2,4 +2,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import account -from . import project_task \ No newline at end of file +from . import project_task diff --git a/models/account.py b/models/account.py index dd9cea2ad8863eaac6de4c4995a040b7e85d6a00..a1cbf94c5d17c4c36d69b4c582d29c65a948a3c9 100644 --- a/models/account.py +++ b/models/account.py @@ -1,28 +1,28 @@ # Copyright 2022 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models, api +from odoo import api, fields, models class AccountAnalyticLine(models.Model): - _inherit = 'account.analytic.line' + _inherit = "account.analytic.line" # ------------------------------------------------------ # Fields declaration # ------------------------------------------------------ task_type_id = fields.Many2one( - comodel_name='project.type', - string='Type de tâche', - domain="[('task_ok', '=', True)]" + comodel_name="project.type", + string="Type de tâche", + domain="[('task_ok', '=', True)]", ) project_type_id = fields.Many2one( - comodel_name='project.type', - string='Type de projet', - related='project_id.type_id', - store=True + comodel_name="project.type", + string="Type de projet", + related="project_id.type_id", + store=True, ) - department_id = fields.Many2one(related='employee_id.department_id') + department_id = fields.Many2one(related="employee_id.department_id") - @api.onchange('task_id') + @api.onchange("task_id") def _onchange_task_id(self): super(AccountAnalyticLine, self)._onchange_task_id() if self.task_id: diff --git a/models/project_task.py b/models/project_task.py index 0a4271daecd0d29797f7d4470d2f8de19a0c141a..36688634f662e9e9ab6f038606654608e47fbef9 100644 --- a/models/project_task.py +++ b/models/project_task.py @@ -1,21 +1,23 @@ # Copyright 2022 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import fields, models, api +from odoo import api, fields, models class ProjectTask(models.Model): - _inherit = 'project.task' + _inherit = "project.task" # ------------------------------------------------------ # Fields declaration # ------------------------------------------------------ manual_remaining_hours = fields.Float( - string="Reste à faire", track_visibility='onchange') + string="Reste à faire", tracking=True + ) review_date = fields.Date("Date replanifiée") subtask_manual_remaining_hours = fields.Float( - "Sous-Tâches", compute='_compute_subtask_manual_remaining_hours') + "Sous-Tâches", compute="_compute_subtask_manual_remaining_hours" + ) # ------------------------------------------------------ # SQL Constraints # ------------------------------------------------------ @@ -27,10 +29,13 @@ class ProjectTask(models.Model): # ------------------------------------------------------ # Computed fields / Search Fields # ------------------------------------------------------ - @api.depends('child_ids.manual_remaining_hours') + @api.depends("child_ids.manual_remaining_hours") def _compute_subtask_manual_remaining_hours(self): for task in self: - task.subtask_manual_remaining_hours = sum(task.child_ids.mapped('manual_remaining_hours')) + task.subtask_manual_remaining_hours = sum( + task.child_ids.mapped("manual_remaining_hours") + ) + # ------------------------------------------------------ # Onchange / Constraints # ------------------------------------------------------ diff --git a/report/group_report.py b/report/group_report.py index 5a61a053746f406186deba1324650f56c6c84775..5e9f5ccb73c03bc4ea7eff35a0a69e754df29b41 100644 --- a/report/group_report.py +++ b/report/group_report.py @@ -8,15 +8,23 @@ class ReportProjectTaskUser(models.Model): _inherit = "report.project.task.user" manual_remaining_hours = fields.Float("Reste à faire", readonly=True) - task_type_id = fields.Many2one('project.type', string="Type de tâche", readonly=True) + task_type_id = fields.Many2one( + "project.type", string="Type de tâche", readonly=True + ) def _select(self): - return super(ReportProjectTaskUser, self)._select() + """, - t.type_id as task_type_id, + return ( + super(ReportProjectTaskUser, self)._select() + + """, + t.type_id as task_type_id, manual_remaining_hours as manual_remaining_hours""" + ) def _group_by(self): - return super(ReportProjectTaskUser, self)._group_by() + """, + return ( + super(ReportProjectTaskUser, self)._group_by() + + """, t.type_id, manual_remaining_hours """ + ) diff --git a/report/project_report_view.xml b/report/project_report_view.xml index 5268b7457a40ea7e9d4be8b986ed0e4d687e1a7c..0480e06101cdb31af8787d900d919b918e6c150e 100644 --- a/report/project_report_view.xml +++ b/report/project_report_view.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <data> @@ -8,7 +8,7 @@ <field name="inherit_id" ref="project.view_task_project_user_graph" /> <field name="arch" type="xml"> <field name="project_id" position="after"> - <field name="manual_remaining_hours" type="measure"/> + <field name="manual_remaining_hours" type="measure" /> </field> </field> </record> @@ -16,13 +16,17 @@ <record id="view_task_project_user_search" model="ir.ui.view"> <field name="name">report.project.task.user.search</field> <field name="model">report.project.task.user</field> - <field name="inherit_id" ref="project.view_task_project_user_search"/> + <field name="inherit_id" ref="project.view_task_project_user_search" /> <field name="arch" type="xml"> <filter name="project" position="after"> - <filter string="Type tâche" name="task_type" context="{'group_by':'task_type_id'}"/> + <filter + string="Type tâche" + name="task_type" + context="{'group_by':'task_type_id'}" + /> </filter> </field> </record> </data> -</odoo> \ No newline at end of file +</odoo> diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv deleted file mode 100755 index 58262d4440d02ecccad693faa23505f01ced8a9f..0000000000000000000000000000000000000000 --- a/security/ir.model.access.csv +++ /dev/null @@ -1 +0,0 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink \ No newline at end of file diff --git a/views/hr_timesheet_views.xml b/views/hr_timesheet_views.xml old mode 100755 new mode 100644 index a97d87efb0c7fb8a65860e91067f38eee2a73760..bdc0dd2ba51e97a76150793f268ebe8cb582eda3 --- a/views/hr_timesheet_views.xml +++ b/views/hr_timesheet_views.xml @@ -1,14 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <data> <record id="hr_timesheet_line_tree" model="ir.ui.view"> - <field name="name">dig.expense.account.analytic.line.tree.hr_timesheet</field> + <field + name="name" + >dig.expense.account.analytic.line.tree.hr_timesheet</field> <field name="model">account.analytic.line</field> - <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/> + <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" /> <field name="arch" type="xml"> <field name="unit_amount" position="before"> - <field name="task_type_id"/> + <field name="task_type_id" /> </field> </field> @@ -17,10 +19,10 @@ <record id="timesheet_view_tree_user" model="ir.ui.view"> <field name="name">account.analytic.line.view.tree.with.user.dig</field> <field name="model">account.analytic.line</field> - <field name="inherit_id" ref="hr_timesheet.timesheet_view_tree_user"/> + <field name="inherit_id" ref="hr_timesheet.timesheet_view_tree_user" /> <field name="arch" type="xml"> <xpath expr="//field[@name='employee_id']" position="after"> - <field name="department_id" options='{"no_open": True}'/> + <field name="department_id" options='{"no_open": True}' /> </xpath> </field> </record> @@ -28,12 +30,12 @@ <record id="timesheet_view_form_user" model="ir.ui.view"> <field name="name">account.analytic.line.tree.with.user.dig</field> <field name="model">account.analytic.line</field> - <field name="inherit_id" ref="hr_timesheet.timesheet_view_form_user"/> + <field name="inherit_id" ref="hr_timesheet.timesheet_view_form_user" /> <field name="arch" type="xml"> <xpath expr="//field[@name='employee_id']" position="after"> - <field name="department_id" options='{"no_open": True}'/> - <field name="project_type_id"/> - <field name="task_type_id"/> + <field name="department_id" options='{"no_open": True}' /> + <field name="project_type_id" /> + <field name="task_type_id" /> </xpath> </field> </record> @@ -41,20 +43,35 @@ <record id="hr_timesheet_line_search" model="ir.ui.view"> <field name="name">account.analytic.line.search</field> <field name="model">account.analytic.line</field> - <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/> + <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search" /> <field name="arch" type="xml"> <field name="employee_id" position="after"> - <field name="department_id"/> - <field name="project_type_id"/> - <field name="task_type_id"/> + <field name="department_id" /> + <field name="project_type_id" /> + <field name="task_type_id" /> </field> <filter name="groupby_employee" position="after"> - <filter string="Département" name="groupby_department" domain="[]" context="{'group_by':'department_id'}"/> - <filter string="Type Projet" name="groupby_project_type" domain="[]" context="{'group_by':'project_type_id'}"/> - <filter string="Type Tâche" name="groupby_task_type" domain="[]" context="{'group_by':'task_type_id'}"/> + <filter + string="Département" + name="groupby_department" + domain="[]" + context="{'group_by':'department_id'}" + /> + <filter + string="Type Projet" + name="groupby_project_type" + domain="[]" + context="{'group_by':'project_type_id'}" + /> + <filter + string="Type Tâche" + name="groupby_task_type" + domain="[]" + context="{'group_by':'task_type_id'}" + /> </filter> </field> </record> </data> -</odoo> \ No newline at end of file +</odoo> diff --git a/views/project_task.xml b/views/project_task.xml index 9261b9396d957426d8d7db345fbfe47b5ae39b09..fd2f6e5f7c59ef56681cdda65dd60fc685eda5d8 100644 --- a/views/project_task.xml +++ b/views/project_task.xml @@ -1,17 +1,17 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> <data> <record model="ir.ui.view" id="view_task_form2_inherited"> <field name="name">project.task.form.inherited.dig</field> <field name="model">project.task</field> - <field name="inherit_id" ref="project.view_task_form2"/> + <field name="inherit_id" ref="project.view_task_form2" /> <field name="arch" type="xml"> <xpath expr="//field[@name='planned_hours']" position="after"> - <field name="manual_remaining_hours" widget="float_time"/> + <field name="manual_remaining_hours" widget="float_time" /> </xpath> <xpath expr="//field[@name='date_deadline']" position="after"> - <field name="review_date"/> + <field name="review_date" /> </xpath> </field> </record> @@ -22,10 +22,15 @@ <field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" /> <field name="arch" type="xml"> <xpath expr="//field[@name='timesheet_ids']" position="attributes"> - <attribute name="context">{'default_project_id': project_id, 'default_task_type_id': type_id, 'default_name':''}</attribute> + <attribute + name="context" + >{'default_project_id': project_id, 'default_task_type_id': type_id, 'default_name':''}</attribute> </xpath> - <xpath expr="//field[@name='timesheet_ids']//tree//field[@name='project_id']" position="before"> - <field name="task_type_id"/> + <xpath + expr="//field[@name='timesheet_ids']//tree//field[@name='project_id']" + position="before" + > + <field name="task_type_id" /> </xpath> </field> </record> @@ -33,14 +38,14 @@ <record id="view_task_tree2" model="ir.ui.view"> <field name="name">project.task.inherit.tree</field> <field name="model">project.task</field> - <field name="inherit_id" ref="project.view_task_tree2"/> + <field name="inherit_id" ref="project.view_task_tree2" /> <field name="arch" type="xml"> <xpath expr="//field[@name='remaining_hours']" position="after"> - <field name="manual_remaining_hours" widget="float_time"/> - <field name="review_date"/> + <field name="manual_remaining_hours" widget="float_time" /> + <field name="review_date" /> </xpath> </field> </record> </data> -</odoo> \ No newline at end of file +</odoo>