From 1920903b8faef800ab32855cd7a190b745d21683 Mon Sep 17 00:00:00 2001 From: Jonatan Cloutier Date: Mon, 17 Jun 2013 15:45:05 -0400 Subject: [PATCH] made invisible the prover group when not needed (../7.0pageapproval/ rev 10) --- document_page_approval/document_page_approval.py | 7 ++++++- document_page_approval/document_page_view.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/document_page_approval/document_page_approval.py b/document_page_approval/document_page_approval.py index 6e1c9f64..ee2f6d95 100644 --- a/document_page_approval/document_page_approval.py +++ b/document_page_approval/document_page_approval.py @@ -26,8 +26,14 @@ class document_page_history_wkfl(orm.Model): def page_approval_draft(self, cr, uid, ids): self.write(cr, uid, ids, { 'state' : 'draft' }) + if is_parent_approval_required: + for page in self.browse(cr, uid, ids): + self.send_email_to_approvers(page, page.parent_id) return True + def send_email_to_approvers(self, page_hystory, page): + pass + def page_approval_approved(self, cr, uid, ids): self.write(cr, uid, ids, { 'state' : 'approved', 'approved_date' : datetime.now().strftime('%Y-%m-%d %H:%M:%S'), @@ -59,7 +65,6 @@ class document_page_history_wkfl(orm.Model): 'approved_date': fields.datetime("Approved Date"), 'approved_uid': fields.many2one('res.users', "Approved By"), 'is_parent_approval_required': fields.related('page_id', 'is_parent_approval_required', string="parent approval", type='boolean', store=False), - 'approver_gid': fields.related('page_id', 'approver_gid', string="Approver group", type='many2one', relation='res.groups', store=False), 'can_user_approve_page': fields.function(can_user_approve_page, string="can user approve this page", type='boolean', store=False), } diff --git a/document_page_approval/document_page_view.xml b/document_page_approval/document_page_view.xml index f4ac18a8..afaa9fbf 100644 --- a/document_page_approval/document_page_view.xml +++ b/document_page_approval/document_page_view.xml @@ -30,7 +30,7 @@ - +