diff --git a/__manifest__.py b/__manifest__.py index 4c1338812fb3b006702c6ef7a65a86609cb118ab..188e1525133d883bad0dd7f72ade53bb61d1e093 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -24,12 +24,7 @@ 'security/ir.model.access.csv', 'views/res_partner_view.xml', 'views/menu_partner.xml', - # 'data/res.partner.aide.csv', - # 'data/res.partner.com.csv', - # 'data/res.partner.role.csv', 'data/res_partner_data.xml', - # 'data/res.partner.suivi.csv', - # 'data/res.partner.pref.csv', ], } \ No newline at end of file diff --git a/data/res.partner.aide.csv b/data/res.partner.aide.csv deleted file mode 100644 index f2eb3434d3dcfb56cec363543d5cd5a7d16df640..0000000000000000000000000000000000000000 --- a/data/res.partner.aide.csv +++ /dev/null @@ -1,3 +0,0 @@ -"id","name" -1,"ILS" -2,"IC" \ No newline at end of file diff --git a/data/res.partner.com.csv b/data/res.partner.com.csv deleted file mode 100644 index 018dea78498eb7c086f7c53161865d75ae7a4369..0000000000000000000000000000000000000000 --- a/data/res.partner.com.csv +++ /dev/null @@ -1,5 +0,0 @@ -"id","name" -1,"LSF" -2,"Oral" -3,"Prise en note" -4,"LS Etrangere" \ No newline at end of file diff --git a/data/res.partner.pref.csv b/data/res.partner.pref.csv deleted file mode 100644 index a26dd0826961c945df01944d0d8fa76f2ffe4cfe..0000000000000000000000000000000000000000 --- a/data/res.partner.pref.csv +++ /dev/null @@ -1,4 +0,0 @@ -"id","name" -1,"envoi par email" -2,"envoi par courrier" -3,"envoi par chorus pro" \ No newline at end of file diff --git a/data/res.partner.role.csv b/data/res.partner.role.csv deleted file mode 100644 index 720ad1c5ae1e875a6928f264c7bcf6b6b88a1921..0000000000000000000000000000000000000000 --- a/data/res.partner.role.csv +++ /dev/null @@ -1,5 +0,0 @@ -"id","name" -1,"Commanditaire" -2,"Opérationnel" -3,"Salarié" -4,"Compta-facturation" \ No newline at end of file diff --git a/data/res.partner.statutspe.csv b/data/res.partner.statutspe.csv deleted file mode 100644 index af9cc1fd6c92a5b3a36c0ccc833e20d2347c9d71..0000000000000000000000000000000000000000 --- a/data/res.partner.statutspe.csv +++ /dev/null @@ -1,6 +0,0 @@ -"id","name" -1,"Permanence" -2,"Stagiaire formation LSF VP" -3,"Stagiaire formation français VP" -4,"Stagiaire formation catalogue" -5,"Perso" \ No newline at end of file diff --git a/data/res.partner.suivi.csv b/data/res.partner.suivi.csv deleted file mode 100644 index 7e56510c702a385a8b5283961cb0b7f1fd46005d..0000000000000000000000000000000000000000 --- a/data/res.partner.suivi.csv +++ /dev/null @@ -1,4 +0,0 @@ -"id","name" -1,"Pôle emploi" -2,"Cap emploi" -3,"Mission locale" \ No newline at end of file diff --git a/models/res_partner.py b/models/res_partner.py index 0046c7009fc8019fc97a9052278807f89b9cf9c2..fb3fd8a3c7fd76602307f074aa8e141fc6d78a2a 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -14,9 +14,8 @@ class AutreResPartner(models.Model): phone_pro = fields.Char('Téléphone pro') role = fields.Many2many('res.partner.role', string="Rôle dans l’organisation") statuts_spe = fields.Many2many('res.partner.statutspe', string="Statuts spécifiques") - ic_referent = fields.Many2one('res.partner', string='IC référent') - # ic_possibles = fields.Many2many('res.partner', string='IC possibles') - ic_possibles = fields.One2many('res.partner', 'parent_id', string='IC possibles', domain=[('active', '=', True)]) + ic_referent = fields.Many2one('res.partner', string='IC référent', domain=[('parent_id', '=', 1)]) + ic_possibles = fields.Many2many(comodel_name='res.partner', relation='ic_possibles', column1='ic_possible_id', column2='parent_id' ,string='IC possibles', domain=[('active', '=', True), ('parent_id', '=', 1)]) statuts_perso = fields.Selection([ ('retraité','retraité'), ('demandeur','demandeur d’emploi'), diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml index e93c18b6a602b7563dc07f97b8769c30189f6677..2272b67cd783c8da1acf7021cdf50fb70f0d095b 100644 --- a/views/res_partner_view.xml +++ b/views/res_partner_view.xml @@ -264,5 +264,17 @@ </field> </record> + <record id="autrement_view_res_partner_filter" model="ir.ui.view"> + <field name="name">autrement.res.partner.select</field> + <field name="model">res.partner</field> + <field name="inherit_id" ref="base.view_res_partner_filter"/> + <field name="arch" type="xml"> + <xpath expr="//filter[@name='type_person']" position="before"> + <separator/> + <filter string="Bénéficiaires" name="beneficiaires" domain="[('beneficiaire','=',True)]"/> + </xpath> + </field> + </record> + </data> </odoo>