Skip to content
Extraits de code Groupes Projets

Comparer les révisions

Les modifications sont affichées comme si la révision source était fusionnée avec la révision cible. En savoir plus sur la comparaison des révisions.

Source

Sélectionner le projet cible
No results found
Sélectionner une révision Git
  • 12.0
  • 13.0
  • 14.0
3 résultats

Cible

Sélectionner le projet cible
  • lefilament/cgscop/cgscop_timesheet
  • hsilvant/cgscop_timesheet
2 résultats
Sélectionner une révision Git
  • 12-RV-Orthographe
  • 12.0
  • 14-RV-20250129
  • 14-RV-20250305
  • 14-RV-20250312
5 résultats
Afficher les modifications
Afficher les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 1171 ajouts et 485 suppressions
models/res_partner.py
Voir le fichier @ d647557a
# © 2020 Le Filament (<http://www.le-filament.com>) # © 2020 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models, fields from odoo import fields, models
class ScopPartnerTimesheet(models.Model): class ScopPartnerTimesheet(models.Model):
_inherit = "res.partner" _inherit = "res.partner"
ur_financial_system_id = fields.Many2one( ur_financial_system_id = fields.Many2one(
comodel_name='ur.financial.system', comodel_name="ur.financial.system",
string='Dispositif Financier', string="Dispositif Financier",
ondelete='set null') ondelete="set null",
ur_financial_system_date = fields.Date( )
"Date de fin de dispositif") ur_financial_system_date = fields.Date("Date de fin de dispositif")
ur_regional_convention_id = fields.Many2one( ur_regional_convention_id = fields.Many2one(
comodel_name='ur.regional.convention', comodel_name="ur.regional.convention",
string='Convention Régionale', string="Convention Régionale",
ondelete='set null') ondelete="set null",
ur_regional_convention_date = fields.Date( )
"Date de fin de convention") ur_regional_convention_date = fields.Date("Date de fin de convention")
ur_financial_system_nb = fields.Integer( ur_financial_system_nb = fields.Integer(
string="Nb Dispositifs Financiers", string="Nb Dispositifs Financiers", compute="_compute_ur_system_nb"
compute="_compute_ur_system_nb") )
ur_regional_convention_nb = fields.Integer( ur_regional_convention_nb = fields.Integer(
string="Nb conventions régionales", string="Nb conventions régionales", compute="_compute_ur_system_nb"
compute="_compute_ur_system_nb") )
# ------------------------------------------------------ # ------------------------------------------------------
# Compute Functions # Compute Functions
...@@ -32,12 +32,12 @@ class ScopPartnerTimesheet(models.Model): ...@@ -32,12 +32,12 @@ class ScopPartnerTimesheet(models.Model):
def _compute_ur_system_nb(self): def _compute_ur_system_nb(self):
for partner in self: for partner in self:
# Calcul nombre de dispositifs financiers # Calcul nombre de dispositifs financiers
financial_system = partner.env['ur.financial.system'].search([ financial_system = partner.env["ur.financial.system"].search(
('ur_id', '=', self.env.user.ur_id.id)]) [("ur_id", "=", self.env.user.ur_id.id)]
partner.ur_financial_system_nb = len( )
financial_system) partner.ur_financial_system_nb = len(financial_system)
# Calcul nombre de conventions # Calcul nombre de conventions
regional_convention = partner.env['ur.regional.convention'].search([ regional_convention = partner.env["ur.regional.convention"].search(
('ur_id', '=', self.env.user.ur_id.id)]) [("ur_id", "=", self.env.user.ur_id.id)]
partner.ur_regional_convention_nb = len( )
regional_convention) partner.ur_regional_convention_nb = len(regional_convention)
models/ur_financial_system.py
Voir le fichier @ d647557a
# © 2019 Le Filament (<http://www.le-filament.com>) # © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models, fields from odoo import fields, models
class ScopTimesheetCode(models.Model): class ScopTimesheetCode(models.Model):
...@@ -9,16 +9,18 @@ class ScopTimesheetCode(models.Model): ...@@ -9,16 +9,18 @@ class ScopTimesheetCode(models.Model):
_description = "Dispositif financier UR" _description = "Dispositif financier UR"
def _default_ur(self): def _default_ur(self):
return self.env['res.company']._ur_default_get() return self.env["res.company"]._ur_default_get()
name = fields.Char('Nom') name = fields.Char("Nom")
company_id = fields.Many2one( company_id = fields.Many2one(
comodel_name='res.company', comodel_name="res.company",
string='Société', string="Société",
default=lambda self: self.env.user.company_id) default=lambda self: self.env.company,
)
ur_id = fields.Many2one( ur_id = fields.Many2one(
'union.regionale', "union.regionale",
string='Union Régionale', string="Union Régionale",
index=True, index=True,
on_delete='restrict', ondelete="restrict",
default=_default_ur) default=_default_ur,
)
models/ur_month_timesheet.py
Voir le fichier @ d647557a
# © 2019 Le Filament (<http://www.le-filament.com>) # © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models, fields, api from datetime import date
from dateutil.relativedelta import relativedelta
from odoo import api, fields, models
def get_years(): def get_years():
year_list = [] year_list = []
for i in range(2019, 2030): for i in range(2019, 2030):
year_list.append((i, str(i))) year_list.append((str(i), str(i)))
return year_list return year_list
MONTHS = [(1, 'Janv'), (2, 'Fév'), (3, 'Mars'), (4, 'Avr'),
(5, 'Mai'), (6, 'Juin'), (7, 'Juil'), (8, 'Août'), MONTHS = [
(9, 'Sept'), (10, 'Oct'), (11, 'Nov'), (12, 'Dec')] ("1", "Janv"),
("2", "Fév"),
("3", "Mars"),
("4", "Avr"),
("5", "Mai"),
("6", "Juin"),
("7", "Juil"),
("8", "Août"),
("9", "Sept"),
("10", "Oct"),
("11", "Nov"),
("12", "Dec"),
]
class ScopMonthTimesheet(models.Model): class ScopMonthTimesheet(models.Model):
_name = "ur.month.timesheet" _name = "ur.month.timesheet"
_description = "Heures theoriques mensuelles" _description = "Heures theoriques mensuelles"
_order = 'year, month' _order = "date_timesheet"
def _default_ur(self): def _default_ur(self):
return self.env['res.company']._ur_default_get() return self.env["res.company"]._ur_default_get()
year = fields.Selection( year = fields.Selection(
selection=get_years(), selection=get_years(), string="Année", default=fields.Date.today().year
string='Année', )
default=fields.Date.today().year) month = fields.Selection(selection=MONTHS, string="Mois")
month = fields.Selection( date_timesheet = fields.Date(
selection=MONTHS, string="Mois format date",
string='Année') compute="_compute_date_timesheet",
store=True,
)
company_id = fields.Many2one( company_id = fields.Many2one(
comodel_name='res.company', comodel_name="res.company",
string='Société', string="Société",
default=lambda self: self.env.user.company_id) default=lambda self: self.env.company,
)
ur_id = fields.Many2one( ur_id = fields.Many2one(
'union.regionale', "union.regionale",
string='Union Régionale', string="Union Régionale",
index=True, index=True,
on_delete='restrict', ondelete="restrict",
default=_default_ur) default=_default_ur,
working_time = fields.Integer('Heures théoriques') )
working_time = fields.Integer("Heures théoriques")
_sql_constraints = [( _sql_constraints = [
'month_year_uniq', (
'UNIQUE (year, month, ur_id)', "month_year_uniq",
'Cette date a déjà été renseignée.' "UNIQUE (year, month, ur_id)",
)] "Cette date a déjà été renseignée.",
)
]
@api.depends("year", "month")
def _compute_date_timesheet(self):
for month in self:
date_timesheet = date(int(month.year), int(month.month), 1)
month.date_timesheet = date_timesheet
@api.model @api.model
def get_month_values(self): def get_month_values(self):
month_values = self.search([ today = date.today()
'&', '|', '&', first_date = today.replace(day=1) - relativedelta(months=6)
('year', '<', fields.Date.today().year), last_date = today.replace(day=1) + relativedelta(months=6)
('month', '>', fields.Date.today().month), values = self.search(
'&', [
('year', '<', fields.Date.today().year + 1), ("date_timesheet", ">=", first_date),
('month', '<=', fields.Date.today().month + 1), ("date_timesheet", "<=", last_date),
('ur_id', '=', self.env.user.ur_id.id)], ("ur_id", "=", self.env.company.ur_id.id),
limit=12, ]
order='year desc, month desc').sorted(reverse=False) )
return { return {
'month': month_values.mapped(lambda x: { "month_values": values.mapped(
'year': x.year, lambda m: {
'num_month': x.month, "year": m.year,
'month': self._fields['month'].selection[x.month-1][1]}), "month": self._fields["month"].selection[int(m.month) - 1][1],
'values': month_values.mapped('working_time'), "working_time": m.working_time,
'today': { "date_timesheet": m.date_timesheet,
'year': fields.Date.today().year,
'month': fields.Date.today().month
} }
),
"today": today.replace(day=1),
} }
models/ur_regional_convention.py
Voir le fichier @ d647557a
# © 2019 Le Filament (<http://www.le-filament.com>) # © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models, fields from odoo import fields, models
class ScopRegionalConvention(models.Model): class ScopRegionalConvention(models.Model):
...@@ -9,16 +9,18 @@ class ScopRegionalConvention(models.Model): ...@@ -9,16 +9,18 @@ class ScopRegionalConvention(models.Model):
_description = "Convention Régionale UR" _description = "Convention Régionale UR"
def _default_ur(self): def _default_ur(self):
return self.env['res.company']._ur_default_get() return self.env["res.company"]._ur_default_get()
name = fields.Char('Nom') name = fields.Char("Nom")
company_id = fields.Many2one( company_id = fields.Many2one(
comodel_name='res.company', comodel_name="res.company",
string='Société', string="Société",
default=lambda self: self.env.user.company_id) default=lambda self: self.env.company,
)
ur_id = fields.Many2one( ur_id = fields.Many2one(
'union.regionale', "union.regionale",
string='Union Régionale', string="Union Régionale",
index=True, index=True,
on_delete='restrict', ondelete="restrict",
default=_default_ur) default=_default_ur,
)
report/report_hr_timesheet.xml
Voir le fichier @ d647557a
...@@ -26,30 +26,46 @@ ...@@ -26,30 +26,46 @@
</div> </div>
<div class="col-auto mw-100 mb-2" name="date_end"> <div class="col-auto mw-100 mb-2" name="date_end">
<strong>Total</strong> <strong>Total</strong>
<p class="m-0" t-field="o.total_hour" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/> <p
class="m-0"
t-field="o.total_hour"
t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"
/>
</div> </div>
</div> </div>
<table class="table table-sm o_main_table" name="invoice_line_table"> <table
class="table table-sm o_main_table"
name="invoice_line_table"
>
<thead> <thead>
<tr> <tr>
<th class="text-left"><span>Date</span></th> <th class="text-left"><span>Date</span></th>
<th class="text-left"><span>Code activité UR</span></th> <th class="text-left"><span>Code activité UR</span></th>
<th class="text-left"><span>Contact</span></th> <th class="text-left"><span>Contact</span></th>
<th class="text-left"><span>Description</span></th> <th class="text-left"><span>Description</span></th>
<th class="text-left"><span>Dispositif Financier</span></th> <th class="text-left"><span
>Dispositif Financier</span></th>
<th class="text-left"><span>Durée</span></th> <th class="text-left"><span>Durée</span></th>
</tr> </tr>
</thead> </thead>
<tbody class="invoice_tbody"> <tbody class="invoice_tbody">
<t t-foreach="o.timesheet_line_ids.sorted('date')" t-as="line"> <t
t-foreach="o.timesheet_line_ids.sorted('date')"
t-as="line"
>
<tr> <tr>
<td><span t-field="line.date" /></td> <td><span t-field="line.date" /></td>
<td><span t-field="line.project_id" /></td> <td><span t-field="line.project_id" /></td>
<td><span t-field="line.partner_id" /></td> <td><span t-field="line.partner_id" /></td>
<td><span t-field="line.name" /></td> <td><span t-field="line.name" /></td>
<td><span t-field="line.ur_financial_system_id"/></td> <td><span
<td class="text-right"><span t-field="line.unit_amount" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/></td> t-field="line.ur_financial_system_id"
/></td>
<td class="text-right"><span
t-field="line.unit_amount"
t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"
/></td>
</tr> </tr>
</t> </t>
<tr> <tr>
...@@ -58,18 +74,27 @@ ...@@ -58,18 +74,27 @@
<td /> <td />
<td /> <td />
<td class="text-right"><strong>Total</strong></td> <td class="text-right"><strong>Total</strong></td>
<td class="text-right"><strong t-esc="o.total_hour" t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"/></td> <td class="text-right"><strong
t-esc="o.total_hour"
t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"
/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div t-if="o.state == 'draft'">Cette feuille de temps a été éditée en brouillon.</div> <div
t-if="o.state == 'draft'"
>Cette feuille de temps a été éditée en brouillon.</div>
<div t-else=""> <div t-else="">
<table style="float: right;"> <table style="float: right;">
<tr> <tr>
<td style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"> <td
style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"
>
Visa salarié Visa salarié
</td> </td>
<td style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"> <td
style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"
>
Visa direction Visa direction
</td> </td>
</tr> </tr>
...@@ -107,17 +132,13 @@ ...@@ -107,17 +132,13 @@
</record> </record>
<!-- QWeb Reports --> <!-- QWeb Reports -->
<report <record id="cgscop_timesheet_sheet_report" model="ir.actions.report">
id="cgscop_timesheet_sheet_report" <field name="name">CG Scop - Feuille de Temps</field>
model="cgscop.timesheet.sheet" <field name="model">cgscop.timesheet.sheet</field>
string="CG Scop - Feuille de Temps" <field name="report_type">qweb-pdf</field>
report_type="qweb-pdf" <field name="report_name">cgscop_timesheet.report_timesheet_sheet</field>
name="cgscop_timesheet.report_timesheet_sheet" <field name="report_file">cgscop_timesheet.report_timesheet_sheet</field>
file="cgscop_timesheet.report_timesheet_sheet" <field name="paperformat_id" ref="cgscop_paperformat_a4_landscape" />
paperformat="cgscop_paperformat_a4_landscape" </record>
menu="False"
/>
</data> </data>
</odoo> </odoo>
report/report_hr_timesheet_act.xml 0 → 100644
Voir le fichier @ d647557a
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<data>
<template id="report_timesheet_document_act">
<t t-call="web.external_layout">
<div class="page">
<h2>
Feuille de Temps par activité <t
t-if="o.state == 'draft'"
> - Brouillon</t>
</h2>
<h3>
<t t-esc="o.name" />
</h3>
<div id="informations" class="row mt32 mb32">
<div class="col-auto mw-100 mb-2" name="employee">
<strong>Employé</strong>
<p class="m-0" t-field="o.employee_id.name" />
</div>
<div class="col-auto mw-100 mb-2">
<strong>Soumis le</strong>
<p class="m-0" t-field="o.submit_date" />
</div>
<div class="col-auto mw-100 mb-2" name="date_end">
<strong>Validé le</strong>
<p class="m-0" t-field="o.validation_date" />
</div>
<div class="col-auto mw-100 mb-2" name="date_end">
<strong>Total</strong>
<p
class="m-0"
t-field="o.total_hour"
t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"
/>
</div>
</div>
<table
class="table table-sm o_main_table"
name="invoice_line_table"
>
<thead>
<tr>
<th class="text-left"><span>Code activité UR</span></th>
<th class="text-left"><span>Date</span></th>
<th class="text-left"><span>Contact</span></th>
<th class="text-left"><span>Description</span></th>
<th class="text-left"><span
>Dispositif Financier</span></th>
<th class="text-left"><span>Durée</span></th>
</tr>
</thead>
<tbody class="invoice_tbody">
<t t-foreach="o._get_timesheet_line_act()" t-as="line">
<tr>
<td><span><t t-esc="line['project']" /></span></td>
<td><span><t t-esc="line['date']" /></span></td>
<td><span><t t-esc="line['partner']" /></span></td>
<td><span><t t-esc="line['name']" /></span></td>
<td><span>
<t t-if="line['total']==1">
<strong>
<t t-esc="line['ur_financial_system']" />
</strong>
</t>
<t t-if="line['total']==0">
<t t-esc="line['ur_financial_system']" />
</t>
</span></td>
<td class="text-right"><span>
<t t-esc="line['unit_amount']" />
</span></td>
</tr>
</t>
<tr>
<td />
<td />
<td />
<td />
<td class="text-right"><strong>Total</strong></td>
<td class="text-right"><strong
t-esc="o.total_hour"
t-options="{'widget': 'duration', 'digital': True, 'unit': 'hour', 'round': 'minute'}"
/></td>
</tr>
</tbody>
</table>
<div
t-if="o.state == 'draft'"
>Cette feuille de temps a été éditée en brouillon.</div>
<div t-else="">
<table style="float: right;">
<tr>
<td
style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"
>
Visa salarié
</td>
<td
style="width: 300px; border-bottom: 1px solid #495057; text-align: center;"
>
Visa direction
</td>
</tr>
<tr>
<td><br /><br /><br /></td>
<td><br /><br /><br /></td>
</tr>
</table>
</div>
</div>
</t>
</template>
<template id="report_timesheet_sheet_act">
<t t-call="web.html_container">
<t t-foreach="docs" t-as="o">
<t t-call="cgscop_timesheet.report_timesheet_document_act" />
</t>
</t>
</template>
<record id="cgscop_timesheet_sheet_report_act" model="ir.actions.report">
<field name="name">CG Scop - Feuille de Temps par activité</field>
<field name="model">cgscop.timesheet.sheet</field>
<field name="report_type">qweb-pdf</field>
<field
name="report_name"
>cgscop_timesheet.report_timesheet_sheet_act</field>
<field
name="report_file"
>cgscop_timesheet.report_timesheet_sheet_act</field>
<field name="paperformat_id" ref="cgscop_paperformat_a4_landscape" />
</record>
</data>
</odoo>
security/ir.model.access.csv
Voir le fichier @ d647557a
...@@ -15,3 +15,4 @@ access_ur_regional_convention_cg_manager,access_ur_regional_convention_cg,model_ ...@@ -15,3 +15,4 @@ access_ur_regional_convention_cg_manager,access_ur_regional_convention_cg,model_
access_ur_month_timesheet,access_ur_month_timesheet,model_ur_month_timesheet,base.group_user,1,0,0,0 access_ur_month_timesheet,access_ur_month_timesheet,model_ur_month_timesheet,base.group_user,1,0,0,0
access_ur_month_timesheet_ur_manager,access_ur_month_timesheet_ur,model_ur_month_timesheet,cgscop_partner.group_ur_list_modif,1,1,1,1 access_ur_month_timesheet_ur_manager,access_ur_month_timesheet_ur,model_ur_month_timesheet,cgscop_partner.group_ur_list_modif,1,1,1,1
access_ur_month_timesheet_cg_manager,access_ur_month_timesheet_cg,model_ur_month_timesheet,cgscop_partner.group_cg_administrator,1,1,1,1 access_ur_month_timesheet_cg_manager,access_ur_month_timesheet_cg,model_ur_month_timesheet,cgscop_partner.group_cg_administrator,1,1,1,1
access_cgscop_timesheet_print_wizard,access_cgscop_timesheet_print_wizard,model_cgscop_timesheet_print_wizard,base.group_user,1,1,1,1
security/security_rules.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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="0"> <data>
<!-- UR Financial System -->
<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>
<field name="model_id" ref="model_ur_financial_system" /> <field name="model_id" ref="model_ur_financial_system" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('company_id','in',company_ids)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<!-- UR Regional Convention -->
<record id="ur_regional_convention_rule_ur" model="ir.rule"> <record id="ur_regional_convention_rule_ur" model="ir.rule">
<field name="name">ur regional convention rule per ur</field> <field name="name">ur regional convention rule per ur</field>
<field name="model_id" ref="model_ur_regional_convention" /> <field name="model_id" ref="model_ur_regional_convention" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('company_id','in',company_ids)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" />
</record>
<!-- UR Month Timesheet -->
<record id="ur_month_timesheet_rule_ur" model="ir.rule">
<field name="name">ur month timesheet rule per ur</field>
<field name="model_id" ref="model_ur_month_timesheet" />
<field name="domain_force">[('company_id','in',company_ids)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<!-- Project -->
<record id="project_rule_ur" model="ir.rule"> <record id="project_rule_ur" model="ir.rule">
<field name="name">project rule per ur</field> <field name="name">project rule per ur</field>
<field name="model_id" ref="project.model_project_project" /> <field name="model_id" ref="project.model_project_project" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('company_id','in',company_ids)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<record id="project_rule_administrator_ur" model="ir.rule"> <record id="project_rule_administrator_ur" model="ir.rule">
<field name="name">project rule for administrator</field> <field name="name">project rule for administrator</field>
<field name="model_id" ref="project.model_project_project" /> <field name="model_id" ref="project.model_project_project" />
<field name="domain_force">[(1,'=',1)]</field> <field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/> <field
name="groups"
eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"
/>
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<!-- Analytic Line -->
<record id="analytic_line_ur_rule" model="ir.rule"> <record id="analytic_line_ur_rule" model="ir.rule">
<field name="name">Analytic line UR rule</field> <field name="name">Analytic line UR rule</field>
<field name="model_id" ref="analytic.model_account_analytic_line" /> <field name="model_id" ref="analytic.model_account_analytic_line" />
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" /> <field eval="True" name="global" />
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> <field name="domain_force">[('ur_id','=',user.current_ur_id.id)]</field>
</record>
<record id="analytic_rule_administrator_ur" model="ir.rule">
<field name="name">Analytic line UR administrator rule</field>
<field name="model_id" ref="analytic.model_account_analytic_line"/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
<field eval="True" name="global"/>
</record> </record>
<record id="analytic.analytic_line_comp_rule" model="ir.rule"> <record id="analytic.analytic_line_comp_rule" model="ir.rule">
<field name="name">Analytic line multi company rule</field> <field name="name">Analytic line multi company rule</field>
<field name="model_id" ref="model_account_analytic_line" /> <field name="model_id" ref="model_account_analytic_line" />
<field eval="True" name="global" /> <field eval="True" name="global" />
<field name="active" eval="False" /> <field name="active" eval="False" />
</record> </record>
<record id="account.account_analytic_line_rule_billing_user" model="ir.rule"> <record id="account.account_analytic_line_rule_billing_user" model="ir.rule">
<field name="name">account.analytic.line.billing.user</field> <field name="name">analytic.analytic.line.billing.user</field>
<field name="model_id" ref="model_account_analytic_line" /> <field name="model_id" ref="model_account_analytic_line" />
<field name="perm_read" eval="False" /> <field name="perm_read" eval="False" />
<field name="perm_write" eval="True" /> <field name="perm_write" eval="True" />
...@@ -70,20 +71,16 @@ ...@@ -70,20 +71,16 @@
<field name="active" eval="False" /> <field name="active" eval="False" />
</record> </record>
<!-- CGScop Timesheet Sheet -->
<record id="timesheet_sheet_rule_ur" model="ir.rule"> <record id="timesheet_sheet_rule_ur" model="ir.rule">
<field name="name">Feuilles de temps de mon UR</field> <field name="name">Feuilles de temps de mon UR</field>
<field name="model_id" ref="cgscop_timesheet.model_cgscop_timesheet_sheet"/> <field
<field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> name="model_id"
ref="cgscop_timesheet.model_cgscop_timesheet_sheet"
/>
<field name="domain_force">[('ur_id','=',user.current_ur_id.id)]</field>
<field name="groups" eval="[(6, 0, [ref('base.group_user')])]" /> <field name="groups" eval="[(6, 0, [ref('base.group_user')])]" />
<field eval="True" name="global" /> <field eval="True" name="global" />
</record> </record>
<record id="timesheet_sheet_rule_administrator_ur" model="ir.rule">
<field name="name">Feuilles de temps administrator</field>
<field name="model_id" ref="cgscop_timesheet.model_cgscop_timesheet_sheet"/>
<field name="domain_force">[(1,'=',1)]</field>
<field name="groups" eval="[(6, 0, [ref('cgscop_partner.group_cg_administrator')])]"/>
<field eval="True" name="global"/>
</record>
</data> </data>
</odoo> </odoo>
static/description/icon.png
Voir le fichier remplacé @ 15398bd6 Voir le fichier @ d647557a
static/description/icon.png

8,95 ko | W: 0px | H: 0px

static/description/icon.png

15,5 ko | W: 0px | H: 0px

static/description/icon.png
static/description/icon.png
static/description/icon.png
static/description/icon.png
  • 2-up
  • Swipe
  • Onion skin
static/src/css/style.css
Voir le fichier @ d647557a
static/src/js/ur_month_timesheet.js
Voir le fichier @ d647557a
// © 2019 Le Filament (<http://www.le-filament.com>) // © 2019 Le Filament (<http://www.le-filament.com>)
// License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). // License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
odoo.define('cgscop_timesheet.ur_month_timesheet', function (require) { odoo.define("cgscop_timesheet.ur_month_timesheet", function (require) {
"use strict"; "use strict";
var core = require('web.core'); var core = require("web.core");
var session = require('web.session'); var AbstractAction = require("web.AbstractAction");
var AbstractAction = require('web.AbstractAction');
var QWeb = core.qweb;
var ScopMonthTimesheet = AbstractAction.extend({ var ScopMonthTimesheet = AbstractAction.extend({
template: 'ScopMonthTimesheet', template: "ScopMonthTimesheet",
willStart: function () { willStart: function () {
var deferred = new jQuery.Deferred(); var superDef = this._super.apply(this, arguments);
var self = this; var self = this;
this.values = {}; this.values = {};
this._rpc({ var def = this._rpc({
model: 'ur.month.timesheet', model: "ur.month.timesheet",
method: 'get_month_values', method: "get_month_values",
args: [], args: [],
}) }).then(function (results) {
.then(function(results) {
self.values = results; self.values = results;
deferred.resolve();
}); });
return jQuery.when(this._super.apply(this, arguments),deferred); return Promise.all([superDef, def]);
},
start: function() {
}, },
// Start: function () {},
}); });
core.action_registry.add('cgscop_timesheet.ur_month_timesheet', ScopMonthTimesheet); core.action_registry.add("cgscop_timesheet.ur_month_timesheet", ScopMonthTimesheet);
}); });
static/src/xml/month_timesheet.xml
Voir le fichier @ d647557a
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright 2019 Le Filament (<https://www.le-filament.com>) <!-- Copyright 2019 Le Filament (<https://www.le-filament.com>)
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<templates xml:space="preserve"> <templates xml:space="preserve">
<t t-name="ScopMonthTimesheet"> <t t-name="ScopMonthTimesheet">
<t t-if="widget.values.month_values">
<table class="table"> <table class="table">
<thead> <thead>
<tr> <tr>
<t t-foreach="widget.values.month" t-as="m"> <th t-foreach="widget.values.month_values" t-as="m">
<t t-if="m.num_month == widget.values.today.month and m.year == widget.values.today.year"> <div
<th class="text-success"> t-att-class="m.date_timesheet == widget.values.today ? 'text-success' : ''"
>
<t t-esc="m.month" /> <t t-esc="m.year" /> <t t-esc="m.month" /> <t t-esc="m.year" />
</div>
</th> </th>
</t>
<t t-else="">
<th>
<t t-esc="m.month"/> <t t-esc="m.year"/>
</th>
</t>
</t>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<t t-foreach="widget.values.values" t-as="v"> <td t-foreach="widget.values.month_values" t-as="m">
<td><t t-esc="v"/> h</td> <div
</t> t-att-class="m.date_timesheet == widget.values.today ? 'text-right text-success' : 'text-right'"
>
<t t-esc="m.working_time" /> h
</div>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</t>
<t t-else="">
<p>Aucun temps de travail théorique n'a été configuré.</p>
</t>
</t> </t>
</templates> </templates>
views/assets.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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>
<template
<template id="cgscop_assets_backend" name="account assets" inherit_id="web.assets_backend"> id="cgscop_assets_backend"
name="account assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside"> <xpath expr="." position="inside">
<link rel="stylesheet" type="text/css" href="/cgscop_timesheet/static/src/css/style.css"/> <link
rel="stylesheet"
type="text/css"
href="/cgscop_timesheet/static/src/css/style.css"
/>
<script type="text/javascript" src="/cgscop_timesheet/static/src/js/ur_month_timesheet.js"></script> <script
type="text/javascript"
src="/cgscop_timesheet/static/src/js/ur_month_timesheet.js"
/>
</xpath> </xpath>
</template> </template>
......
views/cgscop_timesheet_code.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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> <data>
<record id="view_cgscop_timesheet_code_tree" model="ir.ui.view"> <record id="view_cgscop_timesheet_code_tree" model="ir.ui.view">
...@@ -9,7 +8,8 @@ ...@@ -9,7 +8,8 @@
<field name="model">cgscop.timesheet.code</field> <field name="model">cgscop.timesheet.code</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree editable='top'> <tree editable='top'>
<field name="name" /> <field name="name" required="1" />
<field name="domain" />
</tree> </tree>
</field> </field>
</record> </record>
...@@ -21,12 +21,14 @@ ...@@ -21,12 +21,14 @@
<field name="help">Affiche et gère les Codes activité Nationaux</field> <field name="help">Affiche et gère les Codes activité Nationaux</field>
</record> </record>
<menuitem id="menu_cgscop_timesheet_code" <menuitem
id="menu_cgscop_timesheet_code"
name="Codes Activité National" name="Codes Activité National"
parent="hr_timesheet.hr_timesheet_menu_configuration" parent="hr_timesheet.hr_timesheet_menu_configuration"
action="action_cgscop_timesheet_code_tree" action="action_cgscop_timesheet_code_tree"
sequence="40" sequence="40"
groups="cgscop_partner.group_cg_administrator"/> groups="cgscop_partner.group_cg_administrator"
/>
</data> </data>
</odoo> </odoo>
views/cgscop_timesheet_sheet.xml
Voir le fichier @ d647557a
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<odoo> <odoo>
<data>
<!-- <!--
Vues Vues
--> -->
...@@ -24,27 +25,67 @@ ...@@ -24,27 +25,67 @@
<record id="view_cgscop_timesheet_sheet_form" model="ir.ui.view"> <record id="view_cgscop_timesheet_sheet_form" model="ir.ui.view">
<field name="name">cgscop.timesheet.sheet.form</field> <field name="name">cgscop.timesheet.sheet.form</field>
<field name="model">cgscop.timesheet.sheet</field> <field name="model">cgscop.timesheet.sheet</field>
<field eval="25" name="priority"/> <field name="priority" eval="25" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<field name="company_id" invisible="1" />
<header> <header>
<button name="action_submit_timesheet" states="draft" string="Soumettre" type="object" class="oe_highlight"/> <button
<button name="approve_timesheet_sheets" states="submit" string="Valider" type="object" groups="hr_timesheet.group_timesheet_manager" class="oe_highlight"/> name="action_submit_timesheet"
<button name="print_timesheet" string="Imprimer" type="object" /> states="draft"
<button name="reset_timesheet_sheets" string="Remettre en brouillon" type="object" attrs="{'invisible': [('state', '=', 'draft')]}" groups="hr_timesheet.group_timesheet_manager"/> string="Soumettre"
<field name="state" widget="statusbar" statusbar_visible="draft,submit,valid"/> type="object"
class="oe_highlight"
/>
<button
name="approve_timesheet_sheets"
states="submit"
string="Valider"
type="object"
groups="hr_timesheet.group_timesheet_manager"
class="oe_highlight"
/>
<button
string="Imprimer"
type="action"
name="%(cgscop_timesheet_print_act)d"
class="oe_read_only"
/>
<button
name="reset_timesheet_sheets"
string="Remettre en brouillon"
type="object"
attrs="{'invisible': [('state', '=', 'draft')]}"
groups="hr_timesheet.group_timesheet_manager"
/>
<field
name="state"
widget="statusbar"
statusbar_visible="draft,submit,valid"
/>
</header> </header>
<sheet> <sheet>
<div class="oe_title"> <div class="oe_title">
<label for="name" class="oe_edit_only" /> <label for="name" class="oe_edit_only" />
<h1> <h1>
<field name="name" attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"/> <field
name="name"
attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
/>
</h1> </h1>
</div> </div>
<group> <group>
<group> <group>
<field name="employee_id" groups="hr_timesheet.group_timesheet_manager" options="{'no_open': True, 'no_create': True}"/> <field
<field name="company_id" groups="base.group_multi_company" options="{'no_open': True, 'no_create': True}"/> name="employee_id"
groups="hr_timesheet.group_timesheet_manager"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="company_id"
groups="base.group_multi_company"
options="{'no_open': True, 'no_create': True}"
/>
</group> </group>
<group> <group>
<field name="create_date" readonly="1" /> <field name="create_date" readonly="1" />
...@@ -54,24 +95,50 @@ ...@@ -54,24 +95,50 @@
</group> </group>
</group> </group>
<field name="can_edit" invisible="1" /> <field name="can_edit" invisible="1" />
<field name="timesheet_line_ids" widget="many2many" domain="[('sheet_id', '=', False), ('employee_id', '=', employee_id)]" options="{'reload_on_button': True}" attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}" context="{'form_view_ref' : 'hr_timesheet.timesheet_view_form_user'}"> <field
name="timesheet_line_ids"
widget="many2many"
domain="[('sheet_id', '=', False), ('employee_id', '=', employee_id)]"
options="{'reload_on_button': True}"
attrs="{'readonly': [('can_edit','=', False), ('state','!=', 'draft')]}"
context="{'form_view_ref' : 'hr_timesheet.timesheet_view_form_user'}"
>
<tree editable="top"> <tree editable="top">
<field name="company_id" invisible="1" />
<field name="ur_id" invisible="1" />
<field name="date" /> <field name="date" />
<field name="employee_id" readonly="1" /> <field name="employee_id" readonly="1" />
<field name="state" invisible="1" /> <field name="state" invisible="1" />
<field name="sheet_id" invisible="1" /> <field name="sheet_id" invisible="1" />
<field name="project_id"/> <field
<field name="partner_id" /> name="project_id"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="partner_id"
options="{'no_open': True, 'no_create': True}"
/>
<field name="name" /> <field name="name" />
<field name="unit_amount" widget="float_time" /> <field name="unit_amount" widget="float_time" />
<field name="ur_financial_system_id"/> <field
name="ur_financial_system_id"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="justificatifs"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
/>
</tree> </tree>
</field> </field>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/> <field
<field name="activity_ids" widget="mail_activity"/> name="message_follower_ids"
<field name="message_ids" widget="mail_thread"/> options="{'post_refresh':True}"
groups="base.group_user"
/>
<field name="activity_ids" />
<field name="message_ids" />
</div> </div>
</form> </form>
</field> </field>
...@@ -87,15 +154,47 @@ ...@@ -87,15 +154,47 @@
<field name="state" /> <field name="state" />
<separator /> <separator />
<field name="employee_id" /> <field name="employee_id" />
<filter string="Mes feuilles de temps" name="my_reports" domain="[('employee_id.user_id', '=', uid)]"/> <filter
<filter string="Mon équipe" name="my_team_reports" domain="[('employee_id.parent_id.user_id', '=', uid)]" groups="hr_timesheet.group_timesheet_manager" help="Expenses of Your Team Member"/> string="Mes feuilles de temps"
name="my_reports"
domain="[('employee_id.user_id', '=', uid)]"
/>
<filter
string="Mon équipe"
name="my_team_reports"
domain="[('employee_id.parent_id.user_id', '=', uid)]"
groups="hr_timesheet.group_timesheet_manager"
help="Expenses of Your Team Member"
/>
<separator /> <separator />
<filter domain="[('state', '=', 'draft')]" string="Brouillon" name="draft" /> <filter
<filter domain="[('state', '=', 'submit')]" string="Soumis" name="submitted"/> domain="[('state', '=', 'draft')]"
<filter domain="[('state', '=', 'valid')]" string="Validé" name="valid"/> string="Brouillon"
name="draft"
/>
<filter
domain="[('state', '=', 'submit')]"
string="Soumis"
name="submitted"
/>
<filter
domain="[('state', '=', 'valid')]"
string="Validé"
name="valid"
/>
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter string="Employé" name="employee" domain="[]" context="{'group_by': 'employee_id'}"/> <filter
<filter string="Statut" domain="[]" context="{'group_by': 'state'}" name="state"/> string="Employé"
name="employee"
domain="[]"
context="{'group_by': 'employee_id'}"
/>
<filter
string="Statut"
domain="[]"
context="{'group_by': 'state'}"
name="state"
/>
</group> </group>
</search> </search>
</field> </field>
...@@ -115,7 +214,10 @@ ...@@ -115,7 +214,10 @@
<field name="context">{'search_default_my_reports': 1}</field> <field name="context">{'search_default_my_reports': 1}</field>
</record> </record>
<record id="action_cgscop_timesheet_sheet_to_approve" model="ir.actions.act_window"> <record
id="action_cgscop_timesheet_sheet_to_approve"
model="ir.actions.act_window"
>
<field name="name">Feuilles de temps à valider</field> <field name="name">Feuilles de temps à valider</field>
<field name="res_model">cgscop.timesheet.sheet</field> <field name="res_model">cgscop.timesheet.sheet</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
...@@ -129,7 +231,7 @@ ...@@ -129,7 +231,7 @@
<field name="res_model">cgscop.timesheet.sheet</field> <field name="res_model">cgscop.timesheet.sheet</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="search_view_id" ref="view_cgscop_timesheet_sheet_filter" /> <field name="search_view_id" ref="view_cgscop_timesheet_sheet_filter" />
<field name="domain">[('ur_id', '=', ur_id)]</field> <field name="domain">[('company_id', '=', allowed_company_ids[0])]</field>
<field name="context">{}</field> <field name="context">{}</field>
</record> </record>
...@@ -139,29 +241,37 @@ ...@@ -139,29 +241,37 @@
Menus Menus
--> -->
<menuitem id="timesheet_sheet_menu" <menuitem
id="timesheet_sheet_menu"
parent="hr_timesheet.timesheet_menu_root" parent="hr_timesheet.timesheet_menu_root"
name="Feuilles de temps" name="Feuilles de temps"
sequence="25"/> sequence="25"
/>
<menuitem id="menu_hr_timesheet_my_timesheet" <menuitem
id="menu_hr_timesheet_my_timesheet"
name="Mes feuilles de temps" name="Mes feuilles de temps"
sequence="1" sequence="1"
action="cgscop_timesheet.action_cgscop_timesheet_sheet_my_all" action="cgscop_timesheet.action_cgscop_timesheet_sheet_my_all"
parent="cgscop_timesheet.timesheet_sheet_menu"/> parent="cgscop_timesheet.timesheet_sheet_menu"
/>
<menuitem id="menu_hr_timesheet_to_approve" <menuitem
id="menu_hr_timesheet_to_approve"
name="À valider" name="À valider"
sequence="1" sequence="1"
action="cgscop_timesheet.action_cgscop_timesheet_sheet_to_approve" action="cgscop_timesheet.action_cgscop_timesheet_sheet_to_approve"
parent="cgscop_timesheet.timesheet_sheet_menu" parent="cgscop_timesheet.timesheet_sheet_menu"
groups="hr_timesheet.group_timesheet_manager"/> groups="hr_timesheet.group_timesheet_manager"
/>
<menuitem id="menu_hr_timesheet_all" <menuitem
id="menu_hr_timesheet_all"
name="Toutes les feuilles de temps" name="Toutes les feuilles de temps"
sequence="1" sequence="1"
action="cgscop_timesheet.action_cgscop_timesheet_sheet_all" action="cgscop_timesheet.action_cgscop_timesheet_sheet_all"
parent="cgscop_timesheet.timesheet_sheet_menu" parent="cgscop_timesheet.timesheet_sheet_menu"
groups="hr_timesheet.group_timesheet_manager"/> groups="hr_timesheet.group_timesheet_manager"
/>
</data>
</odoo> </odoo>
views/hr_timesheet.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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="0"> <data>
<!-- <!--
Vues Vues
...@@ -12,6 +11,7 @@ ...@@ -12,6 +11,7 @@
<field name="name">cgscop.hr.timesheet.line.search</field> <field name="name">cgscop.hr.timesheet.line.search</field>
<field name="model">account.analytic.line</field> <field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search" /> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search" />
<field name="priority">100</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="task_id" position="replace" /> <field name="task_id" position="replace" />
<field name="project_id" position="attributes"> <field name="project_id" position="attributes">
...@@ -21,14 +21,44 @@ ...@@ -21,14 +21,44 @@
<field name="partner_id" string="Contact" /> <field name="partner_id" string="Contact" />
</field> </field>
<xpath expr="//filter[@name='mine']" position="after"> <xpath expr="//filter[@name='mine']" position="after">
<separator></separator> <separator />
<filter domain="[('sheet_id', '=', False)]" string="A rapporter" name="no_report"/> <filter
<filter domain="[('state', '=', 'draft')]" string="En brouillon" name="draft"/> domain="[('sheet_id', '=', False)]"
<filter domain="[('state', '=', 'submit')]" string="Soumis" name="submitted"/> string="A rapporter"
<filter domain="[('state', '=', 'valid')]" string="Validé" name="validated"/> name="no_report"
/>
<filter
domain="[('state', '=', 'draft')]"
string="En brouillon"
name="draft"
/>
<filter
domain="[('state', '=', 'submit')]"
string="Soumis"
name="submitted"
/>
<filter
domain="[('state', '=', 'valid')]"
string="Validé"
name="validated"
/>
</xpath> </xpath>
<xpath expr="//filter[@name='groupby_task']" position="replace"> <xpath expr="//filter[@name='groupby_task']" position="replace">
<filter string="Contact" name="groupby_partner" domain="[]" context="{'group_by':'partner_id'}"/> <filter
string="Contact"
name="groupby_partner"
domain="[]"
context="{'group_by':'partner_id'}"
/>
<filter
string="Dispositif financier"
name="groupby_financial_system"
domain="[]"
context="{'group_by':'ur_financial_system_id'}"
/>
</xpath>
<xpath expr="//filter[@name='groupby_date']" position="attributes">
<attribute name="context">{'group_by':'date:day'}</attribute>
</xpath> </xpath>
<xpath expr="//filter[@name='groupby_project']" position="attributes"> <xpath expr="//filter[@name='groupby_project']" position="attributes">
<attribute name="string">Code activité UR</attribute> <attribute name="string">Code activité UR</attribute>
...@@ -42,62 +72,260 @@ ...@@ -42,62 +72,260 @@
<field name="model">account.analytic.line</field> <field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form" /> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="project_id" position="attributes" > <xpath expr="//form/sheet/group" position="attributes">
<attribute name="options">{'no_open': True, 'no_create': True}</attribute> <attribute name="invisible">1</attribute>
<attribute name="string">Code activité UR</attribute> </xpath>
</field> <xpath expr="//form/sheet/group" position="after">
<field name="project_id" position="after" > <group string="Activité">
<field name="partner_id" domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]" required="True" class="td-ellipsis" options="{'no_open': True, 'no_create': True}" string="Contact" /> <field
<field name="is_present"/> name="ur_id"
<field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_financial_system_nb', '>', 0)], 'invisible':[('ur_financial_system_nb', '=', 0)]}"/> options="{'no_open': True, 'no_create': True}"
<field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '=', 0)]}"/> groups="cgscop_partner.group_cg_administrator"
<field name="ur_id" options="{'no_open': True, 'no_create': True}" groups="cgscop_partner.group_cg_administrator"/> />
<field name="employee_id" required="True" readonly="1" />
<field
name="employee_id"
options="{'no_open': True, 'no_create': True}"
required="True"
groups="hr_timesheet.group_timesheet_manager"
/>
<field name="date" />
<field
name="project_id"
required="True"
options="{'no_open': True, 'no_create': True}"
string="Code activité UR"
/>
<field
name="partner_id"
domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]"
required="True"
options="{'no_create': True}"
string="Contact"
/>
<field name="name" />
<field name="unit_amount" widget="float_time" />
<field name="is_overtime_allowed" invisible="1" />
<field name="is_travel_time_allowed" invisible="1" />
<field
name="travel_time"
widget="float_time"
attrs="{'invisible': [('is_travel_time_allowed', '=', False)]}"
/>
<field
name="is_overtime"
widget="boolean_toggle"
attrs="{'invisible': [('is_overtime_allowed', '=', False)]}"
/>
</group>
<group string="Divers">
<field name="is_present" widget="boolean_toggle" />
<field
name="location"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14233)d)]}"
/>
</group>
<group
name="DF"
string="Dispositif financier"
attrs="{'invisible': ['&amp;',('ur_regional_convention_nb', '=', 0),('ur_financial_system_nb', '=', 0)]}"
>
<field
name="ur_financial_system_id"
options="{'no_open': True, 'no_create': True}"
attrs="{'required':[('ur_financial_system_nb', '>', 0)], 'invisible':[('ur_financial_system_nb', '=', 0)]}"
/>
<field
name="ur_regional_convention_id"
options="{'no_open': True, 'no_create': True}"
attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '=', 0)]}"
/>
<field
name="justificatifs"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
/>
<field name="ur_regional_convention_nb" invisible="1" /> <field name="ur_regional_convention_nb" invisible="1" />
<field name="ur_financial_system_nb" invisible="1" /> <field name="ur_financial_system_nb" invisible="1" />
<field name="user_id" invisible="1" />
</group>
</xpath>
</field> </field>
<field name="task_id" position="attributes"> </record>
<attribute name="invisible">True</attribute>
</field>
<field name="amount" position="attributes"> <!-- Form View Timesheet CG -->
<attribute name="invisible">True</attribute> <record id="view_cgscop_hr_timesheet_line_form2" model="ir.ui.view">
</field> <field name="name">account.analytic.line.timesheet.form.cgscop</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_form" />
<field name="arch" type="xml">
<xpath expr="//sheet/group" position="attributes">
<attribute name="groups">base.group_system</attribute>
</xpath>
<xpath expr="//sheet/group" position="before">
<group string="Activité">
<field
name="ur_id"
options="{'no_open': True, 'no_create': True}"
groups="cgscop_partner.group_cg_administrator"
/>
<field
name="employee_id"
options="{'no_open': True, 'no_create': True}"
required="True"
groups="hr_timesheet.group_timesheet_manager"
/>
<field name="date" />
<field
name="project_id"
required="True"
options="{'no_open': True, 'no_create': True}"
string="Code activité UR"
/>
<field
name="partner_id"
domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]"
required="True"
options="{'no_open': True, 'no_create': True}"
string="Contact"
/>
<field name="name" />
<field name="unit_amount" widget="float_time" />
<field name="is_overtime_allowed" invisible="1" />
<field name="is_travel_time_allowed" invisible="1" />
<field
name="travel_time"
widget="float_time"
attrs="{'invisible': [('is_travel_time_allowed', '=', False)]}"
/>
<field
name="is_overtime"
widget="boolean_toggle"
attrs="{'invisible': [('is_overtime_allowed', '=', False)]}"
/>
</group>
<group string="Divers">
<field name="is_present" widget="boolean_toggle" />
<field
name="location"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14233)d)]}"
/>
</group>
<group
name="DF"
string="Dispositif financier"
attrs="{'invisible': ['&amp;',('ur_regional_convention_nb', '=', 0),('ur_financial_system_nb', '=', 0)]}"
>
<field
name="ur_financial_system_id"
options="{'no_open': True, 'no_create': True}"
attrs="{'required':[('ur_financial_system_nb', '>', 0)], 'invisible':[('ur_financial_system_nb', '=', 0)]}"
/>
<field
name="ur_regional_convention_id"
options="{'no_open': True, 'no_create': True}"
attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '=', 0)]}"
/>
<field
name="justificatifs"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
/>
<field name="ur_regional_convention_nb" invisible="1" />
<field name="ur_financial_system_nb" invisible="1" />
</group>
</xpath>
</field> </field>
</record> </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>
<field name="model">account.analytic.line</field> <field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" /> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree" />
<field name="priority">100</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="name" position="replace" /> <field name="name" position="replace" />
<field name="date" position="attributes"> <field name="date" position="attributes">
<attribute name="attrs">{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute> <attribute
name="attrs"
>{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute>
</field> </field>
<field name="project_id" position="attributes"> <field name="project_id" position="attributes">
<attribute name="options">{'no_open': True, 'no_create': True}</attribute> <attribute
name="options"
>{'no_open': True, 'no_create': True}</attribute>
<attribute name="string">Code activité UR</attribute> <attribute name="string">Code activité UR</attribute>
<attribute name="attrs">{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute> <attribute
name="attrs"
>{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute>
</field> </field>
<field name="project_id" position="after"> <field name="project_id" position="after">
<field name="partner_id" domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]" required="True" class="td-ellipsis" options="{'no_open': True, 'no_create': True}" string="Contact" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}"/> <field
<field name="name" class="td-minwidth" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}"/> name="partner_id"
domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]"
required="True"
class="td-ellipsis"
options="{'no_open': True, 'no_create': True}"
string="Contact"
attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}"
/>
<field
name="name"
class="td-minwidth"
attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}"
/>
<field name="is_present" widget="boolean_toggle" /> <field name="is_present" widget="boolean_toggle" />
<field
name="location"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14233)d)]}"
/>
</field> </field>
<field name="task_id" position="attributes"> <field name="task_id" position="attributes">
<attribute name="invisible">True</attribute> <attribute name="invisible">True</attribute>
</field> </field>
<field name="unit_amount" position="attributes"> <field name="unit_amount" position="attributes">
<attribute name="widget">float_time</attribute> <attribute name="widget">float_time</attribute>
<attribute name="attrs">{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute> <attribute
name="attrs"
>{'readonly': [('state', 'in', ('submit', 'valid'))]}</attribute>
</field> </field>
<field name="unit_amount" position="after"> <field name="unit_amount" position="after">
<field
name="travel_time"
widget="float_time"
invisible="context.get('hide_travel_time')"
/>
<field
name="is_overtime"
widget="boolean_toggle"
invisible="context.get('hide_overtime')"
/>
<field name="ur_regional_convention_nb" invisible="1" /> <field name="ur_regional_convention_nb" invisible="1" />
<field name="ur_financial_system_nb" invisible="1" /> <field name="ur_financial_system_nb" invisible="1" />
<field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('ur_financial_system_nb', '>', 0)], 'invisible': [('ur_financial_system_nb', '&lt;', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/> <field
<field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'invisible':[('ur_regional_convention_nb', '&lt;', 1)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"/> name="ur_financial_system_id"
options="{'no_open': True, 'no_create': True}"
invisible="context.get('hide_financial_system')"
attrs="{'required': [('ur_financial_system_nb', '>', 0)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"
/>
<field
name="ur_regional_convention_id"
options="{'no_open': True, 'no_create': True}"
invisible="context.get('hide_regional_convention')"
attrs="{'required':[('ur_regional_convention_nb', '>', 0)], 'readonly': [('state', 'in', ('submit', 'valid'))]}"
/>
<field
name="justificatifs"
attrs="{'invisible': [('ur_id', '!=', %(cgscop_partner.riga_14243)d)]}"
/>
<field name="state" /> <field name="state" />
<field name="ur_id" attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}" groups="cgscop_partner.group_cg_administrator"/> <field
name="ur_id"
attrs="{'readonly': [('state', 'in', ('submit', 'valid'))]}"
groups="cgscop_partner.group_cg_administrator"
/>
</field> </field>
</field> </field>
</record> </record>
...@@ -116,19 +344,57 @@ ...@@ -116,19 +344,57 @@
</field> </field>
</record> </record>
<!-- Calendar View Timesheet CG -->
<record model="ir.ui.view" id="view_cgscop_hr_timesheet_line_calendar">
<field name="name">account.analytic.line.timesheet.cgscop.calendar</field>
<field name="model">account.analytic.line</field>
<field name="arch" type="xml">
<calendar
string="Ligne de temps"
date_start="date"
mode="month"
quick_add="False"
color="project_id"
form_view_id="cgscop_timesheet.view_cgscop_hr_timesheet_line_form"
>
<field name="calendar_l1" />
<field name="calendar_l2" />
</calendar>
</field>
</record>
<!-- <!--
Actions Actions
--> -->
<!-- Hérite l'action de la fenetre --> <!-- Hérite l'action de la fenetre dans hr_timesheet -->
<record id="hr_timesheet.menu_hr_time_tracking" model="ir.actions.act_window">
<field name="name">Lignes de temps</field>
</record>
<record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window"> <record id="hr_timesheet.act_hr_timesheet_line" model="ir.actions.act_window">
<field name="name">Mes lignes de temps</field> <field name="view_mode">calendar,tree,form,pivot</field>
<field name="view_mode">tree,form,pivot,graph</field> <field
<field name="context">{'search_default_no_report': 1}</field> name="context"
>{'search_default_no_report': 1, 'search_default_groupby_date': 1}</field>
</record>
<record
id="act_hr_timesheet_line_view_calendar"
model="ir.actions.act_window.view"
>
<field name="view_mode">calendar</field>
<field name="sequence" eval="5" />
<field name="view_id" ref="view_cgscop_hr_timesheet_line_calendar" />
<field name="act_window_id" ref="hr_timesheet.act_hr_timesheet_line" />
</record>
<!-- Hérite l'action de la fenetre dans hr_timesheet -->
<record id="hr_timesheet.timesheet_action_all" model="ir.actions.act_window">
<field name="res_model">account.analytic.line</field>
<field name="search_view_id" ref="cgscop_hr_timesheet_line_search" />
<field name="domain">[('project_id', '!=', False)]</field>
<field name="context">{
'search_default_week':1,
'search_default_groupby_date':1,
'search_default_groupby_employee':1,
'search_default_groupby_project':1,
}</field>
</record> </record>
<!-- Report View per Contact --> <!-- Report View per Contact -->
...@@ -137,11 +403,17 @@ ...@@ -137,11 +403,17 @@
<field name="res_model">account.analytic.line</field> <field name="res_model">account.analytic.line</field>
<field name="domain">[('project_id', '!=', False)]</field> <field name="domain">[('project_id', '!=', False)]</field>
<field name="context">{'search_default_groupby_partner':1,}</field> <field name="context">{'search_default_groupby_partner':1,}</field>
<field name="search_view_id" ref="cgscop_timesheet.cgscop_hr_timesheet_line_search"/> <field
<field name="view_ids" eval="[(5, 0, 0), name="search_view_id"
ref="cgscop_timesheet.cgscop_hr_timesheet_line_search"
/>
<field
name="view_ids"
eval="[(5, 0, 0),
(0, 0, {'view_mode': 'pivot', 'sequence': 5, 'view_id': ref('hr_timesheet.view_hr_timesheet_line_pivot')}), (0, 0, {'view_mode': 'pivot', 'sequence': 5, 'view_id': ref('hr_timesheet.view_hr_timesheet_line_pivot')}),
(0, 0, {'view_mode': 'tree', 'sequence': 10, 'view_id': ref('cgscop_timesheet.view_cgscop_hr_timesheet_line_tree')}), (0, 0, {'view_mode': 'tree', 'sequence': 10, 'view_id': ref('cgscop_timesheet.view_cgscop_hr_timesheet_line_tree')}),
(0, 0, {'view_mode': 'form', 'sequence': 15, 'view_id': ref('cgscop_timesheet.view_cgscop_hr_timesheet_line_form')})]"/> (0, 0, {'view_mode': 'form', 'sequence': 15, 'view_id': ref('cgscop_timesheet.view_cgscop_hr_timesheet_line_form')})]"
/>
</record> </record>
<record id="hr_timesheet_submit_action_server" model="ir.actions.server"> <record id="hr_timesheet_submit_action_server" model="ir.actions.server">
...@@ -160,25 +432,30 @@ if records: ...@@ -160,25 +432,30 @@ if records:
<!-- <!--
Menus Menus
--> -->
<!-- ajoute des droits sur le menu Configuration --> <!-- ajoute des droits sur le menu Configuration -->
<record model="ir.ui.menu" id="hr_timesheet.hr_timesheet_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')])]"/> <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> </record>
<!-- ajoute des droits pour gestionnaire uniquement sur le menu Toutes les feuilles de temps -->
<!-- ajoute des droits pour gestionnaire uniquement sur le menu Toutes les lignes de temps -->
<record model="ir.ui.menu" id="hr_timesheet.timesheet_menu_activity_all"> <record model="ir.ui.menu" id="hr_timesheet.timesheet_menu_activity_all">
<field name="groups_id" eval="[(6,0, [ref('hr_timesheet.group_timesheet_manager'), ref('cgscop_partner.group_cg_administrator')])]"/> <field
name="groups_id"
eval="[(6,0, [ref('hr_timesheet.group_timesheet_manager'), ref('cgscop_partner.group_cg_administrator')])]"
/>
</record> </record>
<menuitem id="timesheet_menu_report_timesheet_by_contact" <menuitem
id="timesheet_menu_report_timesheet_by_contact"
parent="hr_timesheet.menu_timesheets_reports_timesheet" parent="hr_timesheet.menu_timesheets_reports_timesheet"
action="timesheet_action_report_by_contact" action="timesheet_action_report_by_contact"
name="Par Contact" name="Par Contact"
sequence="25"/> sequence="25"
/>
</data>
<data noupdate="1">
<delete id="hr_timesheet.timesheet_menu_report_timesheet_by_task" model="ir.ui.menu"/>
</data> </data>
</odoo> </odoo>
views/hr_timesheet_cgscop.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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> <data>
...@@ -12,14 +11,27 @@ ...@@ -12,14 +11,27 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Project"> <form string="Project">
<sheet string="Project"> <sheet string="Project">
<div class="oe_button_box" name="button_box" groups="base.group_user"> <field name="active" invisible="1" />
<button class="oe_stat_button" name="%(hr_timesheet.act_hr_timesheet_line_by_project)d" type="action" icon="fa-calendar" string="Timesheets" attrs="{'invisible': [('allow_timesheets', '=', False)]}" groups="hr_timesheet.group_hr_timesheet_user"/> <widget
<button name="toggle_active" type="object" name="web_ribbon"
confirm="(Un)archiving a project automatically (un)archives its tasks. Do you want to proceed?" title="Archivé"
class="oe_stat_button" icon="fa-archive"> bg_color="bg-danger"
<field name="active" widget="boolean_button" attrs="{'invisible': [('active', '=', True)]}"
options='{"terminology": "archive"}'/> />
</button> <div
class="oe_button_box"
name="button_box"
groups="base.group_user"
>
<button
class="oe_stat_button"
name="%(hr_timesheet.act_hr_timesheet_line_by_project)d"
type="action"
icon="fa-calendar"
string="Timesheets"
attrs="{'invisible': [('allow_timesheets', '=', False)]}"
groups="hr_timesheet.group_hr_timesheet_user"
/>
</div> </div>
<div class="oe_title"> <div class="oe_title">
<h1> <h1>
...@@ -28,34 +40,73 @@ ...@@ -28,34 +40,73 @@
</div> </div>
<group> <group>
<group> <group>
<field name="partner_id" string="Contact par défaut" domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]" help="Contact par défaut auquel est rattaché cette activité. Ce contact sera sélectionné automatiquement dans les feuilles de temps" options="{'no_open': True, 'no_create': True}"/> <field
<field name="ur_id" string="Union Régionale" options="{'no_open': True, 'no_create': True}" required="1" /> name="partner_id"
<field name="company_id" groups="base.group_multi_company" options="{'no_open': True, 'no_create': True}" string="Société" invisible="1" /> string="Contact par défaut"
domain="[('is_company', '=', True), ('ur_id', '=', ur_id)]"
help="Contact par défaut auquel est rattaché cette activité. Ce contact sera sélectionné automatiquement dans les feuilles de temps"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="ur_id"
string="Union Régionale"
options="{'no_open': True, 'no_create': True}"
required="1"
/>
<field
name="company_id"
groups="base.group_multi_company"
options="{'no_open': True, 'no_create': True}"
string="Société"
invisible="1"
/>
</group> </group>
<group> <group>
<field name="cgscop_timesheet_code_id" required="1" placeholder="Code activité National" options="{'no_open': True, 'no_create': True}"/> <field
name="cgscop_timesheet_code_id"
required="1"
placeholder="Code activité National"
options="{'no_open': True, 'no_create': True}"
/>
<field name="creation_invoiced" widget="boolean_toggle" />
<field name="analytic_account_id" invisible="1" /> <field name="analytic_account_id" invisible="1" />
<field name="privacy_visibility" invisible="1" /> <field name="privacy_visibility" invisible="1" />
<field name="allow_timesheets" invisible="1" /> <field name="allow_timesheets" invisible="1" />
</group> </group>
</group> </group>
<group string="Configuration" name="project_config" groups="base.group_no_one"> <group
string="Configuration"
name="project_config"
groups="base.group_no_one"
>
<group> <group>
<field name="user_id" string="Project Manager" <field
attrs="{'readonly':[('active','=',False)]}" options="{'no_open': True, 'no_create': True}"/> name="user_id"
string="Project Manager"
attrs="{'readonly':[('active','=',False)]}"
options="{'no_open': True, 'no_create': True}"
/>
<field name="sequence" groups="base.group_no_one" /> <field name="sequence" groups="base.group_no_one" />
</group> </group>
<group> <group>
<field name="allow_timesheets" /> <field name="allow_timesheets" />
<field name="privacy_visibility" widget="radio" /> <field name="privacy_visibility" widget="radio" />
<field name="resource_calendar_id" groups="base.group_no_one"/> <field
name="resource_calendar_id"
groups="base.group_no_one"
/>
</group> </group>
</group> </group>
</sheet> </sheet>
<div class="oe_chatter"> <div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically track the events associated to tasks and issues of this project." groups="base.group_user"/> <field
name="message_follower_ids"
options="{'post_refresh':True}"
groups="base.group_user"
/>
<field name="message_ids" />
</div> </div>
</form> </form>
</field> </field>
...@@ -68,13 +119,24 @@ ...@@ -68,13 +119,24 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Search Project"> <search string="Search Project">
<field name="name" string="Code activité UR" /> <field name="name" string="Code activité UR" />
<field name="cgscop_timesheet_code_id" string="Code activité National"/> <field
name="cgscop_timesheet_code_id"
string="Code activité National"
/>
<field name="partner_id" string="Contact par défaut" /> <field name="partner_id" string="Contact par défaut" />
<filter string="Archived" name="inactive" domain="[('active','=',False)]"/> <filter
string="Archived"
name="inactive"
domain="[('active','=',False)]"
/>
<group expand="0" string="Group By"> <group expand="0" string="Group By">
<filter string="Contact par défaut" name="Partner" context="{'group_by': 'partner_id'}"/> <filter
string="Contact par défaut"
name="Partner"
context="{'group_by': 'partner_id'}"
/>
</group> </group>
</search> </search>
</field> </field>
...@@ -89,8 +151,15 @@ ...@@ -89,8 +151,15 @@
<field name="sequence" widget="handle" /> <field name="sequence" widget="handle" />
<field name="active" invisible="1" /> <field name="active" invisible="1" />
<field name="name" /> <field name="name" />
<field name="cgscop_timesheet_code_id" options="{'no_open': True, 'no_create': True}"/> <field
<field name="partner_id" string="Contact" options="{'no_open': True, 'no_create': True}"/> name="cgscop_timesheet_code_id"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="partner_id"
string="Contact"
options="{'no_open': True, 'no_create': True}"
/>
</tree> </tree>
</field> </field>
</record> </record>
...@@ -104,11 +173,19 @@ ...@@ -104,11 +173,19 @@
<field name="user_id" string="Project Manager" /> <field name="user_id" string="Project Manager" />
<templates> <templates>
<t t-name="kanban-box"> <t t-name="kanban-box">
<div t-attf-class="oe_kanban_content oe_kanban_global_click o_kanban_get_form"> <div
t-attf-class="oe_kanban_content oe_kanban_global_click o_kanban_get_form"
>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<strong><field name="name" string="Code activité UR"/></strong> <strong><field
<field name="cgscop_timesheet_code_id" string="Code activité CG"/> name="name"
string="Code activité UR"
/></strong>
<field
name="cgscop_timesheet_code_id"
string="Code activité CG"
/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -117,7 +194,14 @@ ...@@ -117,7 +194,14 @@
</div> </div>
<div class="col-4"> <div class="col-4">
<div class="oe_kanban_bottom_right"> <div class="oe_kanban_bottom_right">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value" width="24" height="24" class="oe_kanban_avatar float-right"/> <img
t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)"
t-att-title="record.user_id.value"
t-att-alt="record.user_id.value"
width="24"
height="24"
class="oe_kanban_avatar float-right"
/>
</div> </div>
</div> </div>
</div> </div>
...@@ -131,13 +215,15 @@ ...@@ -131,13 +215,15 @@
<record id="act_cgscop_project_timesheet" model="ir.actions.act_window"> <record id="act_cgscop_project_timesheet" model="ir.actions.act_window">
<field name="name">Codes activités UR</field> <field name="name">Codes activités UR</field>
<field name="res_model">project.project</field> <field name="res_model">project.project</field>
<field name="view_type">form</field>
<field name="domain">[]</field> <field name="domain">[]</field>
<field name="view_mode">tree,kanban,form</field> <field name="view_mode">tree,kanban,form</field>
<field name="view_ids" eval="[(5, 0, 0), <field
name="view_ids"
eval="[(5, 0, 0),
(0, 0, {'view_mode': 'tree', 'view_id': ref('view_cgscop_project_timesheet_tree')}), (0, 0, {'view_mode': 'tree', 'view_id': ref('view_cgscop_project_timesheet_tree')}),
(0, 0, {'view_mode': 'kanban', 'view_id': ref('view_cgscop_project_timesheet_kanban')}), (0, 0, {'view_mode': 'kanban', 'view_id': ref('view_cgscop_project_timesheet_kanban')}),
(0, 0, {'view_mode': 'form', 'view_id': ref('view_cgscop_project_timesheet_form')})]"/> (0, 0, {'view_mode': 'form', 'view_id': ref('view_cgscop_project_timesheet_form')})]"
/>
<field name="search_view_id" ref="view_cgscop_project_timesheet_filter" /> <field name="search_view_id" ref="view_cgscop_project_timesheet_filter" />
<field name="context">{ <field name="context">{
'default_privacy_visibility': 'employees', 'default_privacy_visibility': 'employees',
...@@ -151,7 +237,8 @@ ...@@ -151,7 +237,8 @@
action="act_cgscop_project_timesheet" action="act_cgscop_project_timesheet"
id="menu_action_project_lines_tree" id="menu_action_project_lines_tree"
sequence="35" sequence="35"
groups="cgscop_partner.group_ur_list_modif,cgscop_partner.group_cg_administrator"/> groups="cgscop_partner.group_ur_list_modif,cgscop_partner.group_cg_administrator"
/>
</data> </data>
</odoo> </odoo>
views/res_company.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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> <data>
<record id="company_form_with_ur" model="ir.ui.view"> <record id="company_form_with_ur" model="ir.ui.view">
...@@ -14,7 +13,13 @@ ...@@ -14,7 +13,13 @@
<group> <group>
<group string="Condiguration Imputations"> <group string="Condiguration Imputations">
<field name="day_working" widget="boolean_toggle" /> <field name="day_working" widget="boolean_toggle" />
<field name="day_duration" attrs="{'invisible': [('day_working', '=', True)]}"/> <field
name="day_duration"
attrs="{'invisible': [('day_working', '=', True)]}"
/>
<field name="overtime_working" widget="boolean_toggle" />
<field name="weekend_working" widget="boolean_toggle" />
<field name="use_travel_time" widget="boolean_toggle" />
</group> </group>
</group> </group>
</page> </page>
......
views/res_partner.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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> <data>
<!-- Tree View Timesheet CG --> <!-- Tree View Timesheet CG -->
<record id="view_cgscop_hr_timesheet_account_inherit" model="ir.ui.view">
<field name="name">res.partner.cgscop.timesheet.account.inherit</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<page name="accounting" position="attributes">
<attribute name="invisible">True</attribute>
</page>
</field>
</record>
<record id="view_partner_cooperative_timesheet_form" model="ir.ui.view"> <record id="view_partner_cooperative_timesheet_form" model="ir.ui.view">
<field name="name">cooperative.timesheet.form</field> <field name="name">cooperative.timesheet.form</field>
<field name="model">res.partner</field> <field name="model">res.partner</field>
<field name="inherit_id" ref="cgscop_partner.scop_contact_view_form" /> <field name="inherit_id" ref="cgscop_partner.scop_contact_view_form" />
<field name="priority" eval="1" /> <field name="priority" eval="1" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='activity_federation_com']" position="before"> <xpath
<separator></separator> expr="//field[@name='activity_federation_indus_ids']"
position="after"
>
<separator />
<field name="ur_regional_convention_nb" invisible="1" /> <field name="ur_regional_convention_nb" invisible="1" />
<field name="ur_financial_system_nb" invisible="1" /> <field name="ur_financial_system_nb" invisible="1" />
<field name="ur_financial_system_id" options="{'no_open': True, 'no_create': True}" attrs="{'invisible':[('ur_financial_system_nb', '=', 0)]}"/> <field
<field name="ur_financial_system_date" attrs="{'invisible':[('ur_financial_system_id','=',False)]}"/> name="ur_financial_system_id"
<field name="ur_regional_convention_id" options="{'no_open': True, 'no_create': True}" attrs="{'invisible':[('ur_regional_convention_nb', '=', 0)]}"/> options="{'no_open': True, 'no_create': True}"
<field name="ur_regional_convention_date" attrs="{'invisible':[('ur_regional_convention_id','=',False)]}"/> attrs="{'invisible':[('ur_financial_system_nb', '=', 0)]}"
<separator></separator> />
<field
name="ur_financial_system_date"
attrs="{'invisible':[('ur_financial_system_id','=',False)]}"
/>
<field
name="ur_regional_convention_id"
options="{'no_open': True, 'no_create': True}"
attrs="{'invisible':[('ur_regional_convention_nb', '=', 0)]}"
/>
<field
name="ur_regional_convention_date"
attrs="{'invisible':[('ur_regional_convention_id','=',False)]}"
/>
<separator />
</xpath> </xpath>
</field> </field>
</record> </record>
......
views/ur_financial_system.xml
Voir le fichier @ d647557a
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!-- Copyright 2019 Le Filament <!-- Copyright 2019 Le Filament
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> <data>
<record id="view_ur_financial_system_tree" model="ir.ui.view"> <record id="view_ur_financial_system_tree" model="ir.ui.view">
...@@ -10,8 +9,15 @@ ...@@ -10,8 +9,15 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree editable='top'> <tree editable='top'>
<field name="name" /> <field name="name" />
<field name="ur_id" options="{'no_open': True, 'no_create': True}"/> <field
<field name="company_id" groups="base.group_no_one" options="{'no_open': True, 'no_create': True}"/> name="ur_id"
options="{'no_open': True, 'no_create': True}"
/>
<field
name="company_id"
groups="base.group_no_one"
options="{'no_open': True, 'no_create': True}"
/>
</tree> </tree>
</field> </field>
</record> </record>
...@@ -22,12 +28,14 @@ ...@@ -22,12 +28,14 @@
<field name="view_mode">tree</field> <field name="view_mode">tree</field>
</record> </record>
<menuitem id="menu_ur_financial_system" <menuitem
id="menu_ur_financial_system"
name="Dispositifs financiers" name="Dispositifs financiers"
parent="hr_timesheet.hr_timesheet_menu_configuration" parent="hr_timesheet.hr_timesheet_menu_configuration"
action="action_ur_financial_system" action="action_ur_financial_system"
sequence="45" sequence="45"
groups="cgscop_partner.group_ur_list_modif"/> groups="cgscop_partner.group_ur_list_modif"
/>
</data> </data>
</odoo> </odoo>