diff --git a/models/res_partner.py b/models/res_partner.py
index a2f91e70fba541f2ab2ab72eded95a04b2d72ec2..d34b06fc582d624f9d313ebf2a6e9de263f1dcce 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -1274,6 +1274,7 @@ class ScopPartner(models.Model):
"default_company_type": "company",
"default_project_status": "6_suivi",
}
+ mycontext = ctx
# Détermine le filtre par défaut pour l'affichage
filtre = self.env.user.company_id.ur_id.partner_filter
@@ -1289,8 +1290,6 @@ class ScopPartner(models.Model):
mycontext = ctx.update({"search_default_my_is_federation_btp": True})
elif filtre == "6":
mycontext = ctx.update({"search_default_my_is_federation_cae": True})
- else:
- mycontext = ctx.update({"search_default_my_ur_adherent": True})
return {
"name": "Coopératives",
@@ -1323,21 +1322,17 @@ class ScopPartner(models.Model):
# Affichage des prospect avec filtre par défaut
# ------------------------------------------------------
def show_prospect(self):
-
ctx = {
"default_is_company": True,
"default_is_cooperative": True,
"default_company_type": "company",
"default_project_status": "1_information",
}
+ mycontext = ctx
# Détermine le filtre par défaut pour l'affichage
filtre = self.env.user.company_id.ur_id.partner_filter
- if filtre in ("1", "3", "4", "5", "6"):
- mycontext = ctx
- elif filtre == "2":
- mycontext = ctx.update({"search_default_my_ur": True})
- else:
+ if filtre == "2":
mycontext = ctx.update({"search_default_my_ur": True})
return {
@@ -1393,14 +1388,11 @@ class ScopPartner(models.Model):
"default_company_type": "company",
"default_project_status": "1_information",
}
+ mycontext = ctx
# Détermine le filtre par défaut pour l'affichage
filtre = self.env.user.company_id.ur_id.partner_filter
- if filtre in ("1", "3", "4", "5", "6"):
- mycontext = ctx
- elif filtre == "2":
- mycontext = ctx.update({"search_default_my_ur_adherent": True})
- else:
+ if filtre == "2":
mycontext = ctx.update({"search_default_my_ur_adherent": True})
return {
diff --git a/models/union_regionale.py b/models/union_regionale.py
index bc4df469da83aa038013b6c190ef75f71726a0c4..03587a5cd0783c498e70372179603b1a42a9a767 100644
--- a/models/union_regionale.py
+++ b/models/union_regionale.py
@@ -22,6 +22,7 @@ class UnionRegionale(models.Model):
("6", "Fed CAE"),
],
string="Filtre par défaut",
+ default="2"
)
_sql_constraints = [
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index 14e40ad0abdc3bb59d52f4b37084327389ace764..45843d2c6b305fd4baf7afa823bd0cf09f65b14e 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -272,68 +272,6 @@
</field>
</record>
-
- <!-- Prospects Action *** N'EST PLUS UTILISE *** -->
- <record model="ir.actions.act_window" id="scop_prospect_act">
- <field name="name">Prospects</field>
- <field name="res_model">res.partner</field>
- <field name="view_mode">kanban,tree,form,activity</field>
- <field name="search_view_id" ref="scop_partner_view_search" />
- <field
- name="domain"
- eval="[('is_cooperative', '=', True),('project_status','in',('1_information','2_pre-diagnostic','3_accompagnement','4_adhesion','5_cg','7_abandonne'))]"
- />
- <field
- name="view_ids"
- eval="[(5, 0, 0),
- (0, 0, {'view_mode': 'kanban', 'view_id': ref('view_partner_cooperative_kanban')}),
- (0, 0, {'view_mode': 'tree', 'view_id': ref('view_partner_prospect_tree')}),
- (0, 0, {'view_mode': 'form', 'view_id': ref('scop_contact_view_form')})]"
- />
- <field
- name="context"
- >{'search_default_my_ur': True, 'default_is_company': True, 'default_is_cooperative': True, 'default_company_type': 'company', 'default_project_status': '1_information'}</field>
- </record>
-
- <!-- Cooperatives Action *** N'EST PLUS UTILISE *** -->
- <record model="ir.actions.act_window" id="scop_cooperative_act">
- <field name="name">Coopératives</field>
- <field name="res_model">res.partner</field>
- <field name="view_mode">tree,form,activity</field>
- <field name="search_view_id" ref="scop_partner_view_search" />
- <field
- name="domain"
- eval="[('is_cooperative', '=', True),('project_status','=','6_suivi')]"
- />
- <field
- name="view_ids"
- eval="[(5, 0, 0),
- (0, 0, {'view_mode': 'tree', 'view_id': ref('view_partner_cooperative_tree')}),
- (0, 0, {'view_mode': 'form', 'view_id': ref('scop_contact_view_form')})]"
- />
- <field
- name="context"
- >{'search_default_my_ur_adherent': True, 'default_is_company': True, 'default_is_cooperative': True, 'default_company_type': 'company', 'default_project_status': '6_suivi'}</field>
- </record>
-
- <!-- Organismes Action *** N'EST PLUS UTILISE *** -->
- <record model="ir.actions.act_window" id="scop_organisme_act">
- <field name="name">Tous les Organismes</field>
- <field name="res_model">res.partner</field>
- <field name="view_mode">tree,form,activity,pivot,graph</field>
- <field name="search_view_id" ref="scop_partner_view_search" />
- <field name="domain" eval="[('is_cooperative', '=', True)]" />
- <field
- name="view_ids"
- eval="[(5, 0, 0),
- (0, 0, {'view_mode': 'tree', 'view_id': ref('view_partner_organisme_tree')}),
- (0, 0, {'view_mode': 'form', 'view_id': ref('scop_contact_view_form')})]"
- />
- <field
- name="context"
- >{'default_is_company': True, 'search_default_my_ur_adherent': True, 'default_is_cooperative': True, 'default_company_type': 'company', 'default_project_status': '1_information'}</field>
- </record>
-
<!-- Action serveur pour rediriger le menu item vers du code python -->
<record model="ir.actions.server" id="scop_cooperative_act_server">
<field name="name">CG Scop - Filtre coop par défaut</field>
diff --git a/views/scop_config_views.xml b/views/scop_config_views.xml
index 542f68646e5bd3a9923629fe73a521d3748027de..07fcf3bc72d257ea9ba739004106e9265be53984 100644
--- a/views/scop_config_views.xml
+++ b/views/scop_config_views.xml
@@ -658,8 +658,8 @@
action="union_regionale_act_window"
id="menu_union_regionale"
name="Unions Régionales"
- parent="menu_scop"
- sequence="100"
+ parent="base.menu_users"
+ sequence="15"
/>
</data>
</odoo>