Amit Patel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-general-pso into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-general-pso/+merge/124682
Hello,
A person (hr/employee access rights) clicking on his own employee in Human
Resources => Employee cannot access timesheets or payslips related from that
page (but he can access timesheets from the timesheets menu). clicking on
timesheets or payslips results in an error ("access denied")
In the human resoucres config wizard, when checking "Manage Payroll", then on
"install your Country's Payroll", we should see only the "Belgium Payroll"
module but not the "Belgium Payroll with Accounting" one.
Human Resources => employees, during employee creation: in the personal
information tab, marital status is automatically set to single
removed the default value on marital status.
Thanks,
Amit
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-general-pso/+merge/124682
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-hr-general-pso.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-09-10 17:02:02 +0000
+++ hr/hr.py 2012-09-17 13:35:16 +0000
@@ -261,7 +261,6 @@
_defaults = {
'active': 1,
'image': _get_default_image,
- 'marital': 'single',
'color': 0,
}
=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml 2012-09-16 11:42:49 +0000
+++ hr/res_config_view.xml 2012-09-17 13:35:16 +0000
@@ -17,7 +17,8 @@
<field name="name">Payroll</field>
<field name="res_model">ir.module.module</field>
<field name="view_mode">kanban,tree,form</field>
- <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'payroll'}"/>
+ <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization')}"/>
+ <field name="domain">[('name','=','l10n_be_hr_payroll')]</field>
<field name="search_view_id" ref="base.view_module_filter"/>
</record>
=== modified file 'hr_contract/hr_contract_view.xml'
--- hr_contract/hr_contract_view.xml 2012-09-07 08:43:10 +0000
+++ hr_contract/hr_contract_view.xml 2012-09-17 13:35:16 +0000
@@ -21,7 +21,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//div[@name='button_box']" position="inside">
- <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action"/>
+ <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action" groups="base.group_hr_manager"/>
</xpath>
<xpath expr="//field[@name='coach_id']" position="after">
<field name="manager"/>
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-09-07 08:43:10 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-09-17 13:35:16 +0000
@@ -522,7 +522,7 @@
</group>
</xpath>
<xpath expr="//div[@name='button_box']" position="inside">
- <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+ <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_manager"/>
</xpath>
</field>
</record>
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2012-09-13 06:30:35 +0000
+++ hr_payroll/hr_payroll_view.xml 2012-09-17 13:35:16 +0000
@@ -369,7 +369,7 @@
<field name="view_id" ref="view_hr_payslip_tree"/>
<field name="search_view_id" ref="view_hr_payslip_filter"/>
</record>
- <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
+ <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_manager"/>
<act_window name="Payslips"
context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
res_model="hr.payslip"
@@ -386,7 +386,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//div[@name='button_box']" position="inside">
- <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+ <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" groups="base.group_hr_manager"/>
</xpath>
</data>
</field>
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-09-13 10:26:48 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml 2012-09-17 13:35:16 +0000
@@ -187,7 +187,7 @@
</record>
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
- sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
+ sequence="2" groups="base.group_hr_manager"/>
<!--
Company inheritancy
@@ -350,7 +350,7 @@
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@name='button_box']" position="inside">
- <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+ <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" groups="base.group_hr_manager"/>
</xpath>
</field>
</record>
_______________________________________________
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
