diff --git a/document_multiple_records/document.py b/document_multiple_records/document.py index f576819b..5e8456a9 100644 --- a/document_multiple_records/document.py +++ b/document_multiple_records/document.py @@ -67,7 +67,8 @@ class document_file(orm.Model): cr, uid, ids_to_unlink, context=context) else: # Normal delete - result = super(document_file, self).unlink(cr, uid, ids, context=context) + result = super(document_file, self).unlink( + cr, uid, ids, context=context) return result @@ -78,9 +79,9 @@ class ir_attachment_document(orm.Model): _columns = { 'res_id': fields.integer('Resource ID', readonly=True, help="The record id this is attached to."), - 'res_model': fields.char('Resource Model', size=64, - readonly=True, - help="The database object this attachment will be attached to"), + 'res_model': fields.char( + 'Resource Model', size=64, readonly=True, + help="The database object this attachment will be attached to"), 'res_name': fields.char('Resource Name', type='char', size=128, readonly=True), diff --git a/document_multiple_records/wizard/document_wizard.py b/document_multiple_records/wizard/document_wizard.py index d8bb943e..44b44b66 100644 --- a/document_multiple_records/wizard/document_wizard.py +++ b/document_multiple_records/wizard/document_wizard.py @@ -40,17 +40,24 @@ class document_wizard(orm.Model): context = {} ir_attach_obj = self.pool.get('ir.attachment') ir_attach_doc_obj = self.pool.get('ir.attachment.document') - ir_model_obj = self.pool.get(context.get('model') or context.get('active_model')) + ir_model_obj = self.pool.get( + context.get('model') or context.get('active_model')) - name = ir_model_obj.browse(cr, uid, context.get('ids') or context.get('active_ids'), context=context)[0]['name'] + name = ir_model_obj.browse( + cr, uid, context.get('ids') or context.get('active_ids'), + context=context)[0]['name'] data = self.read(cr, uid, ids, [], context=context)[0] if not data['attachment_ids']: - raise orm.except_orm(_('Error'), - _('You have to select at least 1 Document. And try again')) - for attach in ir_attach_obj.browse(cr, uid, data['attachment_ids'], context=context): + raise orm.except_orm( + _('Error'), + _('You have to select at least 1 Document. And try again')) + for attach in ir_attach_obj.browse(cr, uid, data['attachment_ids'], + context=context): data_attach = { - 'res_model': context.get('model') or context.get('active_model'), - 'res_id': context.get('ids') and context.get('ids')[0] or context.get('active_id'), + 'res_model': context.get('model') or + context.get('active_model'), + 'res_id': context.get('ids') and context.get('ids')[0] or + context.get('active_id'), 'res_name': name, 'attachment_id': attach.id, } diff --git a/document_page_approval/__openerp__.py b/document_page_approval/__openerp__.py index 75bbc31d..6712b13a 100644 --- a/document_page_approval/__openerp__.py +++ b/document_page_approval/__openerp__.py @@ -27,16 +27,18 @@ "license": "AGPL-3", 'category': 'Knowledge Management', 'description': """ -This module adds a workflow to approve page modification and show the approved version by default. +This module adds a workflow to approve page modification and show the approved +version by default. Scenario ======== * Set a valid email address on the company settings. -* Create a new page category and set an approver group. Make sure users belonging to that group - have valid email addresses. +* Create a new page category and set an approver group. Make sure users + belonging to that group have valid email addresses. * 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 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. """, @@ -52,5 +54,9 @@ Scenario ], 'installable': True, 'auto_install': False, - 'images': ['images/category.png', 'images/page_history_list.png', 'images/page_history.png'], + 'images': [ + 'images/category.png', + 'images/page_history_list.png', + 'images/page_history.png', + ], } diff --git a/document_page_approval/document_page_approval.py b/document_page_approval/document_page_approval.py index 8feeabd9..5bc78b9e 100644 --- a/document_page_approval/document_page_approval.py +++ b/document_page_approval/document_page_approval.py @@ -32,7 +32,8 @@ class document_page_history_wkfl(orm.Model): template_id = self.pool.get('ir.model.data').get_object_reference( cr, uid, - 'document_page_approval', 'email_template_new_draft_need_approval')[1] + 'document_page_approval', + 'email_template_new_draft_need_approval')[1] for page in self.browse(cr, uid, ids, context=context): if page.is_parent_approval_required: self.pool.get('email.template').send_mail( @@ -44,7 +45,8 @@ class document_page_history_wkfl(orm.Model): def page_approval_approved(self, cr, uid, ids, context=None): self.write(cr, uid, ids, { 'state': 'approved', - 'approved_date': datetime.now().strftime(DEFAULT_SERVER_DATETIME_FORMAT), + 'approved_date': datetime.now().strftime( + DEFAULT_SERVER_DATETIME_FORMAT), 'approved_uid': uid }, context=context) return True @@ -89,9 +91,12 @@ class document_page_history_wkfl(orm.Model): res = {} for id in ids: emails = '' - guids = self.get_approvers_guids(cr, uid, ids, name, args, context=context) - uids = self.pool.get('res.users').search(cr, uid, [('groups_id', 'in', guids[id])]) - users = self.pool.get('res.users').browse(cr, uid, uids, context=context) + guids = self.get_approvers_guids( + cr, uid, ids, name, args, context=context) + uids = self.pool.get('res.users').search( + cr, uid, [('groups_id', 'in', guids[id])]) + users = self.pool.get('res.users').browse( + cr, uid, uids, context=context) for user in users: if user.email: @@ -100,7 +105,8 @@ class document_page_history_wkfl(orm.Model): else: empl_id = self.pool.get('hr.employee').search( cr, uid, [('login', '=', user.login)])[0] - empl = self.pool.get('hr.employee').browse(cr, uid, empl_id, context=context) + empl = self.pool.get('hr.employee').browse( + cr, uid, empl_id, context=context) if empl.work_email: emails += empl.work_email emails += ',' @@ -113,9 +119,12 @@ class document_page_history_wkfl(orm.Model): res = {} for id in ids: base_url = self.pool.get('ir.config_parameter').get_param( - cr, uid, 'web.base.url', default='http://localhost:8069', context=context) + cr, uid, 'web.base.url', default='http://localhost:8069', + context=context) - res[id] = base_url + '/#db=%s&id=%s&view_type=form&model=document.page.history' % (cr.dbname, id) + res[id] = base_url + ( + '/#db=%s&id=%s&view_type=form&model=document.page.history' % + (cr.dbname, id)) return res @@ -129,10 +138,13 @@ class document_page_history_wkfl(orm.Model): 'page_id', 'is_parent_approval_required', string="parent approval", type='boolean', 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, string="can user approve this page", + type='boolean', store=False), 'get_approvers_email': fields.function( - get_approvers_email, string="get all approvers email", type='text', store=False), - 'get_page_url': fields.function(get_page_url, string="URL", type='text', store=False), + get_approvers_email, string="get all approvers email", + type='text', store=False), + 'get_page_url': fields.function(get_page_url, string="URL", + type='text', store=False), } @@ -153,7 +165,8 @@ class document_page_approval(orm.Model): ('page_id', '=', page.id), ('state', '=', 'approved') ], limit=1, order='create_date DESC') - for h in history.browse(cr, uid, history_ids, context=context): + for h in history.browse(cr, uid, history_ids, + context=context): content = h.content else: content = page.content @@ -186,7 +199,8 @@ class document_page_approval(orm.Model): history = self.pool.get('document.page.history') history_ids = history.search(cr, uid, [ ('page_id', '=', page.id), - ('state', '=', 'approved')], limit=1, order='create_date DESC') + ('state', '=', 'approved')], limit=1, + order='create_date DESC') approved_uid = False for h in history.browse(cr, uid, history_ids): approved_uid = h.approved_uid.id @@ -196,7 +210,8 @@ class document_page_approval(orm.Model): return res - def _is_parent_approval_required(self, cr, uid, ids, name, args, context=None): + def _is_parent_approval_required(self, cr, uid, ids, name, args, + context=None): res = {} for page in self.browse(cr, uid, ids, context=context): res[page.id] = self.is_approval_required(page) @@ -213,11 +228,16 @@ class document_page_approval(orm.Model): return res _columns = { - 'display_content': fields.function(_get_display_content, string='Displayed Content', type='text'), - 'approved_date': fields.function(_get_approved_date, string="Approved Date", type='datetime'), - 'approved_uid': fields.function(_get_approved_uid, string="Approved By", type='many2one', obj='res.users'), + 'display_content': fields.function( + _get_display_content, string='Displayed Content', type='text'), + 'approved_date': fields.function( + _get_approved_date, string="Approved Date", type='datetime'), + 'approved_uid': fields.function( + _get_approved_uid, string="Approved By", type='many2one', + obj='res.users'), 'approval_required': fields.boolean("Require approval"), 'is_parent_approval_required': fields.function( - _is_parent_approval_required, string="parent approval", type='boolean'), + _is_parent_approval_required, string="parent approval", + type='boolean'), 'approver_gid': fields.many2one("res.groups", "Approver group"), }