Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
C
cgscop_partner
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse du dépôt
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté GitLab
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Le Filament
Confédération Générale des SCOP
cgscop_partner
Validations
5ade0ccf
Valider
5ade0ccf
rédigé
Il y a 5 ans
par
Rémi - Le Filament
Parcourir les fichiers
Options
Téléchargements
Plain Diff
Merge branch 'hsilvant/cgscop_partner-12.0-RV_ajout_champ_et_reorg_contact' into 12.0-evo-202003
parents
079f118a
d0079f4e
Branches
Branches contenant la validation
Aucune étiquette associée trouvée
1 requête de fusion
!5
12.0 rv ajout champ et reorg contact
Modifications
2
Afficher les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
models/res_partner.py
+8
-0
8 ajouts, 0 suppression
models/res_partner.py
views/res_partner.xml
+27
-30
27 ajouts, 30 suppressions
views/res_partner.xml
avec
35 ajouts
et
30 suppressions
models/res_partner.py
+
8
−
0
Voir le fichier @
5ade0ccf
...
@@ -360,6 +360,14 @@ class ScopPartner(models.Model):
...
@@ -360,6 +360,14 @@ class ScopPartner(models.Model):
string
=
"
Licéité du contact
"
,
string
=
"
Licéité du contact
"
,
compute
=
"
_compute_contact_legality
"
,
compute
=
"
_compute_contact_legality
"
,
store
=
True
)
store
=
True
)
associate
=
fields
.
Selection
(
selection
=
[(
'
asso
'
,
"
Associé extérieur
"
),
(
'
coop
'
,
"
Associé coopérateur
"
),
(
'
none
'
,
"
Non associé
"
)],
string
=
"
Associé
"
)
employee
=
fields
.
Boolean
(
string
=
"
Salarié
"
,
default
=
True
)
# Champs pour partenaires
# Champs pour partenaires
organization_type_id
=
fields
.
Many2one
(
organization_type_id
=
fields
.
Many2one
(
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
views/res_partner.xml
+
27
−
30
Voir le fichier @
5ade0ccf
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
<attribute
name=
"invisible"
>
1
</attribute>
<attribute
name=
"invisible"
>
1
</attribute>
</field>
</field>
<xpath
expr=
'//form/sheet/group/group[2]'
position=
"replace"
>
<xpath
expr=
'//form/sheet/group/group[2]'
position=
"replace"
>
<group
name=
"
contact
_segment_info"
attrs=
"{'invisible': [
'|',
('is_company','=', False)
, ('type','!=', 'contact')
]}"
>
<group
name=
"
partner
_segment_info"
attrs=
"{'invisible': [('is_company',
'=', False)]}"
>
<field
name=
"certification_ids"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
attrs=
"{'invisible': [('is_company', '=', False)]}"
/>
<field
name=
"certification_ids"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
attrs=
"{'invisible': [('is_company', '=', False)]}"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
...
@@ -135,17 +135,15 @@
...
@@ -135,17 +135,15 @@
<field
name=
"organization_subtype_id"
attrs=
"{'invisible': [('is_company','=', False)]}"
domain=
"[('child_ids', '=', False)]"
options=
"{'no_create': True, 'no_open': True}"
/>
<field
name=
"organization_subtype_id"
attrs=
"{'invisible': [('is_company','=', False)]}"
domain=
"[('child_ids', '=', False)]"
options=
"{'no_create': True, 'no_open': True}"
/>
<field
name=
"organization_type_id"
readonly=
"1"
attrs=
"{'invisible': [('is_company', '=', False)]}"
options=
"{'no_create': True, 'no_open': True}"
/>
<field
name=
"organization_type_id"
readonly=
"1"
attrs=
"{'invisible': [('is_company', '=', False)]}"
options=
"{'no_create': True, 'no_open': True}"
/>
</group>
</group>
<group
name=
"
partner
_segment_info"
attrs=
"{'invisible': ['|', ('is_company','=', True), ('type','!=', 'contact'
)
]}"
>
<group
name=
"
contact
_segment_info"
attrs=
"{'invisible': ['|', ('is_company',
'=', True), ('type',
'!=', 'contact']}"
>
<field
name=
"title"
options=
'{"no_create": True, "no_open": True}'
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"title"
options=
'{"no_create": True, "no_open": True}'
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"mandate_id"
options=
'{"no_create": True, "no_open": True}'
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"mandate_id"
options=
'{"no_create": True, "no_open": True}'
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"function"
/>
<field
name=
"function"
/>
<field
name=
"employee"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"associate"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"birthyear"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"birthyear"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"contact_origin_id"
attrs=
"{'invisible': [('is_company','=', True)]}"
options=
"{'no_create': True, 'no_open': True}"
/>
<field
name=
"contact_origin_id"
attrs=
"{'invisible': [('is_company','=', True)]}"
options=
"{'no_create': True, 'no_open': True}"
/>
<field
name=
"contact_legality"
readonly=
"True"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"contact_legality"
readonly=
"True"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_3_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_4_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
</group>
</group>
</xpath>
</xpath>
<xpath
expr=
'//form/sheet/group'
position=
"after"
>
<xpath
expr=
'//form/sheet/group'
position=
"after"
>
...
@@ -166,8 +164,7 @@
...
@@ -166,8 +164,7 @@
<xpath
expr=
"//field[@name='child_ids']//kanban//div[hasclass('oe_kanban_details')]//field[@name='name']"
position=
"after"
>
<xpath
expr=
"//field[@name='child_ids']//kanban//div[hasclass('oe_kanban_details')]//field[@name='name']"
position=
"after"
>
<div
t-if=
"record.mandate_id.raw_value"
><field
name=
"mandate_id"
/></div>
<div
t-if=
"record.mandate_id.raw_value"
><field
name=
"mandate_id"
/></div>
</xpath>
</xpath>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='function']"
position=
"before"
>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='function']"
position=
"replace"
>
<field
name=
"mandate_id"
options=
'{"no_open": True, "no_create": True}'
attrs=
"{'invisible': [('type','!=', 'contact')]}"
/>
<field
name=
"ur_id"
invisible=
"1"
options=
'{"no_open": True, "no_create": True}'
/>
<field
name=
"ur_id"
invisible=
"1"
options=
'{"no_open": True, "no_create": True}'
/>
</xpath>
</xpath>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='street']"
position=
"attributes"
>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='street']"
position=
"attributes"
>
...
@@ -191,18 +188,23 @@
...
@@ -191,18 +188,23 @@
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='state_id']"
position=
"attributes"
>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='state_id']"
position=
"attributes"
>
<attribute
name=
"placeholder"
>
Région
</attribute>
<attribute
name=
"placeholder"
>
Région
</attribute>
</xpath>
</xpath>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='mobile']"
position=
"after"
>
<field
name=
"category_id"
options=
'{"no_open": True, "no_create": True}'
widget=
"many2many_tags"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
</xpath>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='title']"
position=
"attributes"
>
<xpath
expr=
"//field[@name='child_ids']//form//field[@name='title']"
position=
"attributes"
>
<attribute
name=
"options"
>
{'no_open': True, 'no_create': True}
</attribute>
<attribute
name=
"options"
>
{'no_open': True, 'no_create': True}
</attribute>
</xpath>
</xpath>
<xpath
expr=
"//field[@name='child_ids']/form//group/group[2]"
position=
"after"
>
<xpath
expr=
"//field[@name='child_ids']/form//group/group[2]"
position=
"after"
>
<group
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
<group
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
<field
name=
"mandate_id"
options=
'{"no_open": True, "no_create": True}'
/>
<field
name=
"function"
/>
<field
name=
"employee"
/>
<field
name=
"associate"
/>
<field
name=
"birthyear"
/>
<field
name=
"birthyear"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_3_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_4_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
</group>
</group>
</xpath>
</xpath>
<xpath
expr=
"//field[@name='child_ids']/form//group"
position=
"after"
>
<xpath
expr=
"//field[@name='child_ids']/form//group"
position=
"after"
>
...
@@ -222,7 +224,7 @@
...
@@ -222,7 +224,7 @@
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"mobile"
widget=
"phone"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"mobile"
widget=
"phone"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"email"
widget=
"email"
on_change=
"1"
/>
<field
name=
"email"
widget=
"email"
on_change=
"1"
/>
<field
name=
"website"
/>
<field
name=
"website"
attrs=
"{'invisible': [('is_company','=', False)]}"
/>
<field
name=
"ur_id"
options=
'{"no_open": True, "no_create": True}'
on_change=
"1"
can_create=
"false"
can_write=
"false"
/>
<field
name=
"ur_id"
options=
'{"no_open": True, "no_create": True}'
on_change=
"1"
can_create=
"false"
can_write=
"false"
/>
<field
name=
"category_id"
options=
'{"no_open": True, "no_create": True}'
widget=
"many2many_tags"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"category_id"
options=
'{"no_open": True, "no_create": True}'
widget=
"many2many_tags"
attrs=
"{'invisible': [('is_company','=', True)]}"
/>
<field
name=
"lang"
invisible=
"1"
/>
<field
name=
"lang"
invisible=
"1"
/>
...
@@ -392,7 +394,7 @@
...
@@ -392,7 +394,7 @@
</group>
</group>
<notebook
colspan=
"4"
>
<notebook
colspan=
"4"
>
<page
name=
"scop_contacts"
string=
"Contacts & Addresses"
>
<page
name=
"scop_contacts"
string=
"Contacts & Addresses"
>
<label
for=
"director_ids"
string=
"Dirigeants"
/>
<label
for=
"director_ids"
string=
"Dirigeants
et mandataires
"
/>
<p>
<p>
<button
name=
"add_director"
type=
"object"
class=
"btn-info"
string=
"Ajouter un dirigeant"
></button>
<button
name=
"add_director"
type=
"object"
class=
"btn-info"
string=
"Ajouter un dirigeant"
></button>
</p>
</p>
...
@@ -770,8 +772,6 @@
...
@@ -770,8 +772,6 @@
<field
name=
"title"
placeholder=
"Madame"
options=
'{"no_open": True, "no_create": True}'
/>
<field
name=
"title"
placeholder=
"Madame"
options=
'{"no_open": True, "no_create": True}'
/>
<field
name=
"firstname"
string=
"Prénom"
required=
"1"
/>
<field
name=
"firstname"
string=
"Prénom"
required=
"1"
/>
<field
name=
"lastname"
string=
"Nom de famille"
required=
"1"
/>
<field
name=
"lastname"
string=
"Nom de famille"
required=
"1"
/>
<field
name=
"mandate_id"
options=
"{'no_open': True, 'no_create': True}"
required=
"1"
/>
<field
name=
"function"
placeholder=
"Responsable des ventes"
/>
<field
name=
"email"
/>
<field
name=
"email"
/>
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"mobile"
widget=
"phone"
/>
<field
name=
"mobile"
widget=
"phone"
/>
...
@@ -779,13 +779,13 @@
...
@@ -779,13 +779,13 @@
<field
name=
"comment"
placeholder=
"Commentaires..."
/>
<field
name=
"comment"
placeholder=
"Commentaires..."
/>
</group>
</group>
<group>
<group>
<field
name=
"mandate_id"
options=
"{'no_open': True, 'no_create': True}"
required=
"1"
/>
<field
name=
"function"
/>
<field
name=
"employee"
/>
<field
name=
"associate"
/>
<field
name=
"birthyear"
/>
<field
name=
"birthyear"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_3_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_4_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
</group>
</group>
</group>
</group>
<field
name=
"subscription_ids"
>
<field
name=
"subscription_ids"
>
...
@@ -812,7 +812,7 @@
...
@@ -812,7 +812,7 @@
<field
name=
"name"
>
scop.partner.contact.form.view
</field>
<field
name=
"name"
>
scop.partner.contact.form.view
</field>
<field
name=
"model"
>
res.partner
</field>
<field
name=
"model"
>
res.partner
</field>
<field
name=
"arch"
type=
"xml"
>
<field
name=
"arch"
type=
"xml"
>
<form
string=
"Contact / Address"
>
<form
string=
"Contact
s
/ Address
es
"
>
<sheet>
<sheet>
<field
name=
"type"
required=
"1"
widget=
"radio"
options=
"{'horizontal': true}"
/>
<field
name=
"type"
required=
"1"
widget=
"radio"
options=
"{'horizontal': true}"
/>
<field
name=
"parent_id_onchange"
invisible=
"1"
/>
<field
name=
"parent_id_onchange"
invisible=
"1"
/>
...
@@ -848,9 +848,6 @@
...
@@ -848,9 +848,6 @@
<field
name=
"name"
string=
"Nom"
attrs=
"{'required' : [('type', '!=', 'contact')], 'invisible' : [('type', '=', 'contact')]}"
/>
<field
name=
"name"
string=
"Nom"
attrs=
"{'required' : [('type', '!=', 'contact')], 'invisible' : [('type', '=', 'contact')]}"
/>
<field
name=
"firstname"
string=
"Prénom"
attrs=
"{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"
/>
<field
name=
"firstname"
string=
"Prénom"
attrs=
"{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"
/>
<field
name=
"lastname"
string=
"Nom de famille"
attrs=
"{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"
/>
<field
name=
"lastname"
string=
"Nom de famille"
attrs=
"{'required' : [('type', '=', 'contact')], 'invisible' : [('type', '!=', 'contact')]}"
/>
<field
name=
"mandate_id"
options=
"{'no_open': True, 'no_create': True}"
attrs=
"{'invisible': [('type','!=', 'contact')]}"
/>
<field
name=
"function"
placeholder=
"e.g. Directeur des Ventes"
attrs=
"{'invisible': [('type','!=', 'contact')]}"
/>
<field
name=
"email"
/>
<field
name=
"email"
/>
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"phone"
widget=
"phone"
/>
<field
name=
"mobile"
widget=
"phone"
/>
<field
name=
"mobile"
widget=
"phone"
/>
...
@@ -858,13 +855,13 @@
...
@@ -858,13 +855,13 @@
<field
name=
"comment"
placeholder=
"internal note..."
/>
<field
name=
"comment"
placeholder=
"internal note..."
/>
</group>
</group>
<group
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
<group
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
<field
name=
"mandate_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"function"
/>
<field
name=
"employee"
/>
<field
name=
"associate"
/>
<field
name=
"birthyear"
/>
<field
name=
"birthyear"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_origin_id"
options=
"{'no_open': True, 'no_create': True}"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"contact_legality"
readonly=
"1"
/>
<field
name=
"segment_1_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_2_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_3_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
<field
name=
"segment_4_id"
widget=
"many2many_tags"
options=
"{'color_field': 'color', 'no_create': True}"
domain=
"[('ur_id', '=', ur_id)]"
/>
</group>
</group>
</group>
</group>
<field
name=
"subscription_ids"
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
<field
name=
"subscription_ids"
attrs=
"{'invisible': [('type', '!=', 'contact')]}"
>
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter