diff --git a/__manifest__.py b/__manifest__.py
index 37bec766f26d48b140a7bb5a5ca190c34e8c56bc..1f4be69322ec706b5ebf04380155b2525af2ebc2 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -26,7 +26,7 @@
# 'data/res.partner.aide.csv',
# 'data/res.partner.com.csv',
# 'data/res.partner.role.csv',
- 'data/res.partner.statutspe.csv',
+ 'data/res_partner_data.xml',
# 'data/res.partner.suivi.csv',
# 'data/res.partner.pref.csv',
],
diff --git a/data/res_partner_data.xml b/data/res_partner_data.xml
new file mode 100644
index 0000000000000000000000000000000000000000..27e3945c55a9d0131d8018f2a8a58bef5b3d5864
--- /dev/null
+++ b/data/res_partner_data.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+ <data noupdate="1">
+
+ <!-- res partner aide -->
+ <record id="aide_1" model="res.partner.aide">
+ <field name="name">ILS</field>
+ </record>
+ <record id="aide_2" model="res.partner.aide">
+ <field name="name">IC</field>
+ </record>
+
+ <!-- res partner com -->
+ <record id="com_1" model="res.partner.com">
+ <field name="name">LSF</field>
+ </record>
+ <record id="com_2" model="res.partner.com">
+ <field name="name">Oral</field>
+ </record>
+ <record id="com_3" model="res.partner.com">
+ <field name="name">Prise en note</field>
+ </record>
+ <record id="com_4" model="res.partner.com">
+ <field name="name">LS Etrangère</field>
+ </record>
+
+ <!-- res partner role -->
+ <record id="role_1" model="res.partner.role">
+ <field name="name">Commanditaire</field>
+ </record>
+ <record id="role_2" model="res.partner.role">
+ <field name="name">Opérationnel</field>
+ </record>
+ <record id="role_3" model="res.partner.role">
+ <field name="name">Salarié</field>
+ </record>
+ <record id="role_4" model="res.partner.role">
+ <field name="name">Compta-facturation</field>
+ </record>
+
+ <!-- res partner statut spé -->
+ <record id="statutspe_1" model="res.partner.statutspe">
+ <field name="name">Permanence</field>
+ </record>
+ <record id="statutspe_2" model="res.partner.statutspe">
+ <field name="name">Stagiaire formation LSF VP</field>
+ </record>
+ <record id="statutspe_3" model="res.partner.statutspe">
+ <field name="name">Stagiaire formation français VP</field>
+ </record>
+ <record id="statutspe_4" model="res.partner.statutspe">
+ <field name="name">Stagiaire formation catalogue</field>
+ </record>
+ <record id="statutspe_5" model="res.partner.statutspe">
+ <field name="name">Perso</field>
+ </record>
+
+ <!-- res partner suivi -->
+ <record id="suivi_1" model="res.partner.suivi">
+ <field name="name">Pôle emploi</field>
+ </record>
+ <record id="suivi_2" model="res.partner.suivi">
+ <field name="name">Cap emploi</field>
+ </record>
+ <record id="suivi_3" model="res.partner.suivi">
+ <field name="name">Mission locale</field>
+ </record>
+
+ </data>
+
+</odoo>
diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml
index 43de5bff36734f576a3d7f5328279fd906e6d49a..d28412dac1423445229b638e42e84a41e995cf56 100644
--- a/views/res_partner_view.xml
+++ b/views/res_partner_view.xml
@@ -94,23 +94,59 @@
</xpath>
<xpath expr="//sheet/group" position="replace">
- <group>
- <group>
- <field name="statuts" attrs="{'invisible': [ ('is_company','!=', True)]}"/>
+ <group attrs="{'invisible': [('is_company','!=', False)]}">
+ <group string="Contacts Persos">
+ <field name="title" options='{"no_open": True}'
+ attrs="{'invisible': [('is_company', '=', True)]}"/>
+ <field name="lang"/>
<field name="type" attrs="{'invisible': [('parent_id','=', False)]}" groups="base.group_no_one"/>
- <label for="street" string="Address"/>
+ <label for="street" string="Adresse"/>
<div class="o_address_format">
<div attrs="{'invisible': ['|', ('parent_id', '=', False), ('type', '!=', 'contact')]}" class="oe_edit_only"><b>Adresse:</b></div>
<field name="street" placeholder="Adresse..." class="o_address_street"
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="street2" placeholder="Adresse 2..." class="o_address_street"
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+ <field name="state_id" class="o_address_state" placeholder="State" options='{"no_open": True}'
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" context="{'country_id': country_id, 'zip': zip}" invisible="1"/>
+ <field name="zip" placeholder="Code Postal" class="o_address_zip"
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="city" placeholder="Ville" class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+ <field name="country_id" placeholder="Pays" class="o_address_country" options='{"no_open": True, "no_create": True}'
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+ </div>
+ <field name="phone" widget="phone"/>
+ <field name="mobile" widget="phone"/>
+ <field name="email" widget="email" context="{'gravatar_image': True}" />
+ </group>
+ <group string="Contacts Pros">
+ <field name="function" attrs="{'invisible': [('is_company','=', True)]}"/>
+ <field name="phone_pro" widget="phone"/>
+ <field name="mobile_pro" widget="phone"/>
+ <field name="email_pro" widget="email" context="{'gravatar_image': True}" />
+ <field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
+ <field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/>
+ <field name="role" widget="many2many_tags" attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',False)]}"/>
+ </group>
+ </group>
+ <group attrs="{'invisible': [('is_company','!=', True)]}">
+ <group>
+ <field name="statuts" />
+ <field name="type" attrs="{'invisible': [('parent_id','=', False)]}" groups="base.group_no_one"/>
+ <label for="street" string="Adresse"/>
+ <div class="o_address_format">
+ <div attrs="{'invisible': ['|', ('parent_id', '=', False), ('type', '!=', 'contact')]}" class="oe_edit_only"><b>Adresse:</b></div>
+ <field name="street" placeholder="Adresse..." class="o_address_street"
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+ <field name="street2" placeholder="Adresse 2..." class="o_address_street"
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="state_id" class="o_address_state" placeholder="State" options='{"no_open": True}'
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" context="{'country_id': country_id, 'zip': zip}" invisible="1"/>
<field name="zip" placeholder="Code Postal" class="o_address_zip"
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
+ <field name="city" placeholder="Ville" class="o_address_city"
+ attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
<field name="country_id" placeholder="Pays" class="o_address_country" options='{"no_open": True, "no_create": True}'
attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/>
</div>
@@ -119,45 +155,40 @@
<field name="financement" attrs="{'invisible': [('is_company','!=', True)]}"/>
</group>
<group>
- <field name="function" attrs="{'invisible': [('is_company','=', True)]}"/>
+
<field name="phone" widget="phone" attrs="{'invisible': [('is_company','=', False)]}"/>
<field name="mobile" widget="phone" attrs="{'invisible': [('is_company','=', False)]}"/>
<field name="user_ids" invisible="1"/>
<field name="email" widget="email" context="{'gravatar_image': True}" attrs="{'required': [('user_ids','!=', [])], 'invisible':[('is_company','=', False)]}"/>
<field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
- <field name="title" options='{"no_open": True}'
- attrs="{'invisible': [('is_company', '=', True)]}"/>
<field name="lang"/>
<field name="category_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Tags..."/>
- </group>
- </group>
- <group attrs="{'invisible': [('is_company','!=', False)]}">
- <group string="Contacts Persos">
- <field name="phone" widget="phone"/>
- <field name="mobile" widget="phone"/>
- <field name="email" widget="email" context="{'gravatar_image': True}" />
- </group>
- <group string="Contacts Pros">
- <field name="phone_pro" widget="phone"/>
- <field name="mobile_pro" widget="phone"/>
- <field name="email_pro" widget="email" context="{'gravatar_image': True}" />
+
</group>
</group>
+
<group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" string="Infos Bénéficiaire">
<group>
<field name="ic_referent" />
<field name="ic_possibles" widget="many2many_tags" />
+ </group>
+ <group>
<field name="statuts_perso" />
<field name="statuts_spe" widget="many2many_tags"/>
<field name="suivi_par" widget="many2many_tags"/>
- <field name="role" widget="many2many_tags"/>
</group>
+ </group>
+ <group attrs="{'invisible': ['|', ('is_company','!=', False),('beneficiaire','!=',True)]}" col="3">
<group>
<field name="dysphasique"/>
+ </group>
+ <group>
<field name="mode_communication"/>
<field name="mode_communication_choix" attrs="{'invisible': [ ('mode_communication','!=', True)]}" widget="many2many_checkboxes" />
+ </group>
+ <group>
<field name="aide_communication"/>
<field name="aide_communication_choix" attrs="{'invisible': [ ('aide_communication','!=', True)]}" widget="many2many_checkboxes" />
</group>