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..fed88d70d23ecb3297ea28854b320c4d62ee3c26 --- /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/.gitignore b/.gitignore old mode 100755 new mode 100644 index 75bb2042901930f807a588241612a29dd75e34d5..d99361a24aa02c2d19d8165c3a057b84bc575166 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,76 @@ -.* -*.pyc -!.gitignore +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +/.venv +/.pytest_cache +/.ruff_cache + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +bin/ +build/ +develop-eggs/ +dist/ +eggs/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg +*.eggs +.copier-answers.yml + +# 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/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..3efb4d9157dc36d84e372eec5fc21e7f4a417a58 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,117 @@ +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$| + # Don't bother non-technical authors with formatting issues in docs + readme/.*\.(rst|md)$| + # Ignore build and dist directories in addons + /build/|/dist/| + # 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: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60 + 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"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=16.0 + - --org-name=lefilament + - --repo-name=template_module + - --if-source-changed + - --keep-source-digest + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.7.1 + hooks: + - id: prettier + name: prettier (with plugin-xml) + additional_dependencies: + - "prettier@2.7.1" + - "@prettier/plugin-xml@2.2.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: v8.24.0 + hooks: + - id: eslint + verbose: true + args: + - --color + - --fix + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.3.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/astral-sh/ruff-pre-commit + rev: v0.1.3 + hooks: + - id: ruff + args: [--fix, --exit-non-zero-on-fix] + - id: ruff-format + - repo: https://github.com/OCA/pylint-odoo + rev: v8.0.19 + 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/.pylintrc b/.pylintrc new file mode 100644 index 0000000000000000000000000000000000000000..71c476d4f10ac08a7333729b93705c9573d240d5 --- /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=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=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 0000000000000000000000000000000000000000..99064933ef82c469ba5fda5b2904447c05c99dbe --- /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=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=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 0000000000000000000000000000000000000000..0240c75f6a4ae4550f3473ad0a5faaef022bf6c7 --- /dev/null +++ b/.ruff.toml @@ -0,0 +1,30 @@ + +target-version = "py310" +fix = true + +[lint] +extend-select = [ + "B", + "C90", + "E501", # line too long (default 88) + "I", # isort + "UP", # pyupgrade +] +exclude = ["setup/*"] + +[format] +exclude = ["setup/*"] + +[per-file-ignores] +"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py +"__manifest__.py" = ["B018"] # useless expression + +[isort] +section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"] + +[isort.sections] +"odoo" = ["odoo"] +"odoo-addons" = ["odoo.addons"] + +[mccabe] +max-complexity = 16 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.rst b/README.rst old mode 100755 new mode 100644 index 78db0d99949044c9662157d0ccdcc75409513847..1171db0364f66e4b49818f2c3f4b39a4c19e1ba5 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ Description =========== -Ce module hérite du module **website** et ajoute les fonctionnalités suivantes pour 3A Dentaire : +Ce module hérite du module **website** et ajoute les fonctionnalités suivantes pour 3A Dentaire : * modification du header (css) * ajout d'une image configurables par site web dans le header @@ -34,4 +34,4 @@ Maintainer :alt: Le Filament :target: https://le-filament.com -This module is maintained by Le Filament \ No newline at end of file +This module is maintained by Le Filament diff --git a/__init__.py b/__init__.py old mode 100755 new mode 100644 index cde864bae21a11c0e4f50067aa46b4c497549b4c..0650744f6bc69b9f0b865e8c7174c813a5f5995e --- a/__init__.py +++ b/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/__manifest__.py b/__manifest__.py old mode 100755 new mode 100644 index 3ba3a71c8f3628048ffe2b6a63e748b3e46c07c9..a91cb40a8ddfa5cae6f2fd41dd7c6e4d42104b3b --- a/__manifest__.py +++ b/__manifest__.py @@ -1,28 +1,24 @@ -# -*- coding: utf-8 -*- - -# © 2017 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - { - 'name': '3A Dentaire - Website', - 'summary': "Adpatation layout 3A Dentaire", - 'version': '12.3.1.0', - 'license': 'AGPL-3', - 'author': 'LE FILAMENT', - 'category': 'Theme', - 'depends': [ - 'portal', - 'website', - 'website_sale', - 'website_sale_stock_available_display', + "name": "3A Dentaire - Website", + "summary": "Adpatation layout 3A Dentaire", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "Le Filament", + "category": "Theme", + "depends": [ + "website_sale", ], - 'contributors': [ - 'Benjamin Rivier <benjamin@le-filament.com>', + "contributors": [ + "Benjamin Rivier <benjamin@le-filament.com>", ], - 'website': 'http://www.le-filament.com', - 'data': [ - 'template/layout_template.xml', - 'template/stock_availability_template.xml', - 'views/res_config.xml', + "website": "https://le-filament.com", + "data": [ + "template/layout_template.xml", + "views/res_config.xml", ], -} \ No newline at end of file + "assets": { + "web.assets_frontend": [ + "3adentaire_website/static/src/css/3adentaire_frontend.css", + ], + }, +} diff --git a/models/__init__.py b/models/__init__.py old mode 100755 new mode 100644 index cde94f13449a9d27c6d1ca4fd00c711aad97f716..2f620100eb72273cf6c788f9ea3f8230f7eaaf04 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,4 +1,2 @@ -# -*- coding: utf-8 -*- - from . import website from . import res_config diff --git a/models/res_config.py b/models/res_config.py old mode 100755 new mode 100644 index e0f93d7a06f9fa756e04761ce97661326b1cf7be..ae3202b900359dd60f5aaeae684dcd767ba3cacd --- a/models/res_config.py +++ b/models/res_config.py @@ -1,14 +1,9 @@ -# -*- coding: utf-8 -*- - -# © 2019 Le Filament (http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - +# Copyright 2019- Le Filament (https://le-filament.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from odoo import fields, models class DentaireWebsiteConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' + _inherit = "res.config.settings" - header_image = fields.Binary( - related='website_id.header_image', - readonly=False) + header_image = fields.Binary(related="website_id.header_image", readonly=False) diff --git a/models/website.py b/models/website.py old mode 100755 new mode 100644 index ab3d93f2e4e1f4e53a3fa174ffbba3fabc63a353..c558a7b875220664b39359681d76648f28ac587f --- a/models/website.py +++ b/models/website.py @@ -1,14 +1,12 @@ -# -*- coding: utf-8 -*- - -# © 2019 Le Filament (<http://www.le-filament.com>) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - +# Copyright 2019- Le Filament (https://le-filament.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) from odoo import fields, models class DentaireWebsite(models.Model): - _inherit = 'website' + _inherit = "website" header_image = fields.Binary( - string='Image Menu (après logo)', - help="Cette image sera placée à droite du logo dans le menu") + string="Image Menu (après logo)", + help="Cette image sera placée à droite du logo dans le menu", + ) diff --git a/static/description/icon.png b/static/description/icon.png old mode 100755 new mode 100644 diff --git a/static/src/css/3adentaire_frontend.css b/static/src/css/3adentaire_frontend.css old mode 100755 new mode 100644 index 09afebe310159c189ac7cdaa192b355f8a166662..df6cb0141e38d08c743b738264184256c58ef1b1 --- a/static/src/css/3adentaire_frontend.css +++ b/static/src/css/3adentaire_frontend.css @@ -1,4 +1,3 @@ - /****************************** /** HEADER /******************************/ @@ -34,7 +33,7 @@ header .navbar-brand.logo img { *************************************/ #footer { border-top: 1px solid #f3f3f3 !important; - background-color: #fff; + background-color: #fff; } /************************************ /** COMMONS diff --git a/template/layout_template.xml b/template/layout_template.xml old mode 100755 new mode 100644 index 80f78893fe64874793bcf295d07f3a7caa942c39..eb207a3bb22762307189cd90dba29c18aeea99e8 --- a/template/layout_template.xml +++ b/template/layout_template.xml @@ -1,16 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> - - <!-- CSS loading --> - <template id="assets_frontend" inherit_id="website.assets_frontend" name="Account Manager"> - <xpath expr="." position="inside"> - <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700" rel="stylesheet" /> - <link rel='stylesheet' href='/3adentaire_website/static/src/css/3adentaire_frontend.css'/> - </xpath> - </template> +<!-- Copyright 2019- Le Filament (https://le-filament.com) + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <!-- Navbar --> - <template id="assets_frontend_3a" inherit_id="portal.frontend_layout" name="Main Frontend Layout 3A Dentaire"> + <template + id="assets_frontend_3a" + inherit_id="portal.frontend_layout" + name="Main Frontend Layout 3A Dentaire" + > <xpath expr="//header/nav" position="attributes"> <attribute name="class">navbar navbar-expand-md</attribute> </xpath> @@ -22,7 +20,11 @@ <xpath expr="//a[hasclass('logo')]" position="after"> <t t-if="website.header_image"> <a href="/" class="navbar-brand logo"> - <img t-attf-src="data:image/*;base64,{{website.header_image}}" t-att-alt="'Logo of %s' % res_company.name" t-att-title="res_company.name" /> + <img + t-attf-src="data:image/*;base64,{{website.header_image}}" + t-att-alt="'Logo of %s' % res_company.name" + t-att-title="res_company.name" + /> </a> </t> </xpath> diff --git a/template/stock_availability_template.xml b/template/stock_availability_template.xml deleted file mode 100755 index 5aa170aaeef46a50f96bc5ab2fa6c77e6cf08d30..0000000000000000000000000000000000000000 --- a/template/stock_availability_template.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<odoo> - <!-- Inherit parent --> - <template id="stock_available_display_3a" inherit_id="website_sale_stock_available_display.stock_info" name="3A Cart stock infos"> - <xpath expr="//div" position="replace"> - <t t-if="virtual_available > 0"> - <div t-attf-class="availability_messages text-#{virtual_available and 'success' or 'danger'}"> - <span><t t-esc="virtual_available"/> <t t-esc="line.product_uom.name"/> in stock</span> - </div> - </t> - <t t-else=""> - <div class="text-success"> - Disponible fournisseur - </div> - </t> - </xpath> - </template> -</odoo> diff --git a/views/res_config.xml b/views/res_config.xml old mode 100755 new mode 100644 index a09a940f8c322af96a34e91b2304e4f4b29b86a4..d6fc3f46f4af15ccf413a2a72142938948b85b20 --- a/views/res_config.xml +++ b/views/res_config.xml @@ -1,18 +1,31 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <odoo> +<!-- Copyright 2019- Le Filament (https://le-filament.com) + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <record id="3a_view_website_config_settings" model="ir.ui.view"> <field name="name">Website settings 3a</field> <field name="model">res.config.settings</field> - <field name="inherit_id" ref="website.res_config_settings_view_form"/> + <field name="inherit_id" ref="website.res_config_settings_view_form" /> <field name="arch" type="xml"> - <xpath expr="//div[@id='domain_setting']/div/div[hasclass('content-group')]" position="inside"> - <div class="row"> - <label class="col-lg-3 o_light_label" for="header_image" /> - <field name="header_image" widget="image" class="w-25 mt-2"/> + <xpath + expr="//div[@id='website_info_settings']/div/div/div[hasclass('content-group')]" + position="inside" + > + <div class="row mt8"> + <label + class="col-lg-3" + string="Header Image" + for="header_image" + /> + <field + name="header_image" + widget="image" + class="w-25 mt-2" + /> </div> </xpath> </field> </record> -</odoo> \ No newline at end of file +</odoo>