Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 document_page_approval/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Contributors
* Odoo SA <info@odoo.com>
* Savoir-faire Linux <support@savoirfairelinux.com>
* Gervais Naoussi <gervaisnaoussi@gmail.com>
* Maxime Chambreuil <mchambreuil@ursainfosystems.com>
* Maxime Chambreuil <mchambreuil@opensourceintegrators.com>

Maintainer
----------
Expand Down
2 changes: 1 addition & 1 deletion document_page_approval/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
'name': 'Document Page Approval',
'version': '10.0.1.0.0',
'version': '10.0.1.1.0',
"author": "Savoir-faire Linux, Odoo Community Association (OCA)",
"website": "http://www.savoirfairelinux.com",
"license": "AGPL-3",
Expand Down
6 changes: 3 additions & 3 deletions document_page_approval/models/document_page_approval.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2013 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from openerp import models, fields, api
from openerp import api, fields, models


class DocumentPageApproval(models.Model):
Expand Down Expand Up @@ -71,12 +71,12 @@ def _get_approved_uid(self):

@api.multi
def _is_parent_approval_required(self):
"""Check if the document required approval base on his parrent."""
"""Check if the document requires approval base on his parent."""
for page in self:
page.is_parent_approval_required = self.is_approval_required(page)

def is_approval_required(self, page):
"""Check if a document required approval."""
"""Check if a document requires approval."""
if page:
res = page.approval_required
res = res or self.is_approval_required(page.parent_id)
Expand Down
13 changes: 6 additions & 7 deletions document_page_approval/views/document_page_approval.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@
<xpath expr="//form/label[@for='page_id']"
position="before">
<header attrs="{'invisible':[('is_parent_approval_required','=',False)]}">
<span attrs="{'invisible':[('can_user_approve_page','=',False)]}">
<button name="page_approval_approve"
string="Approve"
states="draft" />
</span>
<button name="page_approval_approve"
string="Approve"
states="draft"
class="btn-primary"
attrs="{'invisible':[('can_user_approve_page','=',False)]}"/>
<field name="state"
widget="statusbar"
statusbar_visible="draft,approved"/>
<field name="is_parent_approval_required"
<field name="is_parent_approval_required"
invisible="1" />
<field name="can_user_approve_page"
invisible="1" />

</header>
</xpath>
</field>
Expand Down