Merge pull request #21 from hbrunn/7.0-travis-2014-10-20

[FIX] coding style issues
This commit is contained in:
Pedro M. Baeza 2014-10-24 15:56:00 +02:00
commit 7720a1acd6
4 changed files with 6 additions and 6 deletions

View File

@ -45,13 +45,13 @@ Scenario
'depends': [ 'depends': [
'document_page', 'document_page',
'email_template', 'email_template',
], ],
'data': [ 'data': [
'document_page_wkfl.xml', 'document_page_wkfl.xml',
'document_page_view.xml', 'document_page_view.xml',
'security/document_page_security.xml', 'security/document_page_security.xml',
'security/ir.model.access.csv', 'security/ir.model.access.csv',
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
'images': [ 'images': [

View File

@ -145,7 +145,7 @@ class document_page_history_wkfl(orm.Model):
type='text', store=False), type='text', store=False),
'get_page_url': fields.function(get_page_url, string="URL", 'get_page_url': fields.function(get_page_url, string="URL",
type='text', store=False), type='text', store=False),
} }
class document_page_approval(orm.Model): class document_page_approval(orm.Model):

View File

@ -31,11 +31,11 @@ This module adds a company field to document page and the multi-company rule.
""", """,
'depends': [ 'depends': [
'document_page', 'document_page',
], ],
'data': [ 'data': [
'security/document_page_security.xml', 'security/document_page_security.xml',
'document_page_multi_company_view.xml', 'document_page_multi_company_view.xml',
], ],
'installable': True, 'installable': True,
'auto_install': False, 'auto_install': False,
'images': [], 'images': [],

View File

@ -55,4 +55,4 @@ class AddUrlWizard(orm.TransientModel):
'res_model': context['active_model'], 'res_model': context['active_model'],
} }
attachment_obj.create(cr, uid, attachment, context=context) attachment_obj.create(cr, uid, attachment, context=context)
return {'type': 'ir.actions.act_close_wizard_and_reload_view'} return {'type': 'ir.actions.act_close_wizard_and_reload_view'}