diff --git a/__manifest__.py b/__manifest__.py index c2945e9b98f816d83e324cfcb593c0cf884ba093..f4efbabbfa973207a3916a5fc1b10d79aff2b78d 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -13,6 +13,7 @@ "data": [ "security/security_rules.xml", "views/calendar.xml", + "views/hr_timesheet.xml", "wizard/calendar_event_transform.xml", ], 'qweb': [ diff --git a/models/__init__.py b/models/__init__.py index 2acdbb1e9f1bbe372187dd982d97d817bbaf4543..d014ecac84b3ef4546616be335d35937e71eecaa 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -2,4 +2,5 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import calendar +from . import hr_timesheet diff --git a/models/calendar.py b/models/calendar.py index 80a5d4dd98ab6ee48bb006d17998e52b2f0bca1c..0635c8d3358eaddb5fc21da29a6debf8712eef1f 100644 --- a/models/calendar.py +++ b/models/calendar.py @@ -49,7 +49,7 @@ class CGScopCalendar(models.Model): 'union.regionale', string='Union Régionale', index=True, - on_delete='restrict', + ondelete='restrict', default=_default_ur) ur_financial_system_nb = fields.Integer( string="Nb Dispositifs Financiers", @@ -126,6 +126,7 @@ class CGScopCalendar(models.Model): 'company_id': self.env.user.company_id.id, 'unit_amount': event.duration if not event.allday else 8.0, 'partner_id': event.coop_id.id, + 'event_id': event.id, }) @api.multi diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py new file mode 100644 index 0000000000000000000000000000000000000000..4210d82325380868fa8636794dcca3eb16d570d2 --- /dev/null +++ b/models/hr_timesheet.py @@ -0,0 +1,20 @@ +# © 2019 Le Filament (<http://www.le-filament.com>) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import models, fields + + +class ScopHrTimesheetCalendar(models.Model): + _inherit = "account.analytic.line" + + event_id = fields.Many2one( + comodel_name='calendar.event', + string="Entrée d'Agenda", + copy=False, + ondelete="set null") + type_event = fields.Selection([ + ('outside', 'Extérieur'), + ('ur', 'UR'), + ('absent', 'Absence, Congés, Divers')], + string="Type de Réunion", + related='event_id.type') diff --git a/views/hr_timesheet.xml b/views/hr_timesheet.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b43a7ef8e582b272d20aee9e793bb4ae5964d42 --- /dev/null +++ b/views/hr_timesheet.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<!-- Copyright 2019 Le Filament + License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> + +<odoo> + <data noupdate="0"> + + <!-- + Vues + --> + + <!-- Tree View Timesheet CG --> + <record id="view_cgscop_hr_timesheet_calendar_line_tree" model="ir.ui.view"> + <field name="name">account.analytic.line.calendar.cgscop</field> + <field name="model">account.analytic.line</field> + <field name="inherit_id" ref="cgscop_timesheet.view_cgscop_hr_timesheet_line_tree"/> + <field name="arch" type="xml"> + <field name="ur_financial_system_nb" position="after"> + <field name="type_event" readonly="1"/> + </field> + </field> + </record> + </data> +</odoo> \ No newline at end of file