diff --git a/models/afac_partner_list.py b/models/afac_partner_list.py index 563c3115eb516afe5e3e8b9dff79ea0f6f83ec12..082ad4a57c40f4c3b8cdefca690a5438e867b80b 100644 --- a/models/afac_partner_list.py +++ b/models/afac_partner_list.py @@ -94,3 +94,10 @@ class AfacPartnerMandate(models.Model): name = fields.Char(string="Mandat", required=True) color = fields.Integer("Couleur") + +class AfacPartnerWaterAgency(models.Model): + _name = "afac.partner.water.agency" + _description = "Agence Eau rattachement" + _order = "name" + + name = fields.Char(string="Agence Eau rattachement", required=True) diff --git a/models/res_partner.py b/models/res_partner.py index 28b565f9ce6129943042385fd93c3e393ca5afa2..699477d3f0ee19b927c3356b6eca0dea37ce2737 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -57,6 +57,8 @@ class ResPartner(models.Model): comodel_name="afac.partner.type", string="Type de structure" ) college_id = fields.Many2one(comodel_name="afac.partner.college", string="Collège") + water_agency_id = fields.Many2one( + comodel_name="afac.partner.water.agency", string="Agence Eau rattachement") skill_ids = fields.Many2many( comodel_name="afac.partner.activity", relation="afac_partner_activity_res_partner_rel", diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index c096b87c5ebeec5c097b1a6d935f65ac91e862f0..c343ec4f86c58ddd88f1f4245d5cfec3ef2cac84 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -9,6 +9,7 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink "access_afac_partner_type_group_user","afac_partner_type_group_user","model_afac_partner_type","base.group_user",1,0,0,0 "access_afac_partner_mandate_group_user","afac_partner_mandate_group_user","model_afac_partner_mandate","base.group_user",1,0,0,0 "access_afac_partner_region_group_user","afac_partner_region_group_user","model_afac_partner_region","base.group_user",1,0,0,0 +"access_afac_partner_water_agency_group_user","afac_partner_water_agency_group_user","model_afac_partner_water_agency","base.group_user",1,0,0,0 "access_afac_project_group_user","afac_project_group_user","model_afac_project","base.group_user",1,1,1,1 "access_afac_project_category_group_user","afac_project_category_group_user","model_afac_project_category","base.group_user",1,1,1,1 "access_afac_project_partner_group_user","afac_project_partner_group_user","model_afac_project_partner","base.group_user",1,1,1,1 @@ -22,3 +23,4 @@ id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink "access_afac_partner_type_group_manager","afac_partner_type_group_manager","model_afac_partner_type","afac_partner.group_afac_list_manager",1,1,1,1 "access_afac_partner_mandate_group_manager","afac_partner_mandate_group_manager","model_afac_partner_mandate","afac_partner.group_afac_list_manager",1,1,1,1 "access_afac_partner_region_group_manager","afac_partner_region_group_manager","model_afac_partner_region","afac_partner.group_afac_list_manager",1,1,1,1 +"access_afac_partner_water_agency_group_manager","afac_partner_water_agency_group_manager","model_afac_partner_water_agency","afac_partner.group_afac_list_manager",1,1,1,1 diff --git a/views/afac_partner_list.xml b/views/afac_partner_list.xml index 34d809e95a9644aaa4229be4fa12b3c0c86aad0b..5d8522343b97859371b9efd1947d072b794630f8 100644 --- a/views/afac_partner_list.xml +++ b/views/afac_partner_list.xml @@ -197,6 +197,27 @@ </field> </record> + <!-- Agence Eau rattachement --> + <record id="afac_partner_water_agency_tree_view" model="ir.ui.view"> + <field name="name">afac.partner.water_agency.tree</field> + <field name="model">afac.partner.water.agency</field> + <field name="arch" type="xml"> + <tree string="Agence Eau rattachement" editable="top"> + <field name="name" /> + </tree> + </field> + </record> + + <record id="afac_partner_water_agency_search_view" model="ir.ui.view"> + <field name="name">afac.partner.water_agency.search</field> + <field name="model">afac.partner.water.agency</field> + <field name="arch" type="xml"> + <search string="Agence Eau rattachement"> + <field name="name" /> + </search> + </field> + </record> + <!-- Mandats --> <record id="afac_partner_mandate_tree_view" model="ir.ui.view"> <field name="name">afac.partner.mandate.tree</field> @@ -271,6 +292,12 @@ <field name="res_model">afac.partner.college</field> <field name="view_mode">tree</field> </record> + <record id="afac_partner_water_agency_act_window" model="ir.actions.act_window"> + <field name="name">Agence Eau rattachement</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">afac.partner.water.agency</field> + <field name="view_mode">tree</field> + </record> <record id="afac_partner_activity_act_window" model="ir.actions.act_window"> <field name="name">Activités</field> <field name="type">ir.actions.act_window</field> @@ -338,6 +365,12 @@ parent="menu_afac_list_root" action="afac_partner_type_act_window" /> + <menuitem + name="Agence Eau rattachement" + id="menu_afac_partner_water_agency" + parent="menu_afac_list_root" + action="afac_partner_water_agency_act_window" + /> <menuitem name="Collèges" id="menu_afac_partner_college" diff --git a/views/res_partner.xml b/views/res_partner.xml index 9c04fc0a25f8026ee09630d75f64e0efc1ba7852..e53eef0011f3381c487b2bcf0f1973ac61a143ec 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -16,6 +16,7 @@ <xpath expr="//field[@name='category_id']" position="after"> <field name="project_ids" /> <field name="project_category_names" /> + <field name="water_agency_id" /> <field name="college_id" /> <field name="thematic_id" /> <field name="skill_ids" /> @@ -57,6 +58,11 @@ string="Collège" context="{'group_by': 'college_id'}" /> + <filter + name="group_water_agency_id" + string="Agence Eau rattachement" + context="{'group_by': 'water_agency_id'}" + /> <filter name="group_thematic_id" string="Sous collèges" @@ -97,6 +103,13 @@ </xpath> <xpath expr="//group[@name='group_by']" position="after"> <searchpanel class="afac-partner-panel"> + <field + name="water_agency_id" + select="multi" + icon="fa-users" + enable_counters="1" + filters="1" + /> <field name="college_id" select="multi" @@ -227,6 +240,7 @@ widget="many2many_tags" string="Sous-projet" /> + <field name="water_agency_id" optional="hide" /> <field name="college_id" optional="hide" /> <field name="thematic_id" optional="hide" /> <field name="org_type_id" optional="hide" /> @@ -323,6 +337,10 @@ </group> <group> <field name="action_area" widget="selection" /> + <field + name="water_agency_id" + options="{'no_open': True, 'no_create': True}" + /> <field name="college_id" options="{'no_open': True, 'no_create': True}"