From 5e412d841d48773c8b1f974ab444f7c488d64c7a Mon Sep 17 00:00:00 2001
From: Benjamin <benjamin@le-filament.com>
Date: Mon, 20 Apr 2020 12:48:17 +0200
Subject: [PATCH] [cgscop #144] Faire Apparaitre la convention regionale sur
les frais si elle existe
---
models/hr_expense.py | 4 ++++
models/hr_timesheet.py | 2 ++
views/hr_expense.xml | 1 +
3 files changed, 7 insertions(+)
diff --git a/models/hr_expense.py b/models/hr_expense.py
index 39a7370..ef1bb0e 100644
--- a/models/hr_expense.py
+++ b/models/hr_expense.py
@@ -34,6 +34,10 @@ class CGScopExpense(models.Model):
related="timesheet_id.ur_financial_system_id",
string='Dispositif Financier',
store=True)
+ ur_regional_convention_id = fields.Many2one(
+ related="timesheet_id.ur_regional_convention_id",
+ string='Convention Régionale',
+ store=True)
expense_formula = fields.Selection(
related='product_id.expense_formula')
is_ik = fields.Boolean(
diff --git a/models/hr_timesheet.py b/models/hr_timesheet.py
index 71fce40..3c6983b 100644
--- a/models/hr_timesheet.py
+++ b/models/hr_timesheet.py
@@ -45,6 +45,7 @@ class ScopHrTimesheetExp(models.Model):
'default_coop_id': ts.partner_id.id,
'default_account_analytic_id': ts.project_id.id,
'default_ur_financial_system_id': ts.ur_financial_system_id.id,
+ 'default_ur_regional_convention_id': ts.ur_regional_convention_id.id,
'default_date': ts.date,
},
}
@@ -63,6 +64,7 @@ class ScopHrTimesheetExp(models.Model):
'default_coop_id': ts.partner_id.id,
'default_account_analytic_id': ts.project_id.id,
'default_ur_financial_system_id': ts.ur_financial_system_id.id,
+ 'default_ur_regional_convention_id': ts.ur_regional_convention_id.id,
'default_date': ts.date,
},
}
diff --git a/views/hr_expense.xml b/views/hr_expense.xml
index ab2af1f..4994ce2 100644
--- a/views/hr_expense.xml
+++ b/views/hr_expense.xml
@@ -95,6 +95,7 @@
<field name="analytic_account_id" position="after">
<field name="coop_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True, 'no_create': True}" />
<field name="ur_financial_system_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True, 'no_create': True}"/>
+ <field name="ur_regional_convention_id" attrs="{'invisible': [('timesheet_id', '=', False)]}" readonly="True" options="{'no_open': True, 'no_create': True}"/>
</field>
<label for="payment_mode" position="attributes">
<attribute name="invisible">True</attribute>
--
GitLab