From fe12002df05a50f93b810ca14daec5c19cb9e092 Mon Sep 17 00:00:00 2001
From: benjamin <benjamin@le-filament.com>
Date: Mon, 4 Apr 2022 11:39:19 +0200
Subject: [PATCH] [fix] default company
---
models/cgscop_timesheet_sheet.py | 2 +-
models/ur_financial_system.py | 2 +-
models/ur_month_timesheet.py | 2 +-
models/ur_regional_convention.py | 2 +-
views/cgscop_timesheet_sheet.xml | 6 +++---
views/hr_timesheet_cgscop.xml | 28 +++++++++-------------------
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/models/cgscop_timesheet_sheet.py b/models/cgscop_timesheet_sheet.py
index f6ddf31..e6c87c2 100644
--- a/models/cgscop_timesheet_sheet.py
+++ b/models/cgscop_timesheet_sheet.py
@@ -47,7 +47,7 @@ class ScopHrTimesheetSheet(models.Model):
string="Company",
readonly=True,
states={"draft": [("readonly", False)]},
- default=lambda self: self.env.user.company_id,
+ default=lambda self: self.env.company,
)
validation_date = fields.Date("Date de validation")
submit_date = fields.Date("Soumis le")
diff --git a/models/ur_financial_system.py b/models/ur_financial_system.py
index 6fe8030..b5be7a0 100644
--- a/models/ur_financial_system.py
+++ b/models/ur_financial_system.py
@@ -15,7 +15,7 @@ class ScopTimesheetCode(models.Model):
company_id = fields.Many2one(
comodel_name="res.company",
string="Société",
- default=lambda self: self.env.user.company_id,
+ default=lambda self: self.env.company,
)
ur_id = fields.Many2one(
"union.regionale",
diff --git a/models/ur_month_timesheet.py b/models/ur_month_timesheet.py
index a3c9387..2a0c223 100644
--- a/models/ur_month_timesheet.py
+++ b/models/ur_month_timesheet.py
@@ -42,7 +42,7 @@ class ScopMonthTimesheet(models.Model):
company_id = fields.Many2one(
comodel_name="res.company",
string="Société",
- default=lambda self: self.env.user.company_id,
+ default=lambda self: self.env.company,
)
ur_id = fields.Many2one(
"union.regionale",
diff --git a/models/ur_regional_convention.py b/models/ur_regional_convention.py
index ec71f9e..24a8078 100644
--- a/models/ur_regional_convention.py
+++ b/models/ur_regional_convention.py
@@ -15,7 +15,7 @@ class ScopRegionalConvention(models.Model):
company_id = fields.Many2one(
comodel_name="res.company",
string="Société",
- default=lambda self: self.env.user.company_id,
+ default=lambda self: self.env.company,
)
ur_id = fields.Many2one(
"union.regionale",
diff --git a/views/cgscop_timesheet_sheet.xml b/views/cgscop_timesheet_sheet.xml
index 6b0eb49..12a0425 100644
--- a/views/cgscop_timesheet_sheet.xml
+++ b/views/cgscop_timesheet_sheet.xml
@@ -130,9 +130,9 @@
</field>
</sheet>
<div class="oe_chatter">
- <field name="message_follower_ids" widget="mail_followers" />
- <field name="activity_ids" widget="mail_activity" />
- <field name="message_ids" widget="mail_thread" />
+ <field name="message_follower_ids" options="{'post_refresh':True}" groups="base.group_user"/>
+ <field name="activity_ids"/>
+ <field name="message_ids"/>
</div>
</form>
</field>
diff --git a/views/hr_timesheet_cgscop.xml b/views/hr_timesheet_cgscop.xml
index 0e4dd24..63bb233 100644
--- a/views/hr_timesheet_cgscop.xml
+++ b/views/hr_timesheet_cgscop.xml
@@ -11,6 +11,13 @@
<field name="arch" type="xml">
<form string="Project">
<sheet string="Project">
+ <field name="active" invisible="1" />
+ <widget
+ name="web_ribbon"
+ title="Archivé"
+ bg_color="bg-danger"
+ attrs="{'invisible': [('active', '=', True)]}"
+ />
<div
class="oe_button_box"
name="button_box"
@@ -25,19 +32,6 @@
attrs="{'invisible': [('allow_timesheets', '=', False)]}"
groups="hr_timesheet.group_hr_timesheet_user"
/>
- <button
- name="toggle_active"
- type="object"
- confirm="(Un)archiving a project automatically (un)archives its tasks. Do you want to proceed?"
- class="oe_stat_button"
- icon="fa-archive"
- >
- <field
- name="active"
- widget="boolean_button"
- options='{"terminology": "archive"}'
- />
- </button>
</div>
<div class="oe_title">
<h1>
@@ -106,12 +100,8 @@
</sheet>
<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>
</form>
</field>
--
GitLab