diff --git a/models/res_partner.py b/models/res_partner.py index f29a94eebab999b1de39f027f997918a04cb8cc6..0cb244ac0243f0dea07f6dae012cd7d7edbe83f6 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -1483,9 +1483,9 @@ class ScopPartner(models.Model): "domain": [ ("is_cooperative", "=", True), ( - "project_status", + "membership_status", "in", - ("4_suivi",), + ("adhesion", "soumis_cg"), ), ], "context": ctx, diff --git a/views/res_partner.xml b/views/res_partner.xml index d3c5b1fc080619b0d0e21517b373edbaa0d028ad..baafbeec3cf98c3b0173702541f32adea967aa12 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -609,7 +609,7 @@ name="membership_status" widget="statusbar" clickable="True" - statusbar_visible="not_member,adhesion,soumis_cg,member,out" + statusbar_visible="adhesion,soumis_cg" attrs="{'invisible':[('project_status','not in',('4_suivi'))]}" /> </header> @@ -691,13 +691,6 @@ </h3> </div> <div class="o_row d-flex "> - <h3> - <field - name="membership_status" - readonly="1" - class="o_field_header" - /> - </h3> <h3> <field name="member_number_int" diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index e735a2ea5315e518513271b7c51c52e517b89d6c..c6142140b77fa29120c5a485e843b607b505b148 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -306,6 +306,8 @@ <attribute name="group_edit">0</attribute> <attribute name="group_delete">0</attribute> <attribute name="quick_create">0</attribute> + <attribute name="create">0</attribute> + <attribute name="quick_create_view">0</attribute> <attribute name="block_drag_drop_kanban">1</attribute> <attribute name="records_draggable">0</attribute> </xpath> @@ -365,6 +367,13 @@ name="Projets de création" sequence="10" /> + <menuitem + id="menu_action_adhesion" + action="scop_adhesion_act_server" + parent="menu_organismes" + name="Processus d'adhésion" + sequence="10" + /> <menuitem id="menu_action_cooperative" action="scop_cooperative_act_server" @@ -379,13 +388,6 @@ name="Toutes les coopératives et projets" sequence="30" /> - <menuitem - id="menu_action_adhesion" - action="scop_adhesion_act_server" - parent="menu_organismes" - name="Processus d'adhésion" - sequence="30" - /> </data> </odoo>