Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-configuration-pso-imp-pna
into lp:~openerp-dev/openobject-addons/trunk-addons-hr-configuration-pso.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-configuration-pso-imp-pna/+merge/122468
Hello Sir,
I improved hr configuration.
Thanks,
pna
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-configuration-pso-imp-pna/+merge/122468
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-hr-configuration-pso.
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-08-29 11:48:47 +0000
+++ hr/hr_view.xml 2012-09-03 08:56:08 +0000
@@ -324,7 +324,8 @@
<field name="res_model">hr.employee</field>
<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>
+ <field name="domain">[('category_ids','in', active_ids)]</field>
</record>
<record id="hr_employee_category_open" model="ir.values">
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2012-08-08 12:48:39 +0000
+++ hr_payroll/hr_payroll_view.xml 2012-09-03 08:56:08 +0000
@@ -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>
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml 2012-08-16 23:33:47 +0000
+++ hr_recruitment/hr_recruitment_view.xml 2012-09-03 08:56:08 +0000
@@ -338,7 +338,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" icon="gtk-print"
name="action_print_survey" type="object"
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
