diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 057b85d752ec142089f43ede8198cb85dedc2430..8c2c0be97c30d7f2eacf073ff435f147057da2ca 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -28,33 +28,33 @@ access_scop_questionnaire_type,access_scop_questionnaire_type,model_scop_questio access_scop_liasse_fiscale_source,access_scop_liasse_fiscale_source,model_scop_liasse_fiscale_source,base.group_user,1,0,0,0 access_res_partner_mandate,access_res_partner_mandate,model_res_partner_mandate,base.group_user,1,0,0,0 access_res_partner_segment,access_res_partner_segment,model_res_partner_segment,base.group_user,1,0,0,0 -admin_liasse_fiscale_group_user,access_liasse_fiscale_group_user,model_scop_liasse_fiscale,group_cg_list_modif,1,1,1,1 -admin_contribution_group_user,access_contribution_group_user,model_scop_contribution,group_cg_list_modif,1,1,1,1 -admin_financial_tools_group_user,access_financial_tools_group_user,model_scop_financial_tools,group_cg_list_modif,1,1,1,1 -admin_revision_group_user,access_revision_group_user,model_scop_revision,group_cg_list_modif,1,1,1,1 -admin_questionnaire_group_user,access_questionnaire_group_user,model_scop_questionnaire,group_cg_list_modif,1,1,1,1 -admin_res_partner_dissolution_reason,admin_res_partner_dissolution_reason,model_res_partner_dissolution_reason,group_cg_list_modif,1,1,1,1 -admin_res_partner_organization_type,admin_res_partner_organization_type,model_res_partner_organization_type,group_cg_list_modif,1,1,1,1 -admin_res_partner_cooperative_form,admin_res_partner_cooperative_form,model_res_partner_cooperative_form,group_cg_list_modif,1,1,1,1 -admin_res_partner_certification,admin_res_partner_certification,model_res_partner_certification,group_cg_list_modif,1,1,1,1 -admin_res_partner_creation_origin,admin_res_partner_creation_origin,model_res_partner_creation_origin,group_cg_list_modif,1,1,1,1 -admin_res_partner_rgpd_origin,admin_res_partner_rgpd_origin,model_res_partner_rgpd_origin,group_cg_list_modif,1,1,1,1 -admin_res_partner_newsletter_subscription,admin_res_partner_newsletter_subscription,model_res_partner_newsletter_subscription,group_cg_list_modif,1,1,1,1 -admin_res_partner_newsletter,admin_res_partner_newsletter,model_res_partner_newsletter,group_cg_list_modif,1,1,1,1 -admin_scop_contribution_type,admin_scop_contribution_type,model_scop_contribution_type,group_cg_list_modif,1,1,1,1 -admin_scop_financial_tools_type,admin_scop_financial_tools_type,model_scop_financial_tools_type,group_cg_list_modif,1,1,1,1 -admin_scop_financial_intervention_type,admin_scop_financial_intervention_type,model_scop_financial_intervention_type,group_cg_list_modif,1,1,1,1 -admin_scop_financial_category,admin_scop_financial_category,model_scop_financial_category,group_cg_list_modif,1,1,1,1 -admin_scop_membership_period,admin_scop_membership_period,model_scop_membership_period,group_cg_list_modif,1,1,1,1 -admin_scop_membership_type,admin_scop_membership_type,model_scop_membership_type,group_cg_list_modif,1,1,1,1 -admin_scop_membership_reason_end,admin_scop_membership_reason_end,model_scop_membership_reason_end,group_cg_list_modif,1,1,1,1 -admin_scop_revision_format,admin_scop_revision_format,model_scop_revision_format,group_cg_list_modif,1,1,1,1 -admin_scop_period,admin_scop_period,model_scop_period,group_cg_list_modif,1,1,1,1 -admin_union_regionale,admin_union_regionale,model_union_regionale,group_cg_list_modif,1,1,1,1 -admin_res_partner_company_type,admin_res_partner_company_type,model_res_partner_company_type,group_cg_list_modif,1,1,1,1 -admin_scop_liasse_fiscale_type,admin_scop_liasse_fiscale_type,model_scop_liasse_fiscale_type,group_cg_list_modif,1,1,1,1 -admin_scop_questionnaire_type,admin_scop_questionnaire_type,model_scop_questionnaire_type,group_cg_list_modif,1,1,1,1 -admin_scop_liasse_fiscale_source,admin_scop_liasse_fiscale_source,model_scop_liasse_fiscale_source,group_cg_list_modif,1,1,1,1 -admin_res_partner_mandate,admin_res_partner_mandate,model_res_partner_mandate,group_cg_list_modif,1,1,1,1 -admin_res_partner_segment,admin_res_partner_segment,model_res_partner_segment,group_cg_list_modif,1,1,1,1 +admin_liasse_fiscale_group_user,access_liasse_fiscale_group_user,model_scop_liasse_fiscale,group_cg_administrator,1,1,1,1 +admin_contribution_group_user,access_contribution_group_user,model_scop_contribution,group_cg_administrator,1,1,1,1 +admin_financial_tools_group_user,access_financial_tools_group_user,model_scop_financial_tools,group_cg_administrator,1,1,1,1 +admin_revision_group_user,access_revision_group_user,model_scop_revision,group_cg_administrator,1,1,1,1 +admin_questionnaire_group_user,access_questionnaire_group_user,model_scop_questionnaire,group_cg_administrator,1,1,1,1 +admin_res_partner_dissolution_reason,admin_res_partner_dissolution_reason,model_res_partner_dissolution_reason,group_cg_administrator,1,1,1,1 +admin_res_partner_organization_type,admin_res_partner_organization_type,model_res_partner_organization_type,group_cg_administrator,1,1,1,1 +admin_res_partner_cooperative_form,admin_res_partner_cooperative_form,model_res_partner_cooperative_form,group_cg_administrator,1,1,1,1 +admin_res_partner_certification,admin_res_partner_certification,model_res_partner_certification,group_cg_administrator,1,1,1,1 +admin_res_partner_creation_origin,admin_res_partner_creation_origin,model_res_partner_creation_origin,group_cg_administrator,1,1,1,1 +admin_res_partner_rgpd_origin,admin_res_partner_rgpd_origin,model_res_partner_rgpd_origin,group_cg_administrator,1,1,1,1 +admin_res_partner_newsletter_subscription,admin_res_partner_newsletter_subscription,model_res_partner_newsletter_subscription,group_cg_administrator,1,1,1,1 +admin_res_partner_newsletter,admin_res_partner_newsletter,model_res_partner_newsletter,group_cg_administrator,1,1,1,1 +admin_scop_contribution_type,admin_scop_contribution_type,model_scop_contribution_type,group_cg_administrator,1,1,1,1 +admin_scop_financial_tools_type,admin_scop_financial_tools_type,model_scop_financial_tools_type,group_cg_administrator,1,1,1,1 +admin_scop_financial_intervention_type,admin_scop_financial_intervention_type,model_scop_financial_intervention_type,group_cg_administrator,1,1,1,1 +admin_scop_financial_category,admin_scop_financial_category,model_scop_financial_category,group_cg_administrator,1,1,1,1 +admin_scop_membership_period,admin_scop_membership_period,model_scop_membership_period,group_cg_administrator,1,1,1,1 +admin_scop_membership_type,admin_scop_membership_type,model_scop_membership_type,group_cg_administrator,1,1,1,1 +admin_scop_membership_reason_end,admin_scop_membership_reason_end,model_scop_membership_reason_end,group_cg_administrator,1,1,1,1 +admin_scop_revision_format,admin_scop_revision_format,model_scop_revision_format,group_cg_administrator,1,1,1,1 +admin_scop_period,admin_scop_period,model_scop_period,group_cg_administrator,1,1,1,1 +admin_union_regionale,admin_union_regionale,model_union_regionale,group_cg_administrator,1,1,1,1 +admin_res_partner_company_type,admin_res_partner_company_type,model_res_partner_company_type,group_cg_administrator,1,1,1,1 +admin_scop_liasse_fiscale_type,admin_scop_liasse_fiscale_type,model_scop_liasse_fiscale_type,group_cg_administrator,1,1,1,1 +admin_scop_questionnaire_type,admin_scop_questionnaire_type,model_scop_questionnaire_type,group_cg_administrator,1,1,1,1 +admin_scop_liasse_fiscale_source,admin_scop_liasse_fiscale_source,model_scop_liasse_fiscale_source,group_cg_administrator,1,1,1,1 +admin_res_partner_mandate,admin_res_partner_mandate,model_res_partner_mandate,group_cg_administrator,1,1,1,1 +admin_res_partner_segment,admin_res_partner_segment,model_res_partner_segment,group_cg_administrator,1,1,1,1 admin_ur_res_partner_segment,admin_ur_res_partner_segment,model_res_partner_segment,group_ur_list_modif,1,1,1,1 \ No newline at end of file diff --git a/security/security_rules.xml b/security/security_rules.xml index ee46a325ea7352303dbe56b50d4106087d954255..598c2883c5ef9e4c0972db4619ad6f6f922649d3 100644 --- a/security/security_rules.xml +++ b/security/security_rules.xml @@ -3,14 +3,42 @@ License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). --> <odoo> - <data noupdate="1"> + <data> + <record id="group_ur_list_modif" model="res.groups"> + <field name="name">Modifier les listes spécifiques de mon UR</field> + <field name="groups_id" eval="[(4,ref('base.group_partner_manager'))]"/> + </record> + + <record id="group_cg_administrative" model="res.groups"> + <field name="name">Administrateur CG (modification listes)</field> + <field name="groups_id" eval="[(4,ref('group_cg_administrator'))]"/> + <field name="implied_ids" eval="[(4, ref('group_cg_administrator')), (4, ref('group_ur_list_modif'))]"/> + </record> + + <record id="group_cg_administrator" model="res.groups"> + <field name="name">Administratif CG (modification périodes)</field> + <field name="groups_id" eval="[(4,ref('base.group_system'))]"/> + </record> + <record id="res_partner_rule_ur" model="ir.rule"> <field name="name">partner rule per ur</field> <field name="model_id" ref="base.model_res_partner"/> <field name="domain_force">['|',('ur_id','=',False),('ur_id','=',user.company_id.ur_id.id)]</field> + <field name="groups" eval="[(4, ref('base.group_user'))]"/> <field name="perm_read" eval="False"/> <field name="perm_write" eval="True"/> - <field name="perm_create" eval="True"/> + <field name="perm_create" eval="False"/> + <field name="perm_unlink" eval="False"/> + </record> + + <record id="res_partner_rule_admin" model="ir.rule"> + <field name="name">partner rule per ur</field> + <field name="model_id" ref="base.model_res_partner"/> + <field name="domain_force">[(1,'=',1)]</field> + <field name="groups" eval="[(4, ref('cgscop_partner.group_cg_administrator'))]"/> + <field name="perm_read" eval="False"/> + <field name="perm_write" eval="True"/> + <field name="perm_create" eval="False"/> <field name="perm_unlink" eval="False"/> </record> @@ -18,18 +46,22 @@ <field name="name">segment rule per ur</field> <field name="model_id" ref="model_res_partner_segment"/> <field name="domain_force">[('ur_id','=',user.company_id.ur_id.id)]</field> + <field name="groups" eval="[(4, ref('base.group_user'))]"/> <field name="perm_read" eval="True"/> <field name="perm_write" eval="True"/> <field name="perm_create" eval="True"/> <field name="perm_unlink" eval="True"/> </record> - <record id="group_ur_list_modif" model="res.groups"> - <field name="name">Modifier les listes spécifiques de mon UR</field> - </record> - - <record id="group_cg_list_modif" model="res.groups"> - <field name="name">Modifier les listes génériques</field> + <record id="res_partner_segment_rule_admin" model="ir.rule"> + <field name="name">partner rule per ur</field> + <field name="model_id" ref="model_res_partner_segment"/> + <field name="domain_force">[(1,'=',1)]</field> + <field name="groups" eval="[(4, ref('cgscop_partner.group_cg_administrator'))]"/> + <field name="perm_read" eval="True"/> + <field name="perm_write" eval="True"/> + <field name="perm_create" eval="True"/> + <field name="perm_unlink" eval="True"/> </record> </data> </odoo> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 3a3948fde31e00a3b8e7cdd591d8982e8dc5c153..c3177d8d2ff6c370b1a7c04ba0c5903cb2d92b83 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -117,8 +117,8 @@ <field name="arch" type="xml"> <form string="Cooperatives" attrs="{'readonly': [('project_status', '=', '5_cg')]}"> <header> - <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/> - <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/> + <button string="Nouvelle période" type="action" name="%(cgscop_partner.scop_period_wizard_create_action)d" class="oe_highlight" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="group_cg_administrative"/> + <button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('dissolution_reason_id', '!=', False), '|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}" groups="group_cg_administrative"/> <button string="Envoyer Dossier CG" type="object" name="scop_send_to_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '4_adhesion')]}"/> <button string="Dossier créé CG (temp)" type="object" name="scop_valid_cg" class="btn-primary" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '5_cg')]}"/> <button string="Prospect Abandonne" type="object" name="scop_abandonne" attrs="{'invisible':[('project_status','in',('5_cg', '6_suivi', '7_abandonne'))]}"/> @@ -126,6 +126,14 @@ </header> <sheet> <div class="oe_button_box" name="button_box"> + <h3> + <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le</span> + <field name="dissolution_date" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> + </h3> + <h3> + <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Raison :</span> + <field options="{'no_open': True}" name="dissolution_reason_id" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> + </h3> <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive"> <field name="active" widget="boolean_button" @@ -153,15 +161,6 @@ <h3> <field options="{'no_open': True}" name="partner_company_type_id" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')], 'required':[('project_status','in',('4_adhesion', '6_suivi'))]}" placeholder="Statut Juridique"/> </h3> - <span> </span> - <h3> - <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le - <field name="dissolution_date" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/></span> - </h3> - <h3> - <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Raison : - <field options="{'no_open': True}" name="dissolution_reason_id" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/></span> - </h3> </div> <div class="o_row d-flex "> <h3> diff --git a/views/scop_config_lists_views.xml b/views/scop_config_lists_views.xml index 22e96939bbeb9484a5ff22ae6d3c7b76c150a04b..09c5453da3bea51d5d855f95a50cc382c7581134 100644 --- a/views/scop_config_lists_views.xml +++ b/views/scop_config_lists_views.xml @@ -194,7 +194,7 @@ <!-- MENUS --> <menuitem id="menu_scop_lists" name="SCOP Lists" - parent="contacts.res_partner_menu_config" sequence="30" groups="group_cg_list_modif"/> + parent="contacts.res_partner_menu_config" sequence="30" groups="group_cg_administrator"/> <menuitem id="menu_scop_membership_reason_end" parent="menu_scop_lists" diff --git a/views/scop_config_views.xml b/views/scop_config_views.xml index 8d0826da0f4d94ea128c6fa8f88d774b89f55fea..8abaa4fd3778f9c49f472ed86f4683f1f643af36 100644 --- a/views/scop_config_views.xml +++ b/views/scop_config_views.xml @@ -223,7 +223,7 @@ sequence="99"/> <record model="ir.ui.menu" id="contacts.res_partner_menu_config"> - <field name="groups_id" eval="[(6,0, [ref('base.group_system'), ref('group_cg_list_modif'), ref('group_ur_list_modif')])]"/> + <field name="groups_id" eval="[(6,0, [ref('base.group_system'), ref('group_cg_administrator'), ref('group_ur_list_modif')])]"/> </record> <menuitem id="contacts.menu_partner_category_form" @@ -242,11 +242,11 @@ sequence="10"/> <record model="ir.ui.menu" id="menu_res_partner_segment"> - <field name="groups_id" eval="[(6,0, [ref('group_cg_list_modif'), ref('group_ur_list_modif')])]"/> + <field name="groups_id" eval="[(6,0, [ref('group_cg_administrator'), ref('group_ur_list_modif')])]"/> </record> <menuitem id="menu_scop" name="SCOP" - parent="contacts.res_partner_menu_config" sequence="20" groups="group_cg_list_modif"/> + parent="contacts.res_partner_menu_config" sequence="20" groups="group_cg_administrator"/> <menuitem id="menu_res_partner_newsletter" parent="menu_scop" @@ -293,7 +293,7 @@ parent="menu_scop" action="partner_company_type.res_partner_company_type_act_window" name="Statuts Juridiques" - groups="group_cg_list_modif" + groups="group_cg_administrator" sequence="80"/> <menuitem id="menu_res_partner_organization_type" parent="menu_scop"