Skip to content

Commit

Permalink
Merge pull request #387 from OCA/14.0
Browse files Browse the repository at this point in the history
Syncing from upstream OCA/management-system (14.0)
  • Loading branch information
bt-admin authored Dec 19, 2023
2 parents 468d7ac + f3ec820 commit 46fbf2b
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ addon | version | maintainers | summary
[mgmtsystem_audit](mgmtsystem_audit/) | 14.0.1.0.0 | | Management System - Audit
[mgmtsystem_claim](mgmtsystem_claim/) | 14.0.1.0.0 | | Management System - Claim
[mgmtsystem_environment](mgmtsystem_environment/) | 14.0.1.0.0 | | Environment Management System
[mgmtsystem_evaluation](mgmtsystem_evaluation/) | 14.0.1.0.1 | | Evaluate records within your management system
[mgmtsystem_evaluation](mgmtsystem_evaluation/) | 14.0.1.0.2 | | Evaluate records within your management system
[mgmtsystem_evaluation_hr](mgmtsystem_evaluation_hr/) | 14.0.1.0.0 | | Allow to use evaluations on Employees
[mgmtsystem_hazard](mgmtsystem_hazard/) | 14.0.1.0.1 | | Hazard
[mgmtsystem_hazard_risk](mgmtsystem_hazard_risk/) | 14.0.1.0.0 | | Hazard Risk
Expand Down
2 changes: 1 addition & 1 deletion mgmtsystem_evaluation/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Mgmtsystem Evaluation
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:70388c15c76244d7450fca6127d9f41636bd35f826277fed39fcdecf04ecc08a
!! source digest: sha256:4d84096dbd94cc14750bc04a958e1ee72e314317bc4411266dbd02ef3e21a1e4
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion mgmtsystem_evaluation/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Mgmtsystem Evaluation",
"summary": """
Evaluate records within your management system""",
"version": "14.0.1.0.1",
"version": "14.0.1.0.2",
"license": "AGPL-3",
"author": "CreuBlanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/management-system",
Expand Down
5 changes: 5 additions & 0 deletions mgmtsystem_evaluation/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ msgstr "Seguito da (partner)"
msgid "Font awesome icon e.g. fa-tasks"
msgstr "Icona Font Awesome es. fa-tasks"

#. module: mgmtsystem_evaluation
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_mgmtsystem_evaluation_template__group_id
msgid "Group"
msgstr ""

#. module: mgmtsystem_evaluation
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_ir_model__id
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_mgmtsystem_evaluation__id
Expand Down
5 changes: 5 additions & 0 deletions mgmtsystem_evaluation/i18n/mgmtsystem_evaluation.pot
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ msgstr ""
msgid "Font awesome icon e.g. fa-tasks"
msgstr ""

#. module: mgmtsystem_evaluation
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_mgmtsystem_evaluation_template__group_id
msgid "Group"
msgstr ""

#. module: mgmtsystem_evaluation
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_ir_model__id
#: model:ir.model.fields,field_description:mgmtsystem_evaluation.field_mgmtsystem_evaluation__id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class MgmtsytemEvaluationTemplate(models.Model):
once the evaluation is started""",
)
note = fields.Html()
group_id = fields.Many2one("res.groups")
recurrence_type = fields.Selection(
lambda self: [
(key, value[0]) for key, value in self._get_recurrence_type().items()
Expand Down
8 changes: 8 additions & 0 deletions mgmtsystem_evaluation/security/security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,13 @@
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field name="domain_force">[('manager_ids', '=', user.id)]</field>
</record>
<record id="mgmtsystem_evaluation_group_rule" model="ir.rule">
<field name="name">Template group can access all related evaluations</field>
<field name="model_id" ref="model_mgmtsystem_evaluation" />
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field
name="domain_force"
>[('template_id.group_id.users', '=', user.id)]</field>
</record>
</data>
</odoo>
3 changes: 1 addition & 2 deletions mgmtsystem_evaluation/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand Down Expand Up @@ -367,7 +366,7 @@ <h1 class="title">Mgmtsystem Evaluation</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:70388c15c76244d7450fca6127d9f41636bd35f826277fed39fcdecf04ecc08a
!! source digest: sha256:4d84096dbd94cc14750bc04a958e1ee72e314317bc4411266dbd02ef3e21a1e4
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/14.0/mgmtsystem_evaluation"><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-14-0/management-system-14-0-mgmtsystem_evaluation"><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=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module allows to generate evaluations for any kind of models.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<field name="model_id" />
<field name="manager_activity_type_id" />
<field name="user_activity_type_id" />
<field name="group_id" />
</group>
<group>
<field name="recurrence_type" />
Expand Down

0 comments on commit 46fbf2b

Please sign in to comment.