NeoAnd/knowledge
1
0
Fork 0
mirror of https://github.com/OCA/knowledge.git synced 2025-12-22 21:32:18 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

made invisible the prover group when not needed

Browse Source 
(../7.0pageapproval/ rev 10)
This commit is contained in:
Jonatan Cloutier
2013-06-17 15:45:05 -04:00
parent 90f540eb9e
commit 1920903b8f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
document_page_approval/document_page_approval.py
View File

@@ -26,8 +26,14 @@ class document_page_history_wkfl(orm.Model):
def page_approval_draft(self, cr, uid, ids): def page_approval_draft(self, cr, uid, ids):
self.write(cr, uid, ids, { 'state' : 'draft' }) 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 return True
def send_email_to_approvers(self, page_hystory, page):
pass
def page_approval_approved(self, cr, uid, ids): def page_approval_approved(self, cr, uid, ids):
self.write(cr, uid, ids, { 'state' : 'approved', self.write(cr, uid, ids, { 'state' : 'approved',
'approved_date' : datetime.now().strftime('%Y-%m-%d %H:%M:%S'), '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_date': fields.datetime("Approved Date"),
'approved_uid': fields.many2one('res.users', "Approved By"), '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), '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), 'can_user_approve_page': fields.function(can_user_approve_page, string="can user approve this page", type='boolean', store=False),
} }

2
document_page_approval/document_page_view.xml
View File

@@ -30,7 +30,7 @@
</field> </field>
<field name="parent_id" position="after"> <field name="parent_id" position="after">
<field name="approval_required" attrs="{'invisible':[('type','=','content')]}"/> <field name="approval_required" attrs="{'invisible':[('type','=','content')]}"/>
<field name="approver_gid" attrs="{'invisible':[('type','=','content')], 'required':[('approval_required','=', 'true')]}"/> <field name="approver_gid" attrs="{'invisible':['|',('type','=','content'), ('approval_required','!=', True)], 'required':[('approval_required','=', True)]}"/>
</field> </field>
</field> </field>
</record> </record>