Skip to content
Extraits de code Groupes Projets
Valider cd142f19 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

Merge branch '12.0' of https://bitbucket.org/lefilament/cgscop_timesheet into 12.0

parents 558a4061 4abc4100
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -22,4 +22,3 @@ class ScopHrTimesheet(models.Model): ...@@ -22,4 +22,3 @@ class ScopHrTimesheet(models.Model):
@api.onchange('project_id') @api.onchange('project_id')
def onchange_project_id(self): def onchange_project_id(self):
self.partner_id = self.project_id.partner_id self.partner_id = self.project_id.partner_id
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo> <odoo>
<data noupdate="1"> <data noupdate="0">
<record id="ur_financial_system_rule_ur" model="ir.rule"> <record id="ur_financial_system_rule_ur" model="ir.rule">
<field name="name">ur financial system rule per ur</field> <field name="name">ur financial system rule per ur</field>
......
...@@ -5,6 +5,20 @@ ...@@ -5,6 +5,20 @@
<odoo> <odoo>
<data> <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 --> <!-- Tree View Timesheet CG -->
<record id="view_cgscop_hr_timesheet_line_tree" model="ir.ui.view"> <record id="view_cgscop_hr_timesheet_line_tree" model="ir.ui.view">
<field name="name">account.analytic.line.timesheet.cgscop</field> <field name="name">account.analytic.line.timesheet.cgscop</field>
...@@ -17,7 +31,7 @@ ...@@ -17,7 +31,7 @@
<attribute name="string">Code activité UR</attribute> <attribute name="string">Code activité UR</attribute>
</field> </field>
<field name="project_id" position="after" > <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 name="name" class="td-minwidth" />
</field> </field>
<field name="task_id" position="attributes"> <field name="task_id" position="attributes">
...@@ -49,5 +63,10 @@ ...@@ -49,5 +63,10 @@
<field name="view_mode">tree,form,pivot,graph</field> <field name="view_mode">tree,form,pivot,graph</field>
</record> </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> </data>
</odoo> </odoo>
\ No newline at end of file
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter