[IMP] adapt rights and display for the jobs form view

bzr revid: abo@openerp.com-20120604124417-jb6v3lal9a55dxk5

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9d1ba1c..da8e16b 100644 (file)
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -105,7 +105,7 @@ class hr_job(osv.osv):
             },
             multi='no_of_employee'),
         'no_of_recruitment': fields.float('Expected in Recruitment'),
-        'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'),
+        'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees', groups='base.group_user'),
         'description': fields.text('Job Description'),
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 32eb3a8..8654a55 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,7 @@
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25" groups="base.group_no_one"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1"/>
         <menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
 
         <!--
@@ -25,13 +25,13 @@
                 <form string="Employee">
                     <group colspan="4" col="8">
                         <group colspan="6" col="6">
-                        <field colspan="6" name="name" />
+                        <field colspan="6" name="name"/>
                         <field name="user_id" on_change="onchange_user(user_id)"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                         <field name="active"/>
                         <newline/>
-                        <field name="department_id" on_change="onchange_department_id(department_id)" />
-                        <field name="parent_id" />
+                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <field name="parent_id"/>
                         </group>
                         <group colspan="2" col="1">
                           <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
@@ -57,16 +57,16 @@
                             <group col="2" colspan="2">
                                 <separator string="Contact Information" colspan="2"/>
                                 <field name="address_home_id" colspan="2"/>
-                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" />
+                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)"/>
                                 <field name="work_phone"/>
                                 <field name="mobile_phone"/>
-                                <field name="work_email" widget="email" />
+                                <field name="work_email" widget="email"/>
                                 <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator string="Job Information" colspan="2"/>
                                 <field name="job_id" domain="[('state','!=','old')]"/>
-                                <field name="coach_id" />
+                                <field name="coach_id"/>
                             </group>
                         </page>
                         <page string="Categories" groups="base.group_hr_user">
@@ -93,7 +93,7 @@
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="parent_id"/>
-                    <field name="coach_id" invisible="1" />
+                    <field name="coach_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -110,11 +110,11 @@
                     <field name="job_id" widget="selection"/>
                     <field name="category_ids" select="1"/>
                     <field name="parent_id"/>
-                    <newline />
+                    <newline/>
                     <group expand="0" string="Group By...">
                     <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
                     <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
-                    <separator orientation="vertical" />
+                    <separator orientation="vertical"/>
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
                     <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
@@ -235,7 +235,7 @@
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="department_id"/>
                     <field name="job_id"/>
-                    <field name="coach_id" invisible="1" />
+                    <field name="coach_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -271,10 +271,10 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee Category">
-                    <field name="name" />
-                    <field name="parent_id" />
-                    <separator string="Employees" colspan="4" />
-                    <field name="employee_ids" colspan="4" nolabel="1" />
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <separator string="Employees" colspan="4"/>
+                    <field name="employee_ids" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -347,9 +347,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                    <button name="job_open" string="In Position" states="old,recruit" type="object"/>
-                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+                    <span groups="base.group_user">
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                        <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                        <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
+                    </span>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
                     </div>
@@ -357,8 +359,8 @@
                 </div>
                 <sheet string="Job" layout="auto">
                     <group col="6" colspan="4">
-                    <field name="name" />
-                    <field name="department_id" />
+                    <field name="name"/>
+                    <field name="department_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <newline/>
                     <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
@@ -373,7 +375,7 @@
                             <separator colspan="4" string="Requirements"/>
                             <field name="requirements" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Employees">
+                        <page string="Employees" groups="base.group_user">
                             <field name="employee_ids" colspan="4" nolabel="1" widget="many2many" mode="tree,form"/>
                         </page>
                     </notebook>
@@ -388,8 +390,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Job">
-                    <field name="name" />
-                    <field name="department_id" />
+                    <field name="name"/>
+                    <field name="department_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="expected_employees"/>
                     <field name="no_of_employee"/>
@@ -415,7 +417,7 @@
                     <field name="name"/>
                     <field name="department_id" widget="selection">
                     </field>
-                    <newline />
+                    <newline/>
                     <group expand="0" string="Group By...">
                     <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>

diff --git a/addons/portal_jobs/security/ir.model.access.csv b/addons/portal_jobs/security/ir.model.access.csv
index 5f33eb4..0725d1e 100644 (file)
--- a/addons/portal_jobs/security/ir.model.access.csv
+++ b/addons/portal_jobs/security/ir.model.access.csv
@@ -1,2 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_job,job,hr.model_hr_job,portal.group_portal_member,1,0,0,0
+access_hr_department_employee,hr_department_employee,hr.model_hr_department,portal.group_portal_member,1,0,0,0