Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing from upstream OCA/management-system (16.0) #370

Merged
merged 4 commits into from
Oct 27, 2023
Merged

Syncing from upstream OCA/management-system (16.0) #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1f311f
Add missing noupdate flag on nonconformity stages
grindtildeath Oct 25, 2023
0b41c71
Add migration script to set noupdate flag
grindtildeath Oct 26, 2023
6b09448
Merge PR #550 into 16.0
OCA-git-bot Oct 26, 2023
226fffe
[BOT] post-merge updates
OCA-git-bot Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ addon | version | maintainers | summary
[mgmtsystem_health_safety](mgmtsystem_health_safety/) | 16.0.1.0.1 | | Health and Safety Management System
[mgmtsystem_info_security_manual](mgmtsystem_info_security_manual/) | 16.0.1.0.0 | | Information Security Management System Manual
[mgmtsystem_manual](mgmtsystem_manual/) | 16.0.1.0.0 | | Management System - Manual
[mgmtsystem_nonconformity](mgmtsystem_nonconformity/) | 16.0.1.0.4 | | Management System - Nonconformity
[mgmtsystem_nonconformity](mgmtsystem_nonconformity/) | 16.0.1.0.5 | | Management System - Nonconformity
[mgmtsystem_nonconformity_hr](mgmtsystem_nonconformity_hr/) | 16.0.1.0.0 | | Bridge module between hr and mgmsystem and
[mgmtsystem_nonconformity_mrp](mgmtsystem_nonconformity_mrp/) | 16.0.1.0.0 | | Bridge module between mrp and mgmsystem
[mgmtsystem_nonconformity_product](mgmtsystem_nonconformity_product/) | 16.0.1.0.0 | | Bridge module between Product and Management System.
Expand Down
2 changes: 1 addition & 1 deletion mgmtsystem_nonconformity/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Management System - Nonconformity
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:2dd2be940f2219a69b6be864b67223cd99690e91f64f6dda1396a4c00252e810
!! source digest: sha256:9a01b96cb3a0cea6caf773e278d0ab5d190425c60c3717f9c68bc5c86acdcfaa
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion mgmtsystem_nonconformity/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Management System - Nonconformity",
"version": "16.0.1.0.4",
"version": "16.0.1.0.5",
"author": "Savoir-faire Linux, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/management-system",
"license": "AGPL-3",
Expand Down
2 changes: 1 addition & 1 deletion mgmtsystem_nonconformity/data/mgmtsystem_nonconformity_stage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<odoo noupdate="1">
<record id="stage_draft" model="mgmtsystem.nonconformity.stage">
<field name="name">Draft</field>
<field name="sequence">0</field>
Expand Down
14 changes: 14 additions & 0 deletions mgmtsystem_nonconformity/migrations/16.0.1.1.0/pre-migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright 2023 Camptocamp SA
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)


def migrate(cr, version):
"""Set nonconformity stages from module data as noupdate."""
cr.execute(
"""
UPDATE ir_model_data
SET noupdate = TRUE
WHERE module = 'mgmtsystem_nonconformity'
AND model = 'mgmtsystem.nonconformity.stage';
"""
)
2 changes: 1 addition & 1 deletion mgmtsystem_nonconformity/static/description/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Management System - Nonconformity</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:2dd2be940f2219a69b6be864b67223cd99690e91f64f6dda1396a4c00252e810
!! source digest: sha256:9a01b96cb3a0cea6caf773e278d0ab5d190425c60c3717f9c68bc5c86acdcfaa
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/management-system/tree/16.0/mgmtsystem_nonconformity"><img alt="OCA/management-system" src="https://img.shields.io/badge/github-OCA%2Fmanagement--system-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/management-system-16-0/management-system-16-0-mgmtsystem_nonconformity"><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/management-system&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module enables you to manage the nonconformities of your management systems:</p>
Expand Down