Skip to content
Extraits de code Groupes Projets
Valider 5e412d84 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[cgscop #144] Faire Apparaitre la convention regionale sur les frais si elle existe

parent 630b16df
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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(
......
......@@ -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,
},
}
......@@ -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>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter