diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml index 3f7e6804d9b..1f0d830657e 100644 --- a/addons/portal/portal_data.xml +++ b/addons/portal/portal_data.xml @@ -11,6 +11,7 @@ mail.group form + inline diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py index ec5d821d280..b7c25c2274f 100644 --- a/addons/portal_hr_employees/__openerp__.py +++ b/addons/portal_hr_employees/__openerp__.py @@ -33,7 +33,6 @@ portal_crm (which creates the contact page) are installed. 'depends': ['hr','portal_crm'], 'data': [ 'portal_hr_employee_view.xml', - 'security/portal_crm_security.xml', 'security/ir.model.access.csv', ], 'installable': True, @@ -42,9 +41,6 @@ portal_crm (which creates the contact page) are installed. 'css': [ 'static/src/css/portal_hr_employees.css', ], - 'js': [ - 'static/src/js/portal_hr_employees.js', - ], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py index d14b2400889..a4630ba3b3e 100644 --- a/addons/portal_hr_employees/hr_employee.py +++ b/addons/portal_hr_employees/hr_employee.py @@ -46,11 +46,10 @@ class hr_employee(osv.osv): """ ``visibility``: defines if the employee appears on the portal's contact page - 'public' means the employee will appear for everyone (anonymous) - - 'portal' means the employee will appear for portal users only - 'private' means the employee won't appear """ _columns = { - 'visibility': fields.selection([('public', 'Public'),('portal', 'Portal'),('private', 'Private')], + 'visibility': fields.selection([('public', 'Public'),('private', 'Private')], string='Visibility', help='Employee\'s visibility in the portal\'s contact page'), } _defaults = { diff --git a/addons/portal_hr_employees/security/portal_crm_security.xml b/addons/portal_hr_employees/security/portal_crm_security.xml deleted file mode 100644 index 2fb26abe7ec..00000000000 --- a/addons/portal_hr_employees/security/portal_crm_security.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -