diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py index 05e8fcd264e2282b63fef6a55ff8a373362e94bc..645a51a2b5d8a82552bad19562e8f77e6b4dd428 100644 --- a/models/hr_timesheet.py +++ b/models/hr_timesheet.py @@ -22,4 +22,3 @@ class ScopHrTimesheet(models.Model): @api.onchange('project_id') def onchange_project_id(self): self.partner_id = self.project_id.partner_id - diff --git a/security/security_rules.xml b/security/security_rules.xml index 065bd4e0f8d766245f040d9ffdef7bb14b83b30d..5a305326587dbbb5332c426ff81173ae1176de55 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -3,7 +3,7 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <odoo> - <data noupdate="1"> + <data noupdate="0"> <record id="ur_financial_system_rule_ur" model="ir.rule"> <field name="name">ur financial system rule per ur</field> diff --git a/views/hr_timesheet.xml b/views/hr_timesheet.xml index 4d870b628da53c9738b5d350f47337107646e1fe..6b0d53577e9d4aff532dc182b88a3734b32ea44c 100644 --- a/views/hr_timesheet.xml +++ b/views/hr_timesheet.xml @@ -5,6 +5,20 @@ <odoo> <data> + <record id="cgscop_hr_timesheet_line_search" model="ir.ui.view"> + <field name="name">cgscop.hr.timesheet.line.search</field> + <field name="model">account.analytic.line</field> + <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/> + <field name="arch" type="xml"> + <xpath expr="//filter[@name='groupby_task']" position="replace"> + <filter string="Contact" name="groupby_partner" domain="[]" context="{'group_by':'partner_id'}"/> + </xpath> + <xpath expr="//filter[@name='groupby_project']" position="attributes"> + <attribute name="string">Code activité UR</attribute> + </xpath> + </field> + </record> + <!-- Tree View Timesheet CG --> <record id="view_cgscop_hr_timesheet_line_tree" model="ir.ui.view"> <field name="name">account.analytic.line.timesheet.cgscop</field> @@ -17,7 +31,7 @@ <attribute name="string">Code activité UR</attribute> </field> <field name="project_id" position="after" > - <field name="partner_id" domain="[('is_company', '=', True)]" required="True" class="td-ellipsis" options="{'no_open': True, 'no_create': True}" /> + <field name="partner_id" domain="[('is_company', '=', True)]" required="True" class="td-ellipsis" options="{'no_open': True, 'no_create': True}" string="Contact"/> <field name="name" class="td-minwidth" /> </field> <field name="task_id" position="attributes"> @@ -49,5 +63,10 @@ <field name="view_mode">tree,form,pivot,graph</field> </record> + <!-- ajoute des droits sur le menu Configuration --> + <record model="ir.ui.menu" id="hr_timesheet.hr_timesheet_menu_configuration"> + <field name="groups_id" eval="[(6,0, [ref('hr_timesheet.group_timesheet_manager'), ref('cgscop_partner.group_cg_administrator'), ref('cgscop_partner.group_ur_list_modif')])]"/> + </record> + </data> </odoo> \ No newline at end of file