diff --git a/document_page_approval/README.rst b/document_page_approval/README.rst index affff9ce..386c5a24 100644 --- a/document_page_approval/README.rst +++ b/document_page_approval/README.rst @@ -1,44 +1,40 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 ====================== Document Page Approval ====================== -This module adds a workflow to approve page modification and show the approved -version by default. +This module adds a workflow to approve page modifications and show the approved version by default. Installation ============ -Makes the document page approval available from where some users can approved the modifications -made by others users in documents that required approvement. +No specific installation required. Configuration ============= -No configuration required +* Set a valid email address on the company settings. +* Go to Knowledge > Categories. +* Create a new page category and set an approver group. Make sure users belonging to that group have valid email + addresses. Usage ===== To use this module, you need to: -* Set a valid email address on the company settings. -* go to knowledge > Categories. -* Create a new page category and set an approver group. Make sure users - belonging to that group have valid email addresses. -* go to knowledge > Pages +* Go to Knowledge > Pages * Create a new page and choose the previously created category. -* A notification is sent to the group with a link to the page history to - review. +* A notification is sent to the approvers group with a link to the page history to review. * Depending on the review, the page history is approved or not. * Users reading the page see the last approved version. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/118/9.0 + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/118/10.0 Known issues / Roadmap ====================== @@ -50,8 +46,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. - +If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here `_. Credits ======= @@ -62,13 +57,14 @@ Contributors * Odoo SA * Savoir-faire Linux * Gervais Naoussi +* Maxime Chambreuil Maintainer ---------- .. image:: https://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: https://odoo-community.org + :alt: Odoo Community Association + :target: https://odoo-community.org This module is maintained by the OCA. @@ -76,13 +72,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. - -Changelog ---------- - -v9.0.1.0.0 - -Here are the modification that have been done: - -* The module does no depends anymore on email_template but on mail module +To contribute to this module, please visit https://odoo-community.org. diff --git a/document_page_approval/__init__.py b/document_page_approval/__init__.py index 7f626589..01c2ffde 100644 --- a/document_page_approval/__init__.py +++ b/document_page_approval/__init__.py @@ -1,21 +1,5 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# Copyright (C) 2013 Savoir-faire Linux (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + from . import models diff --git a/document_page_approval/__manifest__.py b/document_page_approval/__manifest__.py new file mode 100644 index 00000000..b3921128 --- /dev/null +++ b/document_page_approval/__manifest__.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2013 Savoir-faire Linux (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Document Page Approval', + 'version': '10.0.1.0.0', + "author": "Savoir-faire Linux, Odoo Community Association (OCA)", + "website": "http://www.savoirfairelinux.com", + "license": "AGPL-3", + 'category': 'Knowledge Management', + 'depends': [ + 'document_page', + 'mail', + ], + 'data': [ + 'data/email_template.xml', + 'workflows/document_page_approval.xml', + 'views/document_page_approval.xml', + 'security/document_page_security.xml', + 'security/ir.model.access.csv', + ], + 'images': [ + 'images/category.png', + 'images/page_history_list.png', + 'images/page_history.png', + ], +} diff --git a/document_page_approval/__openerp__.py b/document_page_approval/__openerp__.py deleted file mode 100644 index 1e95feb3..00000000 --- a/document_page_approval/__openerp__.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{ - 'name': 'Document Page Approval', - 'version': '9.0.1.0.0', - "author": "Savoir-faire Linux,Odoo Community Association (OCA)", - "website": "http://www.savoirfairelinux.com", - "license": "AGPL-3", - 'category': 'Knowledge Management', - 'depends': [ - 'knowledge', - 'document_page', - 'mail', - ], - 'data': [ - 'data/email_template.xml', - 'workflows/document_page_approval.xml', - 'views/document_page_approval.xml', - 'security/document_page_security.xml', - 'security/ir.model.access.csv', - ], - 'installable': True, - 'auto_install': False, - 'images': [ - 'images/category.png', - 'images/page_history_list.png', - 'images/page_history.png', - ], -} diff --git a/document_page_approval/data/email_template.xml b/document_page_approval/data/email_template.xml index e31c8bcb..e3bc566d 100644 --- a/document_page_approval/data/email_template.xml +++ b/document_page_approval/data/email_template.xml @@ -1,20 +1,17 @@ - + - - - - - Automated new draft need approval Notification Mail - ${object.create_uid.company_id.email or 'noreply@localhost.com'} - New version of "${object.page_id.name}" to approve - ${object.get_approvers_email} - - - ${object.create_uid.partner_id.lang} - - + Automated new draft need approval Notification Mail + ${object.create_uid.company_id.email or 'noreply@localhost.com'} + New version of "${object.page_id.name}" to approve + ${object.get_approvers_email} + + + ${object.create_uid.partner_id.lang} + + Hello,

The page "${object.page_id.name}" has been modified and need your approval.

@@ -24,8 +21,7 @@

Have a great day.
--
Odoo

]]> - - + + - diff --git a/document_page_approval/models/document_page_approval.py b/document_page_approval/models/document_page_approval.py index 278f5227..193c839b 100644 --- a/document_page_approval/models/document_page_approval.py +++ b/document_page_approval/models/document_page_approval.py @@ -1,23 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# Copyright (C) 2013 Savoir-faire Linux (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from openerp import models, fields, api diff --git a/document_page_approval/models/document_page_history_workflow.py b/document_page_approval/models/document_page_history_workflow.py index 2eeb7e91..82ba943d 100644 --- a/document_page_approval/models/document_page_history_workflow.py +++ b/document_page_approval/models/document_page_history_workflow.py @@ -1,28 +1,11 @@ # -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2013 Savoir-faire Linux (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# Copyright (C) 2013 Savoir-faire Linux (). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from datetime import datetime -from openerp.tools.translate import _ -from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT -from openerp import models, fields, api +from odoo.tools.translate import _ +from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT +from odoo import api, fields, models class DocumentPageHistoryWorkflow(models.Model): diff --git a/document_page_approval/security/document_page_security.xml b/document_page_approval/security/document_page_security.xml index d41d96f8..f0378d8e 100644 --- a/document_page_approval/security/document_page_security.xml +++ b/document_page_approval/security/document_page_security.xml @@ -1,9 +1,9 @@ - + Document approver - + diff --git a/document_page_approval/views/document_page_approval.xml b/document_page_approval/views/document_page_approval.xml index 6b0e5c91..ef834b67 100644 --- a/document_page_approval/views/document_page_approval.xml +++ b/document_page_approval/views/document_page_approval.xml @@ -1,5 +1,6 @@ + document.page.history.form document.page.history @@ -88,4 +89,5 @@ + diff --git a/document_page_approval/workflows/document_page_approval.xml b/document_page_approval/workflows/document_page_approval.xml index ea8a254b..410d8a54 100644 --- a/document_page_approval/workflows/document_page_approval.xml +++ b/document_page_approval/workflows/document_page_approval.xml @@ -1,5 +1,6 @@ + document.page.history.aproval.wkf document.page.history @@ -35,4 +36,5 @@ edit +