diff --git a/attachment_zipped_download/__manifest__.py b/attachment_zipped_download/__manifest__.py index 14a392ae6c3..47dcf370a35 100644 --- a/attachment_zipped_download/__manifest__.py +++ b/attachment_zipped_download/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Attachment Zipped Download", - "version": "16.0.2.0.1", + "version": "17.0.2.0.0", "category": "Tools", "website": "https://github.com/OCA/knowledge", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/document_knowledge/__manifest__.py b/document_knowledge/__manifest__.py index aea360d63c3..a27b1797584 100644 --- a/document_knowledge/__manifest__.py +++ b/document_knowledge/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Documents Knowledge", - "version": "16.0.1.1.0", + "version": "17.0.1.1.0", "author": "OpenERP SA," "MONK Software, " "Tecnativa, " diff --git a/document_knowledge/views/res_config.xml b/document_knowledge/views/res_config.xml index d48d7e1e4d6..b3eea2c1edd 100644 --- a/document_knowledge/views/res_config.xml +++ b/document_knowledge/views/res_config.xml @@ -6,7 +6,7 @@ - +
document.page.tree document.page - child_ids 100 @@ -42,7 +41,7 @@ name="web_ribbon" text="Archived" bg_color="bg-danger" - attrs="{'invisible': [('active', '=', True)]}" + invisible="active == True" /> @@ -75,7 +74,7 @@ diff --git a/document_page_approval/__manifest__.py b/document_page_approval/__manifest__.py index 81c3eaea720..7cbfb3f7119 100644 --- a/document_page_approval/__manifest__.py +++ b/document_page_approval/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Document Page Approval", - "version": "16.0.1.1.0", + "version": "17.0.1.1.0", "author": "Savoir-faire Linux, Odoo Community Association (OCA)", "website": "https://github.com/OCA/knowledge", "license": "AGPL-3", diff --git a/document_page_approval/hooks.py b/document_page_approval/hooks.py index d0b780a2627..5eb8761b298 100644 --- a/document_page_approval/hooks.py +++ b/document_page_approval/hooks.py @@ -5,10 +5,10 @@ _logger = logging.getLogger(__name__) -def post_init_hook(cr, registry): # pragma: no cover +def post_init_hook(env): # pragma: no cover # Set all pre-existing pages history to approved _logger.info("Setting history to approved.") - cr.execute( + env.cr.execute( """ UPDATE document_page_history SET state='approved', @@ -19,7 +19,7 @@ def post_init_hook(cr, registry): # pragma: no cover ) -def uninstall_hook(cr, registry): # pragma: no cover +def uninstall_hook(env): # pragma: no cover # Remove unapproved pages _logger.info("Deleting unapproved Change Requests.") - cr.execute("DELETE FROM document_page_history WHERE state != 'approved'") + env.cr.execute("DELETE FROM document_page_history WHERE state != 'approved'") diff --git a/document_page_approval/views/document_page_approval.xml b/document_page_approval/views/document_page_approval.xml index 5445e490c31..5a6207d9d73 100644 --- a/document_page_approval/views/document_page_approval.xml +++ b/document_page_approval/views/document_page_approval.xml @@ -14,7 +14,7 @@ type="object" string="Send to Review" class="oe_highlight" - attrs="{'invisible':['|','|',('is_approval_required','=',False),('am_i_owner','=',False),('state', 'not in', ['draft'])]}" + invisible="is_approval_required == False or am_i_owner == False or state not in ['draft']" />