Skip to content

Commit

Permalink
[FIX] replace not existing group
Browse files Browse the repository at this point in the history
  • Loading branch information
Iryna Vyshnevska committed Mar 12, 2019
1 parent b076fd6 commit 9d7ddc0
Show file tree
Hide file tree
Showing 38 changed files with 132 additions and 132 deletions.
4 changes: 2 additions & 2 deletions hr_contract_hourly_rate/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_hourly_rate_manager,hr.hourly.rate.manager,model_hr_hourly_rate,base.group_hr_manager,1,1,1,1
access_hr_hourly_rate_class_manager,hrhourly_.rate.class.manager,model_hr_hourly_rate_class,base.group_hr_manager,1,1,1,1
access_hr_hourly_rate_manager,hr.hourly.rate.manager,model_hr_hourly_rate,hr.group_hr_manager,1,1,1,1
access_hr_hourly_rate_class_manager,hrhourly_.rate.class.manager,model_hr_hourly_rate_class,hr.group_hr_manager,1,1,1,1
4 changes: 2 additions & 2 deletions hr_contract_init/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_contract_init_hro,access_hr_contract_initial,model_hr_contract_init,base.group_hr_user,1,0,0,0
access_hr_contract_init_hro,access_hr_contract_initial,model_hr_contract_init,hr.group_hr_user,1,0,0,0
access_hr_contract_init_hrd,access_hr_contract_initial,model_hr_contract_init,hr_security.group_hr_director,1,1,1,1
access_hr_contract_init_payroll,access_hr_contract_initial,model_hr_contract_init,hr_security.group_payroll_manager,1,0,0,0
access_hr_contract_init_wage_hro,access_hr_contract_initial_wage,model_hr_contract_init_wage,base.group_hr_user,1,0,0,0
access_hr_contract_init_wage_hro,access_hr_contract_initial_wage,model_hr_contract_init_wage,hr.group_hr_user,1,0,0,0
access_hr_contract_init_wage_hrd,access_hr_contract_initial_wage,model_hr_contract_init_wage,hr_security.group_hr_director,1,1,1,1
access_hr_contract_init_wage_payroll,access_hr_contract_initial_wage,model_hr_contract_init_wage,hr_security.group_payroll_manager,1,0,0,0
2 changes: 1 addition & 1 deletion hr_contract_multi_jobs/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_contract_job_manager,hr.contract.job.manager,model_hr_contract_job,base.group_hr_manager,1,1,1,1
access_hr_contract_job_manager,hr.contract.job.manager,model_hr_contract_job,hr.group_hr_manager,1,1,1,1
2 changes: 1 addition & 1 deletion hr_contract_state/hr_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def _needaction_domain_get(self, cr, uid, context=None):
users_obj = self.pool.get('res.users')
domain = []

if users_obj.has_group(cr, uid, 'base.group_hr_manager'):
if users_obj.has_group(cr, uid, 'hr.group_hr_manager'):
domain = [
('state', 'in', ['draft', 'contract_ending', 'trial_ending'])]
return domain
Expand Down
16 changes: 8 additions & 8 deletions hr_contract_state/hr_contract_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<menuitem name="Contracts"
id="submenu_hr_contracts"
parent="hr.menu_hr_main"
sequence="100" groups="base.group_hr_user"/>
sequence="100" groups="hr.group_hr_user"/>

<!-- Remove stock Contracts menuitem and put it in the submenu -->
<menuitem action="hr_contract.action_hr_contract" id="hr_contract.hr_menu_contract" parent="submenu_hr_contracts" name="Contracts" sequence="10" groups="base.group_hr_user"/>
<menuitem action="hr_contract.action_hr_contract" id="hr_contract.hr_menu_contract" parent="submenu_hr_contracts" name="Contracts" sequence="10" groups="hr.group_hr_user"/>

<record id="hr_contract_view_tree" model="ir.ui.view">
<field name="name">hr.contract.tree.state</field>
Expand Down Expand Up @@ -58,7 +58,7 @@
<menuitem action="open_expiring_contracts"
id="menu_expiring_contracts"
parent="submenu_hr_contracts"
groups="base.group_hr_user"
groups="hr.group_hr_user"
sequence="20"/>

<record id="view_draft_contracts_tree" model="ir.ui.view">
Expand Down Expand Up @@ -92,7 +92,7 @@
<menuitem action="open_draft_contracts"
id="menu_draft_contracts"
parent="submenu_hr_contracts"
groups="base.group_hr_user"
groups="hr.group_hr_user"
sequence="30"/>

<!-- HR Contract: Form View -->
Expand All @@ -105,11 +105,11 @@
<xpath expr="//div[@class='oe_title']" position="before">
<header>
<button name="signal_confirm" type="workflow" string="Confirm"
groups="base.group_hr_manager" states="draft" class="oe_highlight"/>
groups="hr.group_hr_manager" states="draft" class="oe_highlight"/>
<button name="signal_open" type="workflow" string="Trial Successful"
groups="base.group_hr_manager" states="trial_ending" class="oe_highlight"/>
groups="hr.group_hr_manager" states="trial_ending" class="oe_highlight"/>
<button name="signal_done" type="workflow" string="End Contract"
groups="base.group_hr_manager" states="trial,trial_ending,open,contract_ending,pending_done" class="oe_highlight"/>
groups="hr.group_hr_manager" states="trial,trial_ending,open,contract_ending,pending_done" class="oe_highlight"/>
<field name="state" widget="statusbar"/>
</header>
</xpath>
Expand Down Expand Up @@ -151,7 +151,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//button[@string='Contracts']" position="replace">
<button name="%(hr_contract.act_hr_employee_2_hr_contract)d" string="Contracts" type="action" groups="base.group_hr_user"/>
<button name="%(hr_contract.act_hr_employee_2_hr_contract)d" string="Contracts" type="action" groups="hr.group_hr_user"/>
</xpath>
</data>
</field>
Expand Down
30 changes: 15 additions & 15 deletions hr_contract_state/hr_contract_workflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,106 +69,106 @@
<field name="act_to" ref="act_trial"/>
<field name="condition">condition_trial_period() == True</field>
<field name="signal">signal_confirm</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="draft2open" model="workflow.transition">
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_open"/>
<field name="condition">condition_trial_period() == False</field>
<field name="signal">signal_confirm</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="trial2end_trial" model="workflow.transition">
<field name="act_from" ref="act_trial"/>
<field name="act_to" ref="act_trial_ending"/>
<field name="signal">signal_ending_trial</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="trial2pending_done" model="workflow.transition">
<field name="act_from" ref="act_trial"/>
<field name="act_to" ref="act_pending_done"/>
<field name="signal">signal_pending_done</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="trial2done" model="workflow.transition">
<field name="act_from" ref="act_trial"/>
<field name="act_to" ref="act_done"/>
<field name="signal">signal_done</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="end_trial2open" model="workflow.transition">
<field name="act_from" ref="act_trial_ending"/>
<field name="act_to" ref="act_open"/>
<field name="signal">signal_open</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="end_trial2pending_done" model="workflow.transition">
<field name="act_from" ref="act_trial_ending"/>
<field name="act_to" ref="act_pending_done"/>
<field name="signal">signal_pending_done</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="end_trial2done" model="workflow.transition">
<field name="act_from" ref="act_trial_ending"/>
<field name="act_to" ref="act_done"/>
<field name="signal">signal_done</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="open2end_contract" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_contract_ending"/>
<field name="signal">signal_ending_contract</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="open2pending_done" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_pending_done"/>
<field name="signal">signal_pending_done</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="open2done" model="workflow.transition">
<field name="act_from" ref="act_open"/>
<field name="act_to" ref="act_done"/>
<field name="signal">signal_done</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="end_contract2pending_done" model="workflow.transition">
<field name="act_from" ref="act_contract_ending"/>
<field name="act_to" ref="act_pending_done"/>
<field name="signal">signal_pending_done</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="end_contract2done" model="workflow.transition">
<field name="act_from" ref="act_contract_ending"/>
<field name="act_to" ref="act_done"/>
<field name="signal">signal_done</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="pending_done2open" model="workflow.transition">
<field name="act_from" ref="act_pending_done"/>
<field name="act_to" ref="act_open"/>
<field name="signal">signal_open</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="pending_done2done" model="workflow.transition">
<field name="act_from" ref="act_pending_done"/>
<field name="act_to" ref="act_done"/>
<field name="signal">signal_done</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

</data>
Expand Down
4 changes: 2 additions & 2 deletions hr_contract_state/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_contract_user,access_hr_contract,model_hr_contract,base.group_hr_user,1,1,1,1
access_hr_contract_type_user,access_hr_contract_type,hr_contract.model_hr_contract_type,base.group_hr_user,1,0,0,0
access_hr_contract_user,access_hr_contract,model_hr_contract,hr.group_hr_user,1,1,1,1
access_hr_contract_type_user,access_hr_contract_type,hr_contract.model_hr_contract_type,hr.group_hr_user,1,0,0,0
10 changes: 5 additions & 5 deletions hr_employee_benefit/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_employee_benefit_category,access_hr_employee_benefit_category,model_hr_employee_benefit_category,base.group_hr_manager,1,1,1,1
access_hr_employee_benefit,access_hr_employee_benefit,model_hr_employee_benefit,base.group_hr_manager,1,1,1,1
access_hr_employee_benefit_rate,access_hr_employee_benefit_rate,model_hr_employee_benefit_rate,base.group_hr_manager,1,1,1,1
access_hr_employee_benefit_rate_line,access_hr_employee_benefit_rate_line,model_hr_employee_benefit_rate_line,base.group_hr_manager,1,1,1,1
access_hr_payslip_benefit_line,access_hr_payslip_benefit_line,model_hr_payslip_benefit_line,base.group_hr_manager,1,1,1,1
access_hr_employee_benefit_category,access_hr_employee_benefit_category,model_hr_employee_benefit_category,hr.group_hr_manager,1,1,1,1
access_hr_employee_benefit,access_hr_employee_benefit,model_hr_employee_benefit,hr.group_hr_manager,1,1,1,1
access_hr_employee_benefit_rate,access_hr_employee_benefit_rate,model_hr_employee_benefit_rate,hr.group_hr_manager,1,1,1,1
access_hr_employee_benefit_rate_line,access_hr_employee_benefit_rate_line,model_hr_employee_benefit_rate_line,hr.group_hr_manager,1,1,1,1
access_hr_payslip_benefit_line,access_hr_payslip_benefit_line,model_hr_payslip_benefit_line,hr.group_hr_manager,1,1,1,1
2 changes: 1 addition & 1 deletion hr_infraction/hr_infraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class hr_infraction(orm.Model):
def _needaction_domain_get(self, cr, uid, context=None):
users_obj = self.pool.get('res.users')
domain = []
if users_obj.has_group(cr, uid, 'base.group_hr_manager'):
if users_obj.has_group(cr, uid, 'hr.group_hr_manager'):
domain = [('state', '=', 'confirm')]
if len(domain) == 0:
return False
Expand Down
8 changes: 4 additions & 4 deletions hr_infraction/hr_infraction_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<data>

<!-- Menu Parent -->
<menuitem id="menu_hr_infraction_root" name="Infractions" parent="hr.menu_hr_root" groups="base.group_hr_user" sequence="27"/>
<menuitem id="menu_hr_infraction_root" name="Infractions" parent="hr.menu_hr_root" groups="hr.group_hr_user" sequence="27"/>

<!-- Infraction Categories -->

Expand Down Expand Up @@ -64,9 +64,9 @@
<field name="arch" type="xml">
<form string="Infraction" version="7.0">
<header>
<button name="signal_confirm" type="workflow" states="draft" groups="base.group_hr_user" string="Confirm" class="oe_highlight"/>
<button name="%(action_action_wizard)s" type="action" states="confirm,action" groups="base.group_hr_manager" string="Take Action" class="oe_highlight"/>
<button name="signal_noaction" type="workflow" states="confirm" groups="base.group_hr_manager" string="No Further Action" class="oe_highlight"/>
<button name="signal_confirm" type="workflow" states="draft" groups="hr.group_hr_user" string="Confirm" class="oe_highlight"/>
<button name="%(action_action_wizard)s" type="action" states="confirm,action" groups="hr.group_hr_manager" string="Take Action" class="oe_highlight"/>
<button name="signal_noaction" type="workflow" states="confirm" groups="hr.group_hr_manager" string="No Further Action" class="oe_highlight"/>
<field name="state" widget="statusbar"/>
</header>
<group>
Expand Down
6 changes: 3 additions & 3 deletions hr_infraction/hr_infraction_workflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@
<field name="act_from" ref="act_draft"/>
<field name="act_to" ref="act_confirm"/>
<field name="signal">signal_confirm</field>
<field name="group_id" ref="base.group_hr_user"/>
<field name="group_id" ref="hr.group_hr_user"/>
</record>

<record id="confirm2action" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
<field name="act_to" ref="act_action"/>
<field name="signal">signal_action</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

<record id="confirm2noaction" model="workflow.transition">
<field name="act_from" ref="act_confirm"/>
<field name="act_to" ref="act_noaction"/>
<field name="signal">signal_noaction</field>
<field name="group_id" ref="base.group_hr_manager"/>
<field name="group_id" ref="hr.group_hr_manager"/>
</record>

</data>
Expand Down
14 changes: 7 additions & 7 deletions hr_infraction/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_infraction_user,access_hr_infraction,model_hr_infraction,base.group_hr_user,1,1,1,1
access_hr_infraction_action_user,access_hr_infraction_action,model_hr_infraction_action,base.group_hr_user,1,0,0,0
access_hr_infraction_action_manager,access_hr_infraction_action,model_hr_infraction_action,base.group_hr_manager,1,1,1,1
access_hr_infraction_warning_user,access_hr_infraction_warning,model_hr_infraction_warning,base.group_hr_user,1,0,0,0
access_hr_infraction_warning_manager,access_hr_infraction_warning,model_hr_infraction_warning,base.group_hr_manager,1,1,1,1
access_hr_infraction_category_user,access_hr_infraction_category,model_hr_infraction_category,base.group_hr_user,1,0,0,0
access_hr_infraction_category_manager,access_hr_infraction_category,model_hr_infraction_category,base.group_hr_manager,1,1,1,1
access_hr_infraction_user,access_hr_infraction,model_hr_infraction,hr.group_hr_user,1,1,1,1
access_hr_infraction_action_user,access_hr_infraction_action,model_hr_infraction_action,hr.group_hr_user,1,0,0,0
access_hr_infraction_action_manager,access_hr_infraction_action,model_hr_infraction_action,hr.group_hr_manager,1,1,1,1
access_hr_infraction_warning_user,access_hr_infraction_warning,model_hr_infraction_warning,hr.group_hr_user,1,0,0,0
access_hr_infraction_warning_manager,access_hr_infraction_warning,model_hr_infraction_warning,hr.group_hr_manager,1,1,1,1
access_hr_infraction_category_user,access_hr_infraction_category,model_hr_infraction_category,hr.group_hr_user,1,0,0,0
access_hr_infraction_category_manager,access_hr_infraction_category,model_hr_infraction_category,hr.group_hr_manager,1,1,1,1
access_hr_infraction_pm,access_hr_infraction,hr_infraction.model_hr_infraction,hr_security.group_payroll_manager,1,0,0,0
access_hr_infraction_action_pm,access_hr_infraction_action,hr_infraction.model_hr_infraction_action,hr_security.group_payroll_manager,1,0,0,0
access_hr_infraction_warning_pm,access_hr_infraction_warning,hr_infraction.model_hr_infraction_warning,hr_security.group_payroll_manager,1,0,0,0
Expand Down
4 changes: 2 additions & 2 deletions hr_job_categories/views/hr_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<field name="inherit_id" ref="hr.view_hr_job_form"/>
<field name="arch" type="xml">
<xpath expr="//div[@class='oe_title']" position="inside">
<label for="category_ids" class="oe_edit_only" groups="base.group_hr_manager"/>
<field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="base.group_hr_manager"/>
<label for="category_ids" class="oe_edit_only" groups="hr.group_hr_manager"/>
<field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time" groups="hr.group_hr_manager"/>
</xpath>
</field>
</record>
Expand Down
4 changes: 2 additions & 2 deletions hr_payroll_register/security/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_hr_payroll_register_user,access_hr_payroll_register,model_hr_payroll_register,base.group_hr_user,1,0,0,0
access_hr_payroll_register_hrm,access_hr_payroll_register,model_hr_payroll_register,base.group_hr_manager,1,1,1,1
access_hr_payroll_register_user,access_hr_payroll_register,model_hr_payroll_register,hr.group_hr_user,1,0,0,0
access_hr_payroll_register_hrm,access_hr_payroll_register,model_hr_payroll_register,hr.group_hr_manager,1,1,1,1
Loading

0 comments on commit 9d7ddc0

Please sign in to comment.