Skip to content

Commit

Permalink
Merge pull request #12 from OCA/14.0
Browse files Browse the repository at this point in the history
Fork Sync Branch 14.0
  • Loading branch information
sireko authored Nov 2, 2023
2 parents 9198916 + cb518d5 commit f8f3075
Show file tree
Hide file tree
Showing 43 changed files with 272 additions and 289 deletions.
6 changes: 2 additions & 4 deletions .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2
_commit: v1.17.2
_src_path: gh:oca/oca-addons-repo-template
ci: GitHub
dependency_installation_mode: PIP
generate_requirements_txt: true
github_check_license: true
github_ci_extra_env: {}
Expand All @@ -11,6 +10,7 @@ github_enable_makepot: true
github_enable_stale_action: true
github_enforce_dev_status_compatibility: true
include_wkhtmltopdf: false
odoo_test_flavor: Both
odoo_version: 14.0
org_name: Odoo Community Association (OCA)
org_slug: OCA
Expand All @@ -22,6 +22,4 @@ repo_description: "This project aims to deal with modules related to the webclie
repo_name: Web addons for Odoo
repo_slug: web
repo_website: https://github.com/OCA/web
travis_apt_packages: []
travis_apt_sources: []

1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ globals:
odoo: readonly
openerp: readonly
owl: readonly
luxon: readonly

# Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v4
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand All @@ -27,6 +27,15 @@ jobs:
run: pip install pre-commit
- name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git
run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)"
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/stale.yml.rej

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: Detect unreleased dependencies
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- run: |
for reqfile in requirements.txt test-requirements.txt ; do
if [ -f ${reqfile} ] ; then
Expand All @@ -37,18 +37,18 @@ jobs:
include:
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
include: "web_widget_model_viewer"
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
include: "web_widget_model_viewer"
name: test with OCB
makepot: "true"
- container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest
exclude: "web_widget_model_viewer"
makepot: "true"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest
exclude: "web_widget_model_viewer"
name: test with OCB
makepot: "true"
services:
postgres:
image: postgres:9.6
Expand All @@ -62,7 +62,7 @@ jobs:
INCLUDE: "${{ matrix.include }}"
EXCLUDE: "${{ matrix.exclude }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Install addons and dependencies
Expand Down
16 changes: 15 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ exclude: |
/static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*)
default_language_version:
Expand All @@ -33,12 +35,24 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
rev: ab1d7f6
rev: 969238e47c07d0c40573acff81d170f63245d738
hooks:
# update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website
args: ["https://github.com/OCA/web"]
- id: oca-gen-addon-readme
args:
- --addons-dir=.
- --branch=14.0
- --org-name=OCA
- --repo-name=web
- --if-source-changed
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks:
- id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,41 +26,41 @@ Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[support_branding](support_branding/) | 14.0.1.0.1 | | Adds your branding to an Odoo instance
[support_branding](support_branding/) | 14.0.1.1.0 | | Adds your branding to an Odoo instance
[web_access_rule_buttons](web_access_rule_buttons/) | 14.0.1.0.1 | | Disable Edit button if access rules prevent this action
[web_action_conditionable](web_action_conditionable/) | 14.0.1.0.1 | | web_action_conditionable
[web_advanced_search](web_advanced_search/) | 14.0.1.0.1 | | Easier and more powerful searching tools
[web_calendar_color_field](web_calendar_color_field/) | 14.0.1.0.0 | | Calendar Color Field
[web_calendar_slot_duration](web_calendar_slot_duration/) | 14.0.1.0.0 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) | Customizable calendar slot durations
[web_company_color](web_company_color/) | 14.0.2.0.0 | | Web Company Color
[web_copy_confirm](web_copy_confirm/) | 14.0.1.0.0 | | Show confirmation dialogue before copying records
[web_create_write_confirm](web_create_write_confirm/) | 14.0.1.1.0 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Confirm/Alert pop-up before saving
[web_create_write_confirm](web_create_write_confirm/) | 14.0.1.2.0 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Confirm/Alert pop-up before saving
[web_decimal_numpad_dot](web_decimal_numpad_dot/) | 14.0.1.0.0 | | Allows using numpad dot to enter period decimal separator
[web_dialog_size](web_dialog_size/) | 14.0.1.0.0 | | A module that lets the user expand a dialog box to the full screen width.
[web_disable_export_group](web_disable_export_group/) | 14.0.2.0.0 | | Web Disable Export Group
[web_domain_field](web_domain_field/) | 14.0.1.0.2 | | Use computed field as domain
[web_drop_target](web_drop_target/) | 14.0.1.1.1 | | Allows to drag files into Odoo
[web_edit_user_filter](web_edit_user_filter/) | 14.0.1.0.1 | | Edit User Filters
[web_environment_ribbon](web_environment_ribbon/) | 14.0.1.0.0 | | Web Environment Ribbon
[web_field_required_invisible_manager](web_field_required_invisible_manager/) | 14.0.2.1.3 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Web Field Required Invisible Readonly Managerr
[web_field_required_invisible_manager](web_field_required_invisible_manager/) | 14.0.2.2.0 | [![ilyasProgrammer](https://github.com/ilyasProgrammer.png?size=30px)](https://github.com/ilyasProgrammer) | Web Field Required Invisible Readonly Managerr
[web_group_expand](web_group_expand/) | 14.0.1.0.0 | | Group Expand Buttons
[web_ir_actions_act_multi](web_ir_actions_act_multi/) | 14.0.1.0.1 | | Enables triggering of more than one action on ActionManager
[web_ir_actions_act_view_reload](web_ir_actions_act_view_reload/) | 14.0.1.0.2 | | Enables reload of the current view via ActionManager
[web_ir_actions_act_window_message](web_ir_actions_act_window_message/) | 14.0.1.0.1 | | Show a message box to users
[web_listview_range_select](web_listview_range_select/) | 14.0.1.0.0 | | Enables selecting a range of records using the shift key
[web_m2x_options](web_m2x_options/) | 14.0.1.1.1 | | web_m2x_options
[web_m2x_options_manager](web_m2x_options_manager/) | 14.0.1.1.0 | | Adds an interface to manage the "Create" and "Create and Edit" options for specific models and fields.
[web_no_bubble](web_no_bubble/) | 14.0.1.0.0 | | Remove the bubbles from the web interface
[web_m2x_options_manager](web_m2x_options_manager/) | 14.0.1.2.0 | | Adds an interface to manage the "Create" and "Create and Edit" options for specific models and fields.
[web_no_bubble](web_no_bubble/) | 14.0.1.1.0 | | Remove the bubbles from the web interface
[web_notify](web_notify/) | 14.0.1.0.1 | | Send notification messages to user
[web_notify_channel_message](web_notify_channel_message/) | 14.0.1.0.0 | | Send an instant notification to channel users when a new message is posted
[web_pwa_oca](web_pwa_oca/) | 14.0.1.0.0 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) | Make Odoo a PWA
[web_pwa_oca](web_pwa_oca/) | 14.0.1.1.0 | [![eLBati](https://github.com/eLBati.png?size=30px)](https://github.com/eLBati) | Make Odoo a PWA
[web_refresher](web_refresher/) | 14.0.2.0.0 | | Web Refresher
[web_remember_tree_column_width](web_remember_tree_column_width/) | 14.0.1.0.0 | [![frahikLV](https://github.com/frahikLV.png?size=30px)](https://github.com/frahikLV) [![luisg123v](https://github.com/luisg123v.png?size=30px)](https://github.com/luisg123v) | Remember the tree columns' widths across sessions.
[web_responsive](web_responsive/) | 14.0.1.2.2 | [![Yajo](https://github.com/Yajo.png?size=30px)](https://github.com/Yajo) [![Tardo](https://github.com/Tardo.png?size=30px)](https://github.com/Tardo) | Responsive web client, community-supported
[web_search_with_and](web_search_with_and/) | 14.0.1.0.1 | | Use AND conditions on omnibar search
[web_send_message_popup](web_send_message_popup/) | 14.0.1.0.0 | | Web Send Message as Popup
[web_sheet_full_width](web_sheet_full_width/) | 14.0.1.0.1 | | Use the whole available screen width when displaying sheets
[web_switch_context_warning](web_switch_context_warning/) | 14.0.1.0.0 | | Show a warning if current user, company or database have been switched in another tab or window.
[web_switch_context_warning](web_switch_context_warning/) | 14.0.1.1.0 | | Show a warning if current user, company or database have been switched in another tab or window.
[web_timeline](web_timeline/) | 14.0.2.0.2 | [![tarteo](https://github.com/tarteo.png?size=30px)](https://github.com/tarteo) | Interactive visualization chart to show events in time
[web_tree_dynamic_colored_field](web_tree_dynamic_colored_field/) | 14.0.1.0.0 | | Allows you to dynamically color fields on tree views
[web_tree_image_tooltip](web_tree_image_tooltip/) | 14.0.1.0.0 | | Show images in tree views via tooltip
Expand Down
2 changes: 1 addition & 1 deletion support_branding/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Support Branding
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:d1dcdd3f58c7e86333a318988a39d7f43236e188d4246adc81561c66c774a110
!! source digest: sha256:38fdbf8b1f51debe98858267216174f89f927bbf1da5c8c256d99ea4b8d4f1ba
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion support_branding/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name": "Support Branding",
"summary": "Adds your branding to an Odoo instance",
"category": "Hidden/Tools",
"version": "14.0.1.0.1",
"version": "14.0.1.1.0",
"license": "AGPL-3",
"author": "Therp BV,Sunflower IT,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/web",
Expand Down
42 changes: 20 additions & 22 deletions support_branding/demo/ir_config_parameter_data.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<data noupdate="0">
<record id="demo_config_parameter_company_name" model="ir.config_parameter">
<field name="key">support_company</field>
<field name="value">Odoo Community Association</field>
</record>
<record id="demo_config_parameter_company_url" model="ir.config_parameter">
<field name="key">support_company_url</field>
<field name="value">https://odoo-community.org</field>
</record>
<record id="demo_config_parameter_company_color" model="ir.config_parameter">
<field name="key">support_branding_color</field>
<field name="value">#fff</field>
</record>
<record id="demo_config_parameter_support_email" model="ir.config_parameter">
<field name="key">support_email</field>
<field name="value">[email protected]</field>
</record>
<record id="demo_config_parameter_release" model="ir.config_parameter">
<field name="key">support_release</field>
<field name="value">14.0</field>
</record>
</data>
<record id="demo_config_parameter_company_name" model="ir.config_parameter">
<field name="key">support_company</field>
<field name="value">Odoo Community Association</field>
</record>
<record id="demo_config_parameter_company_url" model="ir.config_parameter">
<field name="key">support_company_url</field>
<field name="value">https://odoo-community.org</field>
</record>
<record id="demo_config_parameter_company_color" model="ir.config_parameter">
<field name="key">support_branding_color</field>
<field name="value">#fff</field>
</record>
<record id="demo_config_parameter_support_email" model="ir.config_parameter">
<field name="key">support_email</field>
<field name="value">[email protected]</field>
</record>
<record id="demo_config_parameter_release" model="ir.config_parameter">
<field name="key">support_release</field>
<field name="value">14.0</field>
</record>
</odoo>
2 changes: 1 addition & 1 deletion support_branding/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Support Branding</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:d1dcdd3f58c7e86333a318988a39d7f43236e188d4246adc81561c66c774a110
!! source digest: sha256:38fdbf8b1f51debe98858267216174f89f927bbf1da5c8c256d99ea4b8d4f1ba
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/14.0/support_branding"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-14-0/web-14-0-support_branding"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>If you run an Odoo support company and you support customers without an OPW,
Expand Down
2 changes: 1 addition & 1 deletion web_create_write_confirm/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Confirm/Alert pop-up before saving
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:9a2b87a13801cefbe6e4daaeda2556665241e46995fa392222f939ea05134cb7
!! source digest: sha256:8b3ce800ac38d54deefd0aec66b698d2cd9b8ea75b5b1b9731ebf9c784c9d09f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion web_create_write_confirm/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Confirm/Alert pop-up before saving",
"version": "14.0.1.1.0",
"version": "14.0.1.2.0",
"depends": ["web"],
"author": "Smile, Odoo Community Association (OCA)",
"maintainers": ["ilyasProgrammer"],
Expand Down
1 change: 0 additions & 1 deletion web_create_write_confirm/i18n/web_create_write_confirm.pot
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ msgstr ""

#. module: web_create_write_confirm
#: model_terms:ir.ui.view,arch_db:web_create_write_confirm.view_popup_message_form
#: model_terms:ir.ui.view,arch_db:web_create_write_confirm.view_popup_message_tree
msgid "Popup Message"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion web_create_write_confirm/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Confirm/Alert pop-up before saving</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:9a2b87a13801cefbe6e4daaeda2556665241e46995fa392222f939ea05134cb7
!! source digest: sha256:8b3ce800ac38d54deefd0aec66b698d2cd9b8ea75b5b1b9731ebf9c784c9d09f
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/web/tree/14.0/web_create_write_confirm"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/web-14-0/web-14-0-web_create_write_confirm"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/web&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module provides feature to create custom confirmation or alert dialog when user creates or writes record.
Expand Down
18 changes: 8 additions & 10 deletions web_create_write_confirm/views/assets.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>

<template id="assets_backend_extension" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script
type="text/javascript"
src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js"
/>
</xpath>
</template>
<template id="assets_backend_extension" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script
type="text/javascript"
src="/web_create_write_confirm/static/src/js/pop_up_confirmation.js"
/>
</xpath>
</template>

</data>
</odoo>
Loading

0 comments on commit f8f3075

Please sign in to comment.