diff --git a/.copier-answers.yml b/.copier-answers.yml index 1cf220aba..0fb90a4c7 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -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: {} @@ -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 @@ -19,6 +19,4 @@ repo_description: Odoo Warehouse Management Addons repo_name: Stock Logistics Warehouse modules repo_slug: stock-logistics-warehouse repo_website: https://github.com/OCA/stock-logistics-warehouse -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc688..fed88d70d 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -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 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 755f8a225..602ecbca2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,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)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 215b84b0f..326c12556 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -50,7 +50,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 77c2cb28d..f338525c8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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: @@ -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/stock-logistics-warehouse"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=14.0 + - --org-name=OCA + - --repo-name=stock-logistics-warehouse + - --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: diff --git a/account_move_line_stock_info/migrations/14.0.2.1.0/pre-migration.py b/account_move_line_stock_info/migrations/14.0.2.1.0/pre-migration.py index 1bf0863a7..8bfaa3af0 100644 --- a/account_move_line_stock_info/migrations/14.0.2.1.0/pre-migration.py +++ b/account_move_line_stock_info/migrations/14.0.2.1.0/pre-migration.py @@ -4,6 +4,7 @@ import logging from odoo import SUPERUSER_ID, api +# pylint: disable=W7950 from odoo.addons.account_move_line_stock_info.hooks import post_init_hook _logger = logging.getLogger(__name__) diff --git a/product_route_profile/i18n/product_route_profile.pot b/product_route_profile/i18n/product_route_profile.pot index 5e216b397..60b1007f4 100644 --- a/product_route_profile/i18n/product_route_profile.pot +++ b/product_route_profile/i18n/product_route_profile.pot @@ -107,7 +107,6 @@ msgstr "" #: model:ir.actions.act_window,name:product_route_profile.action_route_profile_form #: model:ir.ui.menu,name:product_route_profile.menu_route_profile_config #: model_terms:ir.ui.view,arch_db:product_route_profile.route_profile_form -#: model_terms:ir.ui.view,arch_db:product_route_profile.route_profile_tree msgid "Routes Profiles" msgstr "" diff --git a/product_route_profile/views/route_profile.xml b/product_route_profile/views/route_profile.xml index dacb8b440..d0f4e4164 100644 --- a/product_route_profile/views/route_profile.xml +++ b/product_route_profile/views/route_profile.xml @@ -7,7 +7,7 @@ route.profile.tree route.profile - + diff --git a/scrap_reason_code/i18n/scrap_reason_code.pot b/scrap_reason_code/i18n/scrap_reason_code.pot index fce9197be..a31a905ce 100644 --- a/scrap_reason_code/i18n/scrap_reason_code.pot +++ b/scrap_reason_code/i18n/scrap_reason_code.pot @@ -89,11 +89,6 @@ msgstr "" msgid "Reason Code" msgstr "" -#. module: scrap_reason_code -#: model_terms:ir.ui.view,arch_db:scrap_reason_code.view_scrap_reason_code_list -msgid "Reason Codes" -msgstr "" - #. module: scrap_reason_code #: model:ir.model.fields,field_description:scrap_reason_code.field_stock_move__reason_code_id msgid "Reason code" diff --git a/scrap_reason_code/views/reason_code_view.xml b/scrap_reason_code/views/reason_code_view.xml index d017ac171..acd011acd 100644 --- a/scrap_reason_code/views/reason_code_view.xml +++ b/scrap_reason_code/views/reason_code_view.xml @@ -31,7 +31,7 @@ scrap.reason.code.list scrap.reason.code - + diff --git a/stock_cycle_count/i18n/stock_cycle_count.pot b/stock_cycle_count/i18n/stock_cycle_count.pot index 431768fe7..7e550bfa9 100644 --- a/stock_cycle_count/i18n/stock_cycle_count.pot +++ b/stock_cycle_count/i18n/stock_cycle_count.pot @@ -418,7 +418,6 @@ msgstr "" #. module: stock_cycle_count #: model:ir.model.fields,help:stock_cycle_count.field_stock_cycle_count__message_has_error -#: model:ir.model.fields,help:stock_cycle_count.field_stock_cycle_count__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -645,11 +644,6 @@ msgstr "" msgid "Rule Description" msgstr "" -#. module: stock_cycle_count -#: model:ir.model.fields,field_description:stock_cycle_count.field_stock_cycle_count__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: stock_cycle_count #: code:addons/stock_cycle_count/models/stock_cycle_count_rule.py:0 #, python-format @@ -705,8 +699,6 @@ msgstr "" #. module: stock_cycle_count #: model:ir.actions.act_window,name:stock_cycle_count.action_stock_cycle_count #: model:ir.model.fields,field_description:stock_cycle_count.field_stock_inventory__cycle_count_id -#: model_terms:ir.ui.view,arch_db:stock_cycle_count.stock_cycle_count_rule_tree_view -#: model_terms:ir.ui.view,arch_db:stock_cycle_count.stock_cycle_count_tree_view msgid "Stock Cycle Count" msgstr "" diff --git a/stock_cycle_count/views/stock_cycle_count_rule_view.xml b/stock_cycle_count/views/stock_cycle_count_rule_view.xml index 747eea242..e156726e7 100644 --- a/stock_cycle_count/views/stock_cycle_count_rule_view.xml +++ b/stock_cycle_count/views/stock_cycle_count_rule_view.xml @@ -7,7 +7,7 @@ stock.cycle.count.rule.tree stock.cycle.count.rule - + diff --git a/stock_cycle_count/views/stock_cycle_count_view.xml b/stock_cycle_count/views/stock_cycle_count_view.xml index f33ceb585..e4495efeb 100644 --- a/stock_cycle_count/views/stock_cycle_count_view.xml +++ b/stock_cycle_count/views/stock_cycle_count_view.xml @@ -8,7 +8,6 @@ stock.cycle.count diff --git a/stock_location_empty/i18n/stock_location_empty.pot b/stock_location_empty/i18n/stock_location_empty.pot index 0aa279bc0..a428d4cfd 100644 --- a/stock_location_empty/i18n/stock_location_empty.pot +++ b/stock_location_empty/i18n/stock_location_empty.pot @@ -81,11 +81,6 @@ msgstr "" msgid "Stock Amount" msgstr "" -#. module: stock_location_empty -#: model_terms:ir.ui.view,arch_db:stock_location_empty.view_location_tree3 -msgid "Stock Location" -msgstr "" - #. module: stock_location_empty #: model_terms:ir.ui.view,arch_db:stock_location_empty.view_location_search_empty_2 msgid "Stock Locations" diff --git a/stock_location_empty/views/stock.xml b/stock_location_empty/views/stock.xml index 9d7449a8f..1095740e7 100644 --- a/stock_location_empty/views/stock.xml +++ b/stock_location_empty/views/stock.xml @@ -6,11 +6,7 @@ stock.location - + diff --git a/stock_location_orderpoint/data/ir_cron.xml b/stock_location_orderpoint/data/ir_cron.xml index 19c850ea4..4b44e4c40 100644 --- a/stock_location_orderpoint/data/ir_cron.xml +++ b/stock_location_orderpoint/data/ir_cron.xml @@ -1,6 +1,5 @@ - - + Procurement: run location replenishment @@ -15,5 +14,4 @@ -1 - diff --git a/stock_location_orderpoint/i18n/stock_location_orderpoint.pot b/stock_location_orderpoint/i18n/stock_location_orderpoint.pot index e1333db39..819fff053 100644 --- a/stock_location_orderpoint/i18n/stock_location_orderpoint.pot +++ b/stock_location_orderpoint/i18n/stock_location_orderpoint.pot @@ -208,11 +208,6 @@ msgstr "" msgid "Sequence" msgstr "" -#. module: stock_location_orderpoint -#: model_terms:ir.ui.view,arch_db:stock_location_orderpoint.view_stock_location_orderpoint_tree_editable -msgid "Stock Location Oderpoints" -msgstr "" - #. module: stock_location_orderpoint #: model:ir.actions.act_window,name:stock_location_orderpoint.action_stock_location_orderpoint #: model:ir.ui.menu,name:stock_location_orderpoint.menu_stock_location_orderpoint diff --git a/stock_location_orderpoint/views/stock_location_orderpoint_views.xml b/stock_location_orderpoint/views/stock_location_orderpoint_views.xml index beb92e358..815e61843 100644 --- a/stock_location_orderpoint/views/stock_location_orderpoint_views.xml +++ b/stock_location_orderpoint/views/stock_location_orderpoint_views.xml @@ -4,7 +4,7 @@ stock.location.orderpoint.tree.editable stock.location.orderpoint - + diff --git a/stock_location_tray/i18n/stock_location_tray.pot b/stock_location_tray/i18n/stock_location_tray.pot index 010ad7a87..a2f780799 100644 --- a/stock_location_tray/i18n/stock_location_tray.pot +++ b/stock_location_tray/i18n/stock_location_tray.pot @@ -172,7 +172,6 @@ msgstr "" #. module: stock_location_tray #: model_terms:ir.ui.view,arch_db:stock_location_tray.view_stock_location_tray_type_form #: model_terms:ir.ui.view,arch_db:stock_location_tray.view_stock_location_tray_type_search -#: model_terms:ir.ui.view,arch_db:stock_location_tray.view_stock_location_tray_type_tree msgid "Location Tray Type" msgstr "" diff --git a/stock_location_tray/views/stock_location_tray_type_views.xml b/stock_location_tray/views/stock_location_tray_type_views.xml index 5db912d79..2fbf279fd 100644 --- a/stock_location_tray/views/stock_location_tray_type_views.xml +++ b/stock_location_tray/views/stock_location_tray_type_views.xml @@ -75,7 +75,7 @@ stock.location.tray.type stock.location.tray.type - + diff --git a/stock_move_location/i18n/stock_move_location.pot b/stock_move_location/i18n/stock_move_location.pot index 567f3a0e9..914dca333 100644 --- a/stock_move_location/i18n/stock_move_location.pot +++ b/stock_move_location/i18n/stock_move_location.pot @@ -100,11 +100,6 @@ msgstr "" msgid "Immediate Transfer" msgstr "" -#. module: stock_move_location -#: model_terms:ir.ui.view,arch_db:stock_move_location.view_wiz_stock_move_location_form_stock_move_location -msgid "Inventory Details" -msgstr "" - #. module: stock_move_location #: model:ir.model.fields,field_description:stock_move_location.field_stock_move____last_update #: model:ir.model.fields,field_description:stock_move_location.field_stock_picking____last_update diff --git a/stock_move_location/wizard/stock_move_location.xml b/stock_move_location/wizard/stock_move_location.xml index 59838ab65..1d14cb8c0 100644 --- a/stock_move_location/wizard/stock_move_location.xml +++ b/stock_move_location/wizard/stock_move_location.xml @@ -44,7 +44,6 @@ mode="tree,kanban" > - + - + - stock_picking_show_linked.form stock.picking @@ -10,33 +9,32 @@ - diff --git a/stock_request/i18n/stock_request.pot b/stock_request/i18n/stock_request.pot index 033987aa2..359aea1da 100644 --- a/stock_request/i18n/stock_request.pot +++ b/stock_request/i18n/stock_request.pot @@ -374,11 +374,8 @@ msgstr "" #. module: stock_request #: model:ir.model.fields,help:stock_request.field_stock_request__message_has_error -#: model:ir.model.fields,help:stock_request.field_stock_request__message_has_sms_error #: model:ir.model.fields,help:stock_request.field_stock_request_abstract__message_has_error -#: model:ir.model.fields,help:stock_request.field_stock_request_abstract__message_has_sms_error #: model:ir.model.fields,help:stock_request.field_stock_request_order__message_has_error -#: model:ir.model.fields,help:stock_request.field_stock_request_order__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -805,13 +802,6 @@ msgstr "" msgid "Rules used" msgstr "" -#. module: stock_request -#: model:ir.model.fields,field_description:stock_request.field_stock_request__message_has_sms_error -#: model:ir.model.fields,field_description:stock_request.field_stock_request_abstract__message_has_sms_error -#: model:ir.model.fields,field_description:stock_request.field_stock_request_order__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: stock_request #: model_terms:ir.ui.view,arch_db:stock_request.stock_request_order_form #: model_terms:ir.ui.view,arch_db:stock_request.view_stock_request_form @@ -884,7 +874,6 @@ msgstr "" #. module: stock_request #: model_terms:ir.ui.view,arch_db:stock_request.view_move_form #: model_terms:ir.ui.view,arch_db:stock_request.view_stock_request_allocation_form -#: model_terms:ir.ui.view,arch_db:stock_request.view_stock_request_allocation_tree msgid "Stock Request Allocations" msgstr "" @@ -943,7 +932,6 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:stock_request.stock_request_search #: model_terms:ir.ui.view,arch_db:stock_request.view_picking_form #: model_terms:ir.ui.view,arch_db:stock_request.view_stock_request_form -#: model_terms:ir.ui.view,arch_db:stock_request.view_stock_request_tree msgid "Stock Requests" msgstr "" diff --git a/stock_request/views/stock_request_allocation_views.xml b/stock_request/views/stock_request_allocation_views.xml index 32a168c53..e1cee1a84 100644 --- a/stock_request/views/stock_request_allocation_views.xml +++ b/stock_request/views/stock_request_allocation_views.xml @@ -6,7 +6,7 @@ stock.request.allocation.tree stock.request.allocation - + diff --git a/stock_request/views/stock_request_views.xml b/stock_request/views/stock_request_views.xml index 83a23983b..af0eb1c6b 100644 --- a/stock_request/views/stock_request_views.xml +++ b/stock_request/views/stock_request_views.xml @@ -7,7 +7,6 @@ stock.request diff --git a/stock_request_kanban/data/stock_request_sequence_data.xml b/stock_request_kanban/data/stock_request_sequence_data.xml index 04d8d3843..6255b0802 100644 --- a/stock_request_kanban/data/stock_request_sequence_data.xml +++ b/stock_request_kanban/data/stock_request_sequence_data.xml @@ -1,6 +1,5 @@ - - + Stock Request Kanban stock.request.kanban @@ -15,5 +14,4 @@ 5 - diff --git a/stock_request_kanban/i18n/stock_request_kanban.pot b/stock_request_kanban/i18n/stock_request_kanban.pot index 6a9373ca9..853a6a816 100644 --- a/stock_request_kanban/i18n/stock_request_kanban.pot +++ b/stock_request_kanban/i18n/stock_request_kanban.pot @@ -290,9 +290,7 @@ msgstr "" #. module: stock_request_kanban #: model:ir.model.fields,help:stock_request_kanban.field_stock_inventory_kanban__message_has_error -#: model:ir.model.fields,help:stock_request_kanban.field_stock_inventory_kanban__message_has_sms_error #: model:ir.model.fields,help:stock_request_kanban.field_stock_request_kanban__message_has_error -#: model:ir.model.fields,help:stock_request_kanban.field_stock_request_kanban__message_has_sms_error msgid "If checked, some messages have a delivery error." msgstr "" @@ -590,12 +588,6 @@ msgstr "" msgid "Routes" msgstr "" -#. module: stock_request_kanban -#: model:ir.model.fields,field_description:stock_request_kanban.field_stock_inventory_kanban__message_has_sms_error -#: model:ir.model.fields,field_description:stock_request_kanban.field_stock_request_kanban__message_has_sms_error -msgid "SMS Delivery error" -msgstr "" - #. module: stock_request_kanban #: model_terms:ir.ui.view,arch_db:stock_request_kanban.stock_request_order_form #: model_terms:ir.ui.view,arch_db:stock_request_kanban.view_stock_inventory_kanban_form @@ -662,7 +654,6 @@ msgstr "" #. module: stock_request_kanban #: model_terms:ir.ui.view,arch_db:stock_request_kanban.view_stock_inventory_kanban_form -#: model_terms:ir.ui.view,arch_db:stock_request_kanban.view_stock_inventory_kanban_tree msgid "Stock Inventories" msgstr "" @@ -711,7 +702,6 @@ msgstr "" #. module: stock_request_kanban #: model_terms:ir.ui.view,arch_db:stock_request_kanban.view_stock_request_kanban_form -#: model_terms:ir.ui.view,arch_db:stock_request_kanban.view_stock_request_kanban_tree msgid "Stock Requests" msgstr "" diff --git a/stock_request_kanban/views/stock_inventory_kanban_views.xml b/stock_request_kanban/views/stock_inventory_kanban_views.xml index ec5239838..88c575273 100644 --- a/stock_request_kanban/views/stock_inventory_kanban_views.xml +++ b/stock_request_kanban/views/stock_inventory_kanban_views.xml @@ -4,7 +4,7 @@ stock.inventory.kanban.tree stock.inventory.kanban - + diff --git a/stock_request_kanban/views/stock_request_kanban_views.xml b/stock_request_kanban/views/stock_request_kanban_views.xml index 6a6446dd9..6e7925a2c 100644 --- a/stock_request_kanban/views/stock_request_kanban_views.xml +++ b/stock_request_kanban/views/stock_request_kanban_views.xml @@ -7,7 +7,6 @@ stock.request.kanban diff --git a/stock_request_tier_validation/data/stock_request_tier_definition.xml b/stock_request_tier_validation/data/stock_request_tier_definition.xml index 354ac26ea..f03947f07 100644 --- a/stock_request_tier_validation/data/stock_request_tier_definition.xml +++ b/stock_request_tier_validation/data/stock_request_tier_definition.xml @@ -1,8 +1,7 @@ - - + Manager review @@ -10,25 +9,24 @@ group + name="reviewer_group_id" + ref='stock_request.group_stock_request_manager' + /> False + id="stock_request_order_default_tier_definition" + model="tier.definition" + > Manager review domain group + name="reviewer_group_id" + ref='stock_request.group_stock_request_manager' + /> False - diff --git a/stock_reserve/i18n/stock_reserve.pot b/stock_reserve/i18n/stock_reserve.pot index 1cac16243..614b66f48 100644 --- a/stock_reserve/i18n/stock_reserve.pot +++ b/stock_reserve/i18n/stock_reserve.pot @@ -804,7 +804,6 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:stock_reserve.product_template_form_view_reservation_button #: model_terms:ir.ui.view,arch_db:stock_reserve.view_stock_reservation_form #: model_terms:ir.ui.view,arch_db:stock_reserve.view_stock_reservation_search -#: model_terms:ir.ui.view,arch_db:stock_reserve.view_stock_reservation_tree msgid "Stock Reservations" msgstr "" diff --git a/stock_reserve/view/stock_reserve.xml b/stock_reserve/view/stock_reserve.xml index 43723ab58..f2fc2fb2b 100644 --- a/stock_reserve/view/stock_reserve.xml +++ b/stock_reserve/view/stock_reserve.xml @@ -81,7 +81,6 @@ stock.reservation diff --git a/stock_reserve_rule/i18n/stock_reserve_rule.pot b/stock_reserve_rule/i18n/stock_reserve_rule.pot index 1fc765d8d..1e33f27c2 100644 --- a/stock_reserve_rule/i18n/stock_reserve_rule.pot +++ b/stock_reserve_rule/i18n/stock_reserve_rule.pot @@ -201,7 +201,6 @@ msgstr "" #. module: stock_reserve_rule #: model_terms:ir.ui.view,arch_db:stock_reserve_rule.view_stock_reserve_rule_form #: model_terms:ir.ui.view,arch_db:stock_reserve_rule.view_stock_reserve_rule_search -#: model_terms:ir.ui.view,arch_db:stock_reserve_rule.view_stock_reserve_rule_tree msgid "Reservation Rule" msgstr "" diff --git a/stock_reserve_rule/views/stock_reserve_rule_views.xml b/stock_reserve_rule/views/stock_reserve_rule_views.xml index 5f3b45fea..f6662d331 100644 --- a/stock_reserve_rule/views/stock_reserve_rule_views.xml +++ b/stock_reserve_rule/views/stock_reserve_rule_views.xml @@ -43,7 +43,7 @@ - + @@ -96,7 +96,7 @@ stock.reserve.rule stock.reserve.rule - + diff --git a/stock_vertical_lift/i18n/stock_vertical_lift.pot b/stock_vertical_lift/i18n/stock_vertical_lift.pot index 232400e99..57675c2bc 100644 --- a/stock_vertical_lift/i18n/stock_vertical_lift.pot +++ b/stock_vertical_lift/i18n/stock_vertical_lift.pot @@ -603,7 +603,6 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:stock_vertical_lift.vertical_lift_shuttle_form_menu #: model_terms:ir.ui.view,arch_db:stock_vertical_lift.vertical_lift_shuttle_manual_barcode_form #: model_terms:ir.ui.view,arch_db:stock_vertical_lift.vertical_lift_shuttle_view_form -#: model_terms:ir.ui.view,arch_db:stock_vertical_lift.vertical_lift_shuttle_view_tree msgid "Shuttle" msgstr "" diff --git a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml index 32881f180..330ab7536 100644 --- a/stock_vertical_lift/views/vertical_lift_shuttle_views.xml +++ b/stock_vertical_lift/views/vertical_lift_shuttle_views.xml @@ -187,7 +187,7 @@ vertical.lift.shuttle.tree vertical.lift.shuttle - + diff --git a/stock_vertical_lift_empty_tray_check/views/res_config_setting_views.xml b/stock_vertical_lift_empty_tray_check/views/res_config_setting_views.xml index 06b0e2c86..c036d2904 100644 --- a/stock_vertical_lift_empty_tray_check/views/res_config_setting_views.xml +++ b/stock_vertical_lift_empty_tray_check/views/res_config_setting_views.xml @@ -1,6 +1,5 @@ - res.config.settings.view.form.inherit.stock res.config.settings @@ -8,9 +7,9 @@ + expr="//field[@name='group_stock_adv_location']/ancestor::div[hasclass('o_setting_box')]" + position="after" + >
@@ -27,5 +26,4 @@ -