diff --git a/models/hr_expense.py b/models/hr_expense.py index 39a737021e333642d99b0eb885958322ba5ee9e5..ef1bb0e5db13a2555034e59695aa1f902a5c9c2e 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 71fce40e8aee4e256eb376141092ca6c20a99269..3c6983b61d3944458914c527c480177bade26b9b 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 ab2af1fb08a6c3854e561b6cf682f54a3e23cc06..4994ce2d7435518e3a74a2dc2afaae88d5275257 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>