diff --git a/models/res_partner.py b/models/res_partner.py
index c65e3ebedd87b4fa7f888b415521f2b03628fefe..ff4c2b074ee74cf43102df3e2cf0bdfc2147760d 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -32,11 +32,6 @@ class ScopPartner(models.Model):
'res.partner.dissolution.reason',
string="Motif Décés",
on_delete='restrict')
- organization_type_id = fields.Many2one(
- 'res.partner.organization.type',
- string="Type d'organisme",
- on_delete='restrict')
- sigle = fields.Char('Sigle')
social_object = fields.Char('Objet Social')
admin_email = fields.Char('E-mail administratif')
@@ -71,19 +66,14 @@ class ScopPartner(models.Model):
string='Délégué de suivi',
domain=[('user_ids', '>', 0)],
on_delete='restrict')
- origin_company_type_id = fields.Many2one(
- comodel_name='res.partner.company.type',
- string="Forme juridique d'origine",
- track_visibility='onchange',
- on_delete='restrict')
bank_id = fields.Many2one(
'res.partner',
- string='Banquier principal',
+ string='Banque principale',
domain=[('is_company', '=', True)],
on_delete='restrict')
bank2_id = fields.Many2one(
'res.partner',
- string='Banquier secondaire',
+ string='Banque secondaire',
domain=[('is_company', '=', True)],
on_delete='restrict')
direccte_id = fields.Many2one(
@@ -105,7 +95,7 @@ class ScopPartner(models.Model):
domain=[('is_company', '=', True)],
on_delete='restrict')
is_seed_scop = fields.Boolean("Est une SCOP d'amorçage")
- seed_end = fields.Date("Date de fin de dispositif",
+ seed_end = fields.Date("Date de fin du dispositif d'amorçage",
default=str(datetime.today() + timedelta(2556)))
auditor_person_id = fields.Many2one(
'res.partner',
@@ -123,14 +113,13 @@ class ScopPartner(models.Model):
string='Incubateur',
domain=[('is_company', '=', True)],
on_delete='restrict')
- prescriber_id = fields.Many2one(
- 'res.partner',
- string='Prescripteur',
- domain=[('is_company', '=', True)],
+ prescriber_canal_id = fields.Many2one(
+ 'res.partner.prescriber.canal',
+ string='Canal de Prescription',
on_delete='restrict')
# Informations de révision
- revision_contract = fields.Boolean("Contrat de révision")
+ revision_contract = fields.Date("Date du contrat de révision")
revision_company_id = fields.Many2one(
'res.partner',
string='Organisme de révision',
@@ -146,9 +135,9 @@ class ScopPartner(models.Model):
string='Réviseur agréé',
domain=[('is_company', '=', False)],
on_delete='restrict')
- revision_backup_person_id = fields.Many2one(
+ revision_certified_person_id = fields.Many2one(
'res.partner',
- string='Réviseur assistant',
+ string='Réviseur',
domain=[('is_company', '=', False)],
on_delete='restrict')
revision_person_assign_date = fields.Date("Date de nomination du réviseur")
@@ -156,20 +145,18 @@ class ScopPartner(models.Model):
[('1y', "Annuelle"),
('5y', 'Quinquennale'),
('5ys', "Quinquennale séquencée")],
- string='Nature de la révision')
+ string='Périodicité de la révision')
revision_format_id = fields.Many2one(
'scop.revision.format',
string='Format de révision',
on_delete='restrict')
- revision_staff_id = fields.Many2one(
- 'scop.revision.staff',
- string='Effectif révision',
- on_delete='restrict')
+ revision_staff_id = fields.Integer(string='Effectif révision')
+ revision_last_date = fields.Date("Dernier exercice révisé")
revision_next_date = fields.Date("Prochain exercice révisable")
# Informations fiscales/financières
first_closeout = fields.Date(
- 'Date clôture 1er bilan')
+ 'Date clôture 1er bilan en coopérative')
closeout_month = fields.Selection(
[(1, 'Janvier'),
(2, 'Février'),
@@ -214,8 +201,6 @@ class ScopPartner(models.Model):
track_visibility='onchange')
is_main_location = fields.Boolean("Est l'établissement principal",
track_visibility='onchange')
- is_subsidiary = fields.Boolean('Est une Filiale',
- track_visibility='onchange')
parent_group_name = fields.Char('Nom du groupe parent',
track_visibility='onchange')
@@ -226,7 +211,6 @@ class ScopPartner(models.Model):
track_visibility='onchange',
on_delete='restrict'
)
- capital = fields.Integer('Capital social', track_visibility='onchange')
ape_id = fields.Many2one(
'res.partner.category',
string='APE',
@@ -326,18 +310,18 @@ class ScopPartner(models.Model):
string="Licéité du contact", default="none")
-class ResPartnerDissolutionReason(models.Model):
- _name = "res.partner.dissolution.reason"
- _description = "Dissolution Reason"
+class ResPartneCertification(models.Model):
+ _name = "res.partner.certification"
+ _description = "Certification"
- name = fields.Char('Dissolution Reason')
+ name = fields.Char('Certification')
-class ResPartnerTypeOrganization(models.Model):
- _name = "res.partner.organization.type"
- _description = "Organization Type"
+class ResPartnerCooperativeForm(models.Model):
+ _name = "res.partner.cooperative.form"
+ _description = "Cooperative form"
- name = fields.Char('Organization Type')
+ name = fields.Char('Cooperative form')
class ResPartnerCreationSuborigin(models.Model):
@@ -347,18 +331,18 @@ class ResPartnerCreationSuborigin(models.Model):
name = fields.Char('Creation Sub-Origin')
-class ResPartnerCooperativeForm(models.Model):
- _name = "res.partner.cooperative.form"
- _description = "Cooperative form"
+class ResPartnerDissolutionReason(models.Model):
+ _name = "res.partner.dissolution.reason"
+ _description = "Dissolution Reason"
- name = fields.Char('Cooperative form')
+ name = fields.Char('Dissolution Reason')
-class ResPartneCertification(models.Model):
- _name = "res.partner.certification"
- _description = "Certification"
+class ResPartnerPrescriberCanal(models.Model):
+ _name = "res.partner.prescriber.canal"
+ _description = "Prescriber Canal"
- name = fields.Char('Certification')
+ name = fields.Char('Prescriber Canal')
class ResPartnerRgpdOrigin(models.Model):
@@ -366,3 +350,10 @@ class ResPartnerRgpdOrigin(models.Model):
_description = "Origin"
name = fields.Char('Origin')
+
+
+class ResPartnerTypeOrganization(models.Model):
+ _name = "res.partner.organization.type"
+ _description = "Organization Type"
+
+ name = fields.Char('Organization Type')
diff --git a/models/scop_revision.py b/models/scop_revision.py
index ebbb28cd32dd68fba1f267f79c96fda4b28a6ac3..9f2cedbfcceec89f32ddec5aed17c6c09a29ef11 100644
--- a/models/scop_revision.py
+++ b/models/scop_revision.py
@@ -32,10 +32,3 @@ class ScopRevisionFormat(models.Model):
_description = "Revision Format"
name = fields.Char('Revision Format')
-
-
-class ScopRevisionStaff(models.Model):
- _name = "scop.revision.staff"
- _description = "Revision Staff"
-
- name = fields.Char('Revision Staff')
diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml
index ef28b790889cd572e929fe140872c05c747809d3..5d27cc7fa2239387424a52ae54d3f3efc6b4ca2e 100644
--- a/views/res_partner_cooperative.xml
+++ b/views/res_partner_cooperative.xml
@@ -139,6 +139,7 @@
attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<div class="oe_title">
<field name="is_company" invisible="1"/>
+ <field name="lang" invisible="1"/>
<field name="commercial_partner_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
<field name="is_cooperative" invisible="1"/>
@@ -151,15 +152,12 @@
<group>
<group string="Infos générales">
<field name="social_object" attrs="{'required':[('project_status','in',('2_pre-diagnostic','3_accompagnement','4_adhesion', '5_suivi'))]}"/>
- <field name="sigle"/>
- <field name="organization_type_id" required="True"/>
<field name="partner_company_type_id" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"
attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="website" widget="url" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="siren" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="siret" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
- <field name="lang"/>
<field name="ape_id" context="{'partner_category_display': 'short'}" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"
domain="[('parent_id', 'child_of', %(l10n_eu_nace.nace_root)d), ('child_ids', '=', False)]" options='{"always_reload": True}'/>
<field name="industry_id" options="{'no_create': True}" can_create="true" can_write="true"
@@ -172,8 +170,6 @@
<field name="followup_delegate_id" widget="res_partner_many2one" attrs="{'required':[('project_status','in',('5_suivi'))]}"/>
<field name="creation_origin" required="True"/>
<field name="creation_suborigin_id" required="True"/>
- <field name="origin_company_type_id" required="True"/>
- <field name="project_status" required="True"/>
<field name="cooperative_form_id" attrs="{'required':[('project_status','in',('2_pre-diagnostic','3_accompagnement','4_adhesion', '5_suivi'))]}"/>
<field name="date_1st_sign" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="cae" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
@@ -181,7 +177,7 @@
<field name="seed_end" attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','in',('4_adhesion', '5_suivi')),('is_seed_scop', '=', True)]}"/>
<field name="is_incubated" required="True"/>
<field name="incubator_id" widget="res_partner_many2one" attrs="{'invisible': [('is_incubated', '!=', True)], 'required':[('is_incubated', '=', True)]}"/>
- <field name="prescriber_id" widget="res_partner_many2one"/>
+ <field name="prescriber_canal_id" widget="res_partner_many2one"/>
</group>
</group>
<group string="Informations de contact">
@@ -247,15 +243,12 @@
<field name="registration_date" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="last_update_status" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="is_main_location" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
- <field name="is_subsidiary" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
- <field name="parent_group_name" attrs="{'required' : [('is_subsidiary', '=', True)],
- 'invisible' : [('is_subsidiary', '=', False)]}"/>
+ <field name="parent_group_name"/>
</group>
<group>
<group string="Informations comptables">
<field name="first_closeout" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
<field name="closeout_month" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
- <field name="capital" attrs="{'required':[('project_status','in',('4_adhesion', '5_suivi'))]}"/>
</group>
<group string="Dissolution">
<field name="dissolution_date"/>
@@ -433,13 +426,14 @@
<field name="revision_company_id" widget="res_partner_many2one"/>
<field name="revision_backup_company_id" widget="res_partner_many2one"/>
<field name="revision_person_id" widget="res_partner_many2one"/>
- <field name="revision_backup_person_id" widget="res_partner_many2one"/>
+ <field name="revision_certified_person_id" widget="res_partner_many2one"/>
<field name="revision_person_assign_date"/>
</group>
<group>
<field name="revision_type"/>
<field name="revision_format_id"/>
<field name="revision_staff_id"/>
+ <field name="revision_last_date"/>
<field name="revision_next_date"/>
</group>
</group>
diff --git a/views/scop_config_lists_views.xml b/views/scop_config_lists_views.xml
index 7f850316a7bc696ac6c95bbf2de7d117f3497d0d..c6ef52a555baaa9d2d5a92630118a45f3e402e1d 100644
--- a/views/scop_config_lists_views.xml
+++ b/views/scop_config_lists_views.xml
@@ -253,37 +253,6 @@
</record>
- <!-- Revision Staff -->
- <record id="view_scop_revision_staff_tree" model="ir.ui.view">
- <field name="name">scop.revision.staff.tree</field>
- <field name="model">scop.revision.staff</field>
- <field name="arch" type="xml">
- <tree string="Revision Staffs">
- <field name="name"/>
- </tree>
- </field>
- </record>
-
- <record id="view_scop_revision_staff_form" model="ir.ui.view">
- <field name="name">scop.revision.staff.form</field>
- <field name="model">scop.revision.staff</field>
- <field name="arch" type="xml">
- <form string="Revision Staff">
- <group name="main">
- <field name="name"/>
- </group>
- </form>
- </field>
- </record>
-
- <record id="action_view_scop_revision_staff_tree" model="ir.actions.act_window">
- <field name="name">Revision Staff</field>
- <field name="res_model">scop.revision.staff</field>
- <field name="view_mode">tree,form</field>
- <field name="help">Display and manage the list of Revision Staffs.</field>
- </record>
-
-
<!-- Staff Collection -->
<record id="view_scop_staff_collection_tree" model="ir.ui.view">
<field name="name">scop.staff.collection.tree</field>
@@ -355,9 +324,5 @@
parent="menu_scop_lists"
action="action_view_scop_revision_format_tree"
sequence="90"/>
- <menuitem id="menu_scop_revision_staff"
- parent="menu_scop_lists"
- action="action_view_scop_revision_staff_tree"
- sequence="100"/>
</data>
</odoo>
diff --git a/views/scop_config_views.xml b/views/scop_config_views.xml
index 3d1292c10283e3dff01e5c148aec678f367e73c0..163d76af14544f01d41270144b893dc1f7997104 100644
--- a/views/scop_config_views.xml
+++ b/views/scop_config_views.xml
@@ -218,6 +218,39 @@
<field name="view_mode">tree,form</field>
<field name="help">Display and manage the list of Newsletters.</field>
</record>
+
+
+
+ <!-- Prescriber Canal -->
+ <record id="view_res_partner_prescriber_canal_tree" model="ir.ui.view">
+ <field name="name">res.partner.prescriber.canal.tree</field>
+ <field name="model">res.partner.prescriber.canal</field>
+ <field name="arch" type="xml">
+ <tree string="Prescriber Canals">
+ <field name="name"/>
+ </tree>
+ </field>
+ </record>
+
+ <record id="view_res_partner_prescriber_canal_form" model="ir.ui.view">
+ <field name="name">res.partner.prescriber.canal.form</field>
+ <field name="model">res.partner.prescriber.canal</field>
+ <field name="arch" type="xml">
+ <form string="Prescriber Canal">
+ <group name="main">
+ <field name="name"/>
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <record id="action_view_res_partner_prescriber_canal_tree" model="ir.actions.act_window">
+ <field name="name">Prescriber Canals</field>
+ <field name="res_model">res.partner.prescriber.canal</field>
+ <field name="view_mode">tree,form</field>
+ <field name="help">Display and manage the list of Prescriber Canals.</field>
+ </record>
+
<!-- MENUS -->
<menuitem id="contacts.res_partner_menu_config"
@@ -253,17 +286,21 @@
parent="menu_scop"
action="action_view_res_partner_rgpd_origin_tree"
sequence="50"/>
+ <menuitem id="menu_res_partner_prescriber_canal"
+ parent="menu_scop"
+ action="action_view_res_partner_prescriber_canal_tree"
+ sequence="60"/>
<menuitem id="menu_res_partner_creation_suborigin"
parent="menu_scop"
action="action_view_res_partner_creation_suborigin_tree"
- sequence="60"/>
+ sequence="70"/>
<menuitem id="menu_res_partner_company_type"
parent="menu_scop"
action="partner_company_type.res_partner_company_type_act_window"
- sequence="70"/>
+ sequence="80"/>
<menuitem id="menu_res_partner_organization_type"
parent="menu_scop"
action="action_view_res_partner_organization_type_tree"
- sequence="80"/>
+ sequence="90"/>
</data>
</odoo>