diff --git a/__manifest__.py b/__manifest__.py
index 6391a9328bf75553c301750d7aa5b04bf2fcb638..556561c98053f23599b356518b3a89e76dd97c7c 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -35,7 +35,6 @@
"datas/res.partner.cooperative.form.csv",
"datas/res.partner.creation.origin.csv",
"datas/res.partner.dissolution.reason.csv",
- "datas/res.partner.keywords.csv",
"datas/res.partner.mandate.csv",
"datas/res.partner.organization.type.csv",
"datas/res.partner.rgpd.origin.csv",
diff --git a/datas/res.partner.cooperative.form.csv b/datas/res.partner.cooperative.form.csv
index 3533123b4cf278439449dc8eef459603deed7d2e..e06a760f74926ffde6ffffa38952e5032f11eb14 100644
--- a/datas/res.partner.cooperative.form.csv
+++ b/datas/res.partner.cooperative.form.csv
@@ -1,5 +1,5 @@
id,name,id_riga
-riga_12854,COOP47,12854
-riga_14830,Lamaneur,14830
-riga_12855,SCIC,12855
-riga_12856,SCOP,12856
+form_coop47,COOP47,12854
+form_lamaneur,Lamaneur,14830
+form_scic,SCIC,12855
+form_scop,SCOP,12856
diff --git a/datas/res.partner.keywords.csv b/datas/res.partner.keywords.csv
deleted file mode 100644
index e357d9e96a5e91d9b082fc778f714e506a0e281a..0000000000000000000000000000000000000000
--- a/datas/res.partner.keywords.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-id,id_riga,name
-riga_11656,11656,"Agriculture, pêche, alimentation, restauration"
-riga_11662,11662,"Autre"
-riga_11657,11657,"Conseil, formation, prestations pour les entreprises / territoires"
-riga_11658,11658,"Culture, media, patrimoine, tourisme, sport, animation"
-riga_11655,11655,"Energies renouvelables"
-riga_11654,11654,"Environnement (nature, recyclage, mobilité, autopartage, ...)""
-riga_16541,16541,"Groupement d'employeurs"
-riga_11660,11660,"Habitat"
-riga_11661,11661,"Interim"
-riga_11659,11659,"Services de proximité, santé, social, handicap, petite enfance, hébergement"
diff --git a/models/res_partner.py b/models/res_partner.py
index 6360daa3350c460f63140614ba1c5fbb20b003cd..b68309760b101315a65c822e6c6b7558f194ce29 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -158,8 +158,6 @@ class ScopPartner(models.Model):
string='Canal de Prescription',
on_delete='restrict')
sigle = fields.Char("Sigle")
- keywords_scic_id = fields.Many2one(
- 'res.partner.keywords', string='Mots clés SCIC', on_delete='restrict')
# Infos juridiques
siren = fields.Char(string='SIREN', size=9, compute='_compute_siren')
@@ -328,27 +326,6 @@ class ScopPartner(models.Model):
# Champs pour personnes
birthyear = fields.Integer("Année de naissance")
- education_level = fields.Selection([
- (13030, "Aucun diplôme, CEP"),
- (13031, "Brevet des collèges"),
- (13032, "CAP, BEP"),
- (13033, "Bac, brevet professionnel ou équivalent"),
- (13034, "Supérieur court"),
- (13035, "Supérieur long"),
- (13036, "En cours d'études initiales")],
- "Niveau d'étude")
- csp = fields.Selection([
- (14189, "Cadres et professions intellectuelles"),
- (14201, "Autres personnes sans activité"),
- (13022, "Agriculteurs exploitants"),
- (13023, "Artisans, commerçants et chefs d'entreprise"),
- (13024, "Cadres et professions intellectuelles supérieures"),
- (13025, "Professions Intermédiaires"),
- (13026, "Employés"),
- (13027, "Ouvriers"),
- (13028, "Retraités"),
- (13029, "Autres personnes sans activité professionnelle")],
- "CSP")
subscription_ids = fields.One2many(
comodel_name='res.partner.newsletter.subscription',
inverse_name='partner_id',
@@ -580,14 +557,6 @@ class ResPartnerCreationOrigin(models.Model):
return True
-class ResPartnerKeywords(models.Model):
- _name = "res.partner.keywords"
- _description = "Keywords SCIC"
-
- name = fields.Char('Keywords SCIC')
- id_riga = fields.Integer("ID RIGA")
-
-
class ResPartnerMandate(models.Model):
_name = "res.partner.mandate"
_description = "Mandat"
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 0725445d12d113601f4c254c9226d643bf6081a3..a781a30e6b6c56274ae13c6d868da1d4e0f2ccba 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -100,8 +100,6 @@
<field name="mandate_id" options='{"no_create": True}' attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="function"/>
<field name="birthyear" attrs="{'invisible': [('is_company','=', True)]}"/>
- <field name="education_level" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True}"/>
- <field name="csp" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True}"/>
<field name="contact_origin_id" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True}"/>
<field name="contact_legality" readonly="True" attrs="{'invisible': [('is_company','=', True)]}"/>
<field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Territoire Rattaché..." can_create="true" can_write="true" modifiers="{}" attrs="{'invisible': [('is_company','=', False)]}" domain="[('ur_id', '=', ur_id)]"/>
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index 857f8973034d4cf8471cfc040a39b49f0c6335d3..f04323a096bfe35d3d454f70b98d1957ca145117 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -78,8 +78,8 @@
<button string="Décés/Mise en sommeil" type="action" name="%(cgscop_partner.scop_deces_wizard_create_action)d" attrs="{'invisible': ['|', ('write_date', '=', False), ('project_status', '!=', '6_suivi')]}"/>
<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'))]}" />
- <field name="project_status" widget="statusbar" clickable="True" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion"/>
+ <button string="Prospect Abandonne" type="object" name="scop_abandonne" attrs="{'invisible':[('project_status','in',('5_cg', '6_suivi', '7_abandonne'))]}"/>
+ <field name="project_status" widget="statusbar" clickable="True" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion" attrs="{'invisible':[('project_status','in',('6_suivi'))]}"/>
</header>
<sheet>
<div class="oe_button_box" name="button_box">
@@ -264,7 +264,7 @@
<field name="ur_id" required="True" options="{'no_create': True}"/>
<field name="creation_delegate_id" widget="res_partner_many2one"
attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '6_suivi'))]}" options="{'no_create': True}"/>
- <field name="followup_delegate_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('6_suivi'))]}" options="{'no_create': True}"/>
+ <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="revision_person_id" widget="res_partner_many2one" readonly="True" options="{'no_create': True}"/>
<field name="parent_group_name" attrs="{'readonly': [('project_status', '=', '6_suivi')]}" />
<field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" domain="[('ur_id', '=', ur_id)]"/>
@@ -287,11 +287,10 @@
<field name="is_incubated" required="True"/>
<field name="incubator_id" widget="res_partner_many2one" attrs="{'invisible': [('is_incubated', '!=', True)]}" options="{'no_create': True}"/>
<field name="prescriber_canal_id" widget="res_partner_many2one" options="{'no_create': True}"/>
- <field name="keywords_scic_id" options="{'no_create': True}"/>
</group>
</group>
<notebook colspan="4">
- <page name="juridical_info" string="Informations Juridiques">
+ <page name="juridical_info" string="Informations Juridiques" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<group>
<field name="siren" readonly="True"/>
<field name="dissolution_date"/>
@@ -302,7 +301,7 @@
<group>
<field name="bank_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="bank2_id" widget="res_partner_many2one" options="{'no_create': True}"/>
- <field name="accountant_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('4_adhesion', '6_suivi'))]}" options="{'no_create': True}"/>
+ <field name="accountant_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="accountant_person_id" widget="res_partner_many2one" attrs="{'invisible': [('accountant_id', '=', False)]}" domain="[('parent_id', '=', accountant_id), ('is_company', '=', False)]" options="{'no_create': True}"/>
<field name="auditor_id" widget="res_partner_many2one" options="{'no_create': True}"/>
<field name="auditor_person_id" widget="res_partner_many2one" attrs="{'invisible': [('auditor_id', '=', False)]}" domain="[('parent_id', '=', auditor_id), ('is_company', '=', False)]" options="{'no_create': True}"/>
@@ -318,7 +317,7 @@
</field>
</group>
</page-->
- <page name='scop_revision' string="Révisions">
+ <page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<group string="Informations de révision">
<group>
<field name="revision_contract"/>
@@ -534,37 +533,37 @@
<page name='internal_notes' string="Commentaires">
<field name="comment" placeholder="Commentaires..."/>
</page>
- <page name='scop_membership' string="Périodes d'adhésion">
+ <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="membership_period_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
</field>
</page>
- <page name='scop_contribution' string="Cotisations">
+ <page name='scop_contribution' string="Cotisations" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="contribution_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
</field>
</page>
- <page name='scop_questionnaire' string="Questionnaires">
+ <page name='scop_questionnaire' string="Questionnaires" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="questionnaire_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
</field>
</page>
- <page name='scop_liasse_fiscale' string="Liasses Fiscales">
+ <page name='scop_liasse_fiscale' string="Liasses Fiscales" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="liasse_fiscale_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
</field>
</page>
- <page name='scop_legal_event' string="Evènements Juridiques">
+ <page name='scop_legal_event' string="Evènements Juridiques" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="legal_event_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
</field>
</page>
- <page name='scop_financial_tools' string="Outils Financiers">
+ <page name='scop_financial_tools' string="Outils Financiers" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}">
<field name="financial_tools_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
<form/>
diff --git a/wizard/scop_period_wizard.xml b/wizard/scop_period_wizard.xml
index 2d929556538fdf60affacfdddeb7ddb55d9183e6..3c64d16040b5185bdd687fda1bcce404ab658d44 100644
--- a/wizard/scop_period_wizard.xml
+++ b/wizard/scop_period_wizard.xml
@@ -10,7 +10,7 @@
<field name="start" required="1"/>
<field name="previous_period_id" invisible="1"/>
<field name="end_reason" attrs="{'required': [('previous_period_id', '!=', 0)], 'invisible': [('previous_period_id', '=', 0)]}"/>
- <field name="comments" attrs="{'required': [('previous_period_id', '!=', 0)], 'invisible': [('previous_period_id', '=', 0)]}"/>
+ <field name="comments" attrs="{'invisible': [('previous_period_id', '=', 0)]}"/>
</group>
<group col="2">
<group>
@@ -27,7 +27,7 @@
on_change="1" can_create="true" can_write="true"/>
<field name="zip" placeholder="Code postal" class="o_address_city" on_change="1" required="1"/>
<field name="city" placeholder="Ville" class="o_address_city" required="1"/>
- <field name="cedex" placeholder="Cedex" class="o_address_city" required="1"/>
+ <field name="cedex" placeholder="Cedex" class="o_address_city"/>
<field name="state_id" placeholder="État" invisible="1"/>
<field name="country_id" placeholder="Pays" invisible="1"/>
</div>