diff --git a/models/res_partner.py b/models/res_partner.py
index 493e75b0c7434ae2d6f3a753b2746ce8f61b1cb0..b1c83ea723f93a144fb7f2e5dff619aa17de7dd7 100644
--- a/models/res_partner.py
+++ b/models/res_partner.py
@@ -24,9 +24,6 @@ class ModelName(models.Model):
service = fields.Char(
string='Service',
required=False)
- business_name = fields.Char(
- string='Raison Sociale',
- required=False)
region_id = fields.Many2one(
comodel_name='res.country.state',
string='Région',
@@ -42,12 +39,10 @@ class ModelName(models.Model):
string='Instagram',
required=False)
- prescripteur_id = fields.Many2one(
- comodel_name='res.partner.prescripteur',
- string='Prescripteur',
- required=False)
-
# Commerce
+ business_name = fields.Char(
+ string='Nom commercial',
+ required=False)
commerce_type_id = fields.Many2one(
comodel_name='res.partner.commerce.type',
string='Type de commerce',
@@ -69,20 +64,24 @@ class ModelName(models.Model):
meg = fields.Char(
string='Numéro MEG',
required=False)
-
- # Adhésion à ETIC
+ prescripteur_id = fields.Many2one(
+ comodel_name='res.partner.prescripteur',
+ string='Prescripteur',
+ required=False)
network_starting_date = fields.Date(
- string='Date d\'entrée dans le réseau',
+ string='Date entrée réseau',
required=False)
+ participation_ids = fields.Many2many(
+ comodel_name='res.partner.participation',
+ string='Participe à')
+
+ # Adhésion à ETIC
is_partner_member = fields.Boolean(
string='Adhérent',
required=False)
partner_membership_date = fields.Date(
string='Date d\'adhésion',
required=False)
- participation_ids = fields.Many2many(
- comodel_name='res.partner.participation',
- string='Participe à')
is_partnesrship_committee = fields.Boolean(
string='Participe au comité partenarial',
required=False)
@@ -109,11 +108,11 @@ class ModelName(models.Model):
# Consignes
deposit_balance = fields.Float(
- string='Solde de consigne du commerce',
+ string='Solde consignes',
# currency_field='company_id.currency_id',
required=False)
deposit_balance_date = fields.Date(
- string='Date de relevé du solde de consigne',
+ string='Date relevé solde consignes',
required=False)
# Horaires
@@ -125,15 +124,14 @@ class ModelName(models.Model):
comodel_name='res.partner.spot.schedule',
inverse_name='partner_id',
string='Emplacements (commerces itinérants)')
- time_slot = fields.Char(
+ time_slot = fields.Text(
string='Créneaux attribués',
required=False)
opening_schedule_ids = fields.One2many(
comodel_name='res.partner.opening.schedule',
inverse_name='partner_id',
string='Horaires d\'ouverture')
-
- order_conditions = fields.Char(
+ order_conditions = fields.Text(
string='Modalités de la commande',
required=False)
@@ -144,7 +142,7 @@ class ModelName(models.Model):
convention_date2 = fields.Date(
string='Date signature convention Phase 2',
required=False)
- exchange_summary = fields.Char(
+ exchange_summary = fields.Text(
string='Résumé des échanges',
required=False)
webinar_participation_date = fields.Date(
@@ -156,6 +154,9 @@ class ModelName(models.Model):
essaimage_status_id = fields.Many2one(
comodel_name='res.partner.essaimage.status',
string='Avancement essaimage')
+ related_essaimage_status = fields.Many2one(
+ string='Statut essaimage affiché',
+ related='essaimage_status_id')
# ------------------------------------------------------
# Onchange / Constraints
diff --git a/views/res_partner.xml b/views/res_partner.xml
index 52c4801c8ab698d94fa983bfb6cec21c606d7881..6aabff79d33108d374ecbae1d854b88f99d05ec3 100644
--- a/views/res_partner.xml
+++ b/views/res_partner.xml
@@ -4,6 +4,7 @@
<odoo>
<data>
+ <!-- FORM VIEW -->
<record id="res_partner_form_inherit" model="ir.ui.view">
<field name="name">res.partner.form</field>
<field name="model">res.partner</field>
@@ -16,11 +17,16 @@
<field name="related_commerce_status" widget="statusbar" clickable="0"
attrs="{'invisible': [('type_id', 'not in', (%(etic_partner.type_shop)d, %(etic_partner.type_supplier)d))]}"/>
</header>
+ <header>
+ <field name="related_essaimage_status" widget="statusbar" clickable="0"
+ attrs="{'invisible': [('type_id', 'not in', (%(etic_partner.type_essaimage)d))]}"/>
+ </header>
</xpath>
- <xpath expr="//group[1]" position="before">
+ <xpath expr="//sheet/group[1]" position="before">
<group col="2">
<group>
+ <field name="business_name" attrs="{'invisible': [('company_type', '=', 'person')]}"/>
<field name="type_id" options="{'no_open': True, 'no_create': True}"
domain="[('partner_type', 'in', [company_type, 'all'])]"/>
<field name="subtype_id" options="{'no_open': True, 'no_create': True}"
@@ -47,16 +53,94 @@
<field name="service" attrs="{'invisible': [('company_type', '!=', 'person')]}"/>
</xpath>
+ <xpath expr="//field[@name='website']" position="after">
+ <field name="facebook" widget="url"/>
+ <field name="twitter" widget="url"/>
+ <field name="instagram" widget="url"/>
+ </xpath>
+
<xpath expr="//page[@name='sales_purchases']" position="after">
+
<page name='commerce' string="Commerce"
attrs="{'invisible': [('type_id', 'not in', (%(etic_partner.type_shop)d, %(etic_partner.type_supplier)d))]}">
+ <group col="2">
+ <group>
+ <field name="commerce_type_id" options="{'no_open': True, 'no_create': True}"/>
+ <field name="legal_status_id" options="{'no_open': True, 'no_create': True}"/>
+ <field name="commerce_status_id" options="{'no_open': True, 'no_create': True}"/>
+ <field name="prescripteur_id" options="{'no_open': True, 'no_create': True}"/>
+ <field name="gt_commerce_participation" widget="boolean_toggle"/>
+ </group>
+ <group>
+ <field name="network_starting_date"/>
+ <field name="participation_ids"
+ options="{'no_open': True, 'no_create': True}"
+ widget="many2many_tags"/>
+ <field name="deposit_balance" widget="monetary"/>
+ <field name="deposit_balance_date"/>
+ </group>
+ </group>
<group>
- <field name="commerce_type_id" options="{'no_open': True, 'no_create': True}"/>
- <field name="legal_status_id" options="{'no_open': True, 'no_create': True}"/>
- <field name="commerce_status_id" options="{'no_open': True, 'no_create': True}"/>
- <field name="gt_commerce_participation" widget="boolean_toggle"/>
+ <field name="delivery_schedule_ids"/>
+ <field name="spot_schedule_ids"/>
</group>
</page>
+
+ <page name='association' string="Association">
+ <group col="2">
+ <group>
+ <field name="is_partner_member" widget="boolean_toggle"/>
+ <field name="partner_membership_date" attrs="{'invisible': [('is_partner_member', '!=', True)]}"/>
+ </group>
+ <group attrs="{'invisible': [('is_partner_member', '!=', True)]}">
+ <field name="is_partnesrship_committee" widget="boolean_toggle"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_partnership)d))]}"/>
+ <field name="is_cofunder_college" widget="boolean_toggle"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_individual)d))]}"/>
+ <field name="is_resident_college" widget="boolean_toggle"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_individual)d))]}"/>
+ <field name="is_active_volunteer" widget="boolean_toggle"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_individual)d))]}"/>
+ <field name="is_employee" widget="boolean_toggle"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_individual)d))]}"/>
+ </group>
+ </group>
+ </page>
+
+ <page name='essaimage' string="Essaimage"
+ attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_essaimage)d))]}">
+ <group>
+ <field name="convention_date1"/>
+ <field name="convention_date2"/>
+ <field name="exchange_summary"/>
+ <field name="webinar_participation_date"/>
+ <field name="selection_date"/>
+ <field name="essaimage_status_id" options="{'no_open': True, 'no_create': True}"/>
+ </group>
+ </page>
+
+ <page name='schedule' string="Horaires"
+ attrs="{'invisible': [('company_type', '=', 'person')]}">
+ <group>
+ <field name="time_slot" attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_supplier)d))]}"/>
+ <field name="opening_schedule_ids">
+ <tree editable="top">
+ <field name="day"/>
+ <field name="opening_hour" widget="float_time"/>
+ <field name="closing_hour" widget="float_time"/>
+ </tree>
+ </field>
+ <field name="order_conditions" attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_supplier)d))]}"/>
+ </group>
+ </page>
+
+ </xpath>
+
+ <xpath expr="//sheet/group[2]" position="inside">
+ <group attrs="{'invisible': [('type_id', '!=', (%(etic_partner.type_other)d))]}">
+ <field name="is_etic_member" widget="boolean_toggle"/>
+ <field name="etic_membership_date" attrs="{'invisible': [('is_etic_member', '!=', True)]}"/>
+ </group>
</xpath>
</field>