[MERGE] HR

bzr revid: fp@openerp.com-20120916160953-8bssla7rcll6gf8g

addons/hr/hr_view.xml

@@ -332,6 +332,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('category_ids','=', active_ids)]</field>
+            <field name="context">{'default_category_ids': active_ids}</field>
         </record>
 
         <record id="hr_employee_category_open" model="ir.values">

addons/hr_payroll/hr_payroll_view.xml

@@ -99,8 +99,8 @@
         <menuitem
             id="menu_hr_payroll_structure_view"
             action="action_view_hr_payroll_structure_list_form"
-            parent="hr.menu_hr_configuration"
-            sequence="20"
+            parent="payroll_configure"
+            sequence="2"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
             <field name="name">Salary Structures Hierarchy</field>

addons/hr_recruitment/hr_recruitment_view.xml

@@ -337,7 +337,7 @@
             <field name="no_of_recruitment" version="7.0" position="after">
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
-                    <field name="survey_id" class="oe_inline"/>
+                    <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
                     <button class="oe_inline"
                         string="Interview"
                         name="action_print_survey" type="object"

addons/survey/survey.py

@@ -35,7 +35,7 @@ class survey_type(osv.osv):
     _name = 'survey.type'
     _description = 'Survey Type'
     _columns = {
-        'name': fields.char("Name", size=128, required=1),
+        'name': fields.char("Name", size=128, required=1, translate=True),
         'code': fields.char("Code", size=64),
     }
 survey_type()