diff --git a/models/__init__.py b/models/__init__.py
index 379f5d7df009beba28bde6093a2d176c60aaca96..0f02e2d662f071490aeb758bb2ca5d5cc8efcb27 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -12,4 +12,3 @@ from . import scop_ministry_list
from . import scop_period
from . import scop_questionnaire
from . import scop_revision
-from . import scop_staff
diff --git a/models/res_partner.py b/models/res_partner.py
index b30090d396fbb4baf2c4268f6c93254d13877974..93555ff1af1ac838b689293dd73db722e051037f 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -216,12 +216,6 @@ class ScopPartner(models.Model):
inverse_name='partner_id',
string='Liasses Fiscales')
- # Effectifs
- staff_ids = fields.One2many(
- comodel_name='scop.staff',
- inverse_name='partner_id',
- string='Effectifs')
-
# Révisions
revision_contract = fields.Date("Date du contrat de révision")
revision_company_id = fields.Many2one(
diff --git a/models/scop_liasse_fiscale.py b/models/scop_liasse_fiscale.py
index f2391415874dec791f23d718b8deeac22f7bc473..aab33663eced8ecbcd1b7f46d00c46fc5a00b205 100644
--- a/models/scop_liasse_fiscale.py
+++ b/models/scop_liasse_fiscale.py
@@ -13,6 +13,11 @@ class ScopLiasseFiscale(models.Model):
string='Organisme',
domain=[('is_company', '=', True)],
ondelete='restrict')
+ origin = fields.Selection(
+ [('annuel', "Liasse annuelle"),
+ ('ajust', "Ajustement Liasse")],
+ string='Origine')
+ year = fields.Integer("Année de la liasse")
date = fields.Date("Date de la liasse")
ca = fields.Integer("Mt CA")
ca_subsidy = fields.Integer("Mt CA subventions")
diff --git a/models/scop_questionnaire.py b/models/scop_questionnaire.py
index 6f6a8895f82d29d78bddda8e0571c0e076299a98..4409c9284c4269f8e789352a15ceb2813b37e419 100644
--- a/models/scop_questionnaire.py
+++ b/models/scop_questionnaire.py
@@ -13,6 +13,11 @@ class ScopQuestionnaire(models.Model):
string='Organisme',
domain=[('is_company', '=', True)],
ondelete='restrict')
+ origin = fields.Selection(
+ [('adhesion', "Questionnaire adhésion"),
+ ('annuel', "Questionnaire annuel"),
+ ('ajust', "Ajustement Questionnaire")],
+ string='Origine')
year = fields.Integer("Année")
issue_date = fields.Date("Date d'émission")
reception_date = fields.Date("Date de réception")
diff --git a/models/scop_staff.py b/models/scop_staff.py
deleted file mode 100644
index 11f4dd331f54d001ad82a99fab3036aca95da643..0000000000000000000000000000000000000000
--- a/models/scop_staff.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# © 2019 Le Filament (<http://www.le-filament.com>)
-# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
-
-from odoo import models, fields
-
-
-class ScopStaff(models.Model):
- _name = "scop.staff"
- _description = "Effectif"
-
- partner_id = fields.Many2one(
- comodel_name='res.partner',
- string='Organisme',
- domain=[('is_company', '=', True)],
- ondelete='restrict')
- collection_date = fields.Date("Date de collecte")
- end_validity = fields.Date("Date de fin de validité")
- collection_id = fields.Many2one(
- comodel_name='scop.staff.collection',
- string="Type de collecte",
- ondelete="restrict")
- staff_count = fields.Float("Effectif")
- staff_shareolder_count = fields.Float("Effectif sociétaire")
-
-
-class ScopStaffCollection(models.Model):
- _name = "scop.staff.collection"
- _description = "Collection"
-
- name = fields.Char('Collection type')
diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index 524ee5308273bd20efc5064b84e9c9dfa4aab9d4..23a547eb4feffa803e4017e645c54d6f555ddfe7 100644
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -24,6 +24,5 @@ access_scop_membership_period,access_scop_membership_period,model_scop_membershi
access_scop_membership_type,access_scop_membership_type,model_scop_membership_type,base.group_user,1,1,1,1
access_scop_membership_reason_end,access_scop_membership_reason_end,model_scop_membership_reason_end,base.group_user,1,1,1,1
access_scop_revision_format,access_scop_revision_format,model_scop_revision_format,base.group_user,1,1,1,1
-access_scop_staff_collection,access_scop_staff_collection,model_scop_staff_collection,base.group_user,1,1,1,1
access_res_partner_prescriber_canal,access_res_partner_prescriber_canal,model_res_partner_prescriber_canal,base.group_user,1,1,1,1
access_scop_period,access_scop_period,model_scop_period,base.group_user,1,1,1,1
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index be1d4f8b14563a7e4df3ed86bb7540a2ecb311df..38409d5bc4e961f9ab12d4ec3f9987a742fa3575 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -535,12 +535,6 @@
<form/>
</field>
</page>
- <page name='scop_staff' string="Effectifs">
- <field name="staff_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">
<field name="legal_event_ids" mode="tree">
<tree group_create="False" group_edit="False" group_delete="False"/>
diff --git a/views/scop_config_lists_views.xml b/views/scop_config_lists_views.xml
index c6ef52a555baaa9d2d5a92630118a45f3e402e1d..edd717766d161cfcdade0e50f24793e9fc3305cd 100644
--- a/views/scop_config_lists_views.xml
+++ b/views/scop_config_lists_views.xml
@@ -253,37 +253,6 @@
</record>
- <!-- Staff Collection -->
- <record id="view_scop_staff_collection_tree" model="ir.ui.view">
- <field name="name">scop.staff.collection.tree</field>
- <field name="model">scop.staff.collection</field>
- <field name="arch" type="xml">
- <tree string="Collections">
- <field name="name"/>
- </tree>
- </field>
- </record>
-
- <record id="view_scop_staff_collection_form" model="ir.ui.view">
- <field name="name">scop.staff.collection.form</field>
- <field name="model">scop.staff.collection</field>
- <field name="arch" type="xml">
- <form string="Collection">
- <group name="main">
- <field name="name"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_view_scop_staff_collection_tree" model="ir.actions.act_window">
- <field name="name">Collections</field>
- <field name="res_model">scop.staff.collection</field>
- <field name="view_mode">tree,form</field>
- <field name="help">Display and manage the list of Collections.</field>
- </record>
-
-
<!-- MENUS -->
<menuitem id="menu_scop_lists" name="SCOP Lists"
parent="contacts.res_partner_menu_config" sequence="30"/>
@@ -296,33 +265,29 @@
parent="menu_scop_lists"
action="action_view_scop_membership_type_tree"
sequence="20"/>
- <menuitem id="menu_scop_staff_collection"
- parent="menu_scop_lists"
- action="action_view_scop_staff_collection_tree"
- sequence="30"/>
<menuitem id="menu_scop_contribution_type"
parent="menu_scop_lists"
action="action_view_scop_contribution_type_tree"
- sequence="40"/>
+ sequence="30"/>
<menuitem id="menu_scop_legal_event_type"
parent="menu_scop_lists"
action="action_view_scop_legal_event_type_tree"
- sequence="50"/>
+ sequence="40"/>
<menuitem id="menu_scop_financial_intervention_type"
parent="menu_scop_lists"
action="action_view_scop_financial_intervention_type_tree"
- sequence="60"/>
+ sequence="50"/>
<menuitem id="menu_scop_financial_tools_type"
parent="menu_scop_lists"
action="action_view_scop_financial_tools_type_tree"
- sequence="70"/>
+ sequence="60"/>
<menuitem id="menu_scop_financial_category"
parent="menu_scop_lists"
action="action_view_scop_financial_category_tree"
- sequence="80"/>
+ sequence="70"/>
<menuitem id="menu_scop_revision_format"
parent="menu_scop_lists"
action="action_view_scop_revision_format_tree"
- sequence="90"/>
+ sequence="80"/>
</data>
</odoo>