diff --git a/models/scop_partner_staff.py b/models/scop_partner_staff.py index 3780609aa7eefd34b95562a996748a5c9326b8f5..868c73bedb3fa76bdd23c0ce9f0304aca844738a 100644 --- a/models/scop_partner_staff.py +++ b/models/scop_partner_staff.py @@ -24,10 +24,13 @@ class ScopPartnerStaff(models.Model): required=True, default=lambda self: self.env.uid) type_entry = fields.Selection([ - ('manual', 'Manuel'), - ('ministry_list', 'Liste Ministère')], + ('questionnaire', 'Manuel'), + ('questionnaire_inscription', 'Manuel'), + ('regul_ur', 'Régularisation UR'), + ('regul_cg', 'Régularisation CG'), + ('regul_diane', 'Régularisation Diane')], string="Type", - default='manual') + default='regul_ur') effective_date = fields.Date( string="Date", default=fields.Date.today(), @@ -39,3 +42,4 @@ class ScopPartnerStaff(models.Model): comodel_name='scop.questionnaire', string='Questionnaire', ondelete='cascade') + comment = fields.Char('Commentaire') diff --git a/models/scop_questionnaire.py b/models/scop_questionnaire.py index 0bf23085536f4effbff73e53bb84f7b68247a30c..21f5672647257d8a275563715de523a8808a05bd 100644 --- a/models/scop_questionnaire.py +++ b/models/scop_questionnaire.py @@ -32,11 +32,12 @@ class ScopQuestionnaire(models.Model): @api.model_create_multi def create(self, vals_list): questionnaire = super(ScopQuestionnaire, self).create(vals_list) + quest_type = self.env.ref('cgscop_partner.questionnaire_type_1') if questionnaire.effective_date: staff_values = { 'partner_id': questionnaire.partner_id.id, 'user_id': self.env.uid, - 'type_entry': 'ministry_list', + 'type_entry': 'questionnaire' if questionnaire.type_id != quest_type else 'questionnaire_inscription', 'effective_date': questionnaire.effective_date, 'staff_count': questionnaire.staff_count, 'staff_shareholder_count': questionnaire.staff_shareholder_count, @@ -50,6 +51,7 @@ class ScopQuestionnaire(models.Model): @api.multi def write(self, vals): questionnaire = super(ScopQuestionnaire, self).write(vals) + quest_type = self.env.ref('cgscop_partner.questionnaire_type_1') staff = self.env['scop.partner.staff'].search([ ('questionnaire_id', '=', self.id)]) if staff: @@ -57,7 +59,7 @@ class ScopQuestionnaire(models.Model): staff_values = { 'partner_id': self.partner_id.id, 'user_id': self.env.uid, - 'type_entry': 'ministry_list', + 'type_entry': 'questionnaire' if questionnaire.type_id != quest_type else 'questionnaire_inscription', 'effective_date': self.effective_date, 'staff_count': self.staff_count, 'staff_shareholder_count': self.staff_shareholder_count, diff --git a/views/res_partner.xml b/views/res_partner.xml index 6900d29e045ccc389057d9c2e915b969ec43ba9b..8a50d3915ab0e7728eae3588354620bb5d0bdb26 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -747,6 +747,7 @@ <field name="staff_count" attrs="{'readonly':[('type_entry','=','ministry_list')]}"/> <field name="staff_shareholder_count" attrs="{'readonly':[('type_entry','=','ministry_list')]}"/> <field name="staff_average" attrs="{'readonly':[('type_entry','=','ministry_list')]}"/> + <field name="comment" /> <field name="user_id" readonly="1"/> </tree> </field>