Skip to content
Extraits de code Groupes Projets
Valider 7475c500 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

Merge branch '14-RV-20231222-2' into '14.0' 

Saisie de l'adresse perso pour le grand est

See merge request lefilament/cgscop/cgscop_partner!44
parents 855f2feb cafabeb7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Afficher les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 179 ajouts et 18 suppressions
views/res_partner.xml
+ 179
− 18
Voir le fichier @ 7475c500
......@@ -473,7 +473,7 @@
t-value="kanban_color(record.color.raw_value)"
/>
<div
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')"
>
<a
name="edit_contact"
......@@ -1264,7 +1264,7 @@
t-value="kanban_color(record.color.raw_value)"
/>
<div
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')"
>
<a
t-if="!read_only_mode"
......@@ -1385,7 +1385,7 @@
t-value="kanban_color(record.color.raw_value)"
/>
<div
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"
t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')"
>
<a
name="edit_contact"
......@@ -1851,6 +1851,7 @@
<sheet>
<field name="parent_id_onchange" invisible="1" />
<field name="parent_id" invisible="1" />
<field name="type" invisible="1" />
<group>
<group>
<field
......@@ -1910,12 +1911,92 @@
/>
</group>
</group>
<field name="subscription_ids">
<notebook>
<page string="Abonnements">
<field
name="subscription_ids"
attrs="{'invisible': [('type', '!=', 'contact')]}"
>
<tree string="Subscriptions" editable="bottom">
<field name="newsletter_id" domain="[]" />
<field name="consent" />
</tree>
</field>
</page>
<page
string="Adresse"
attrs="{'invisible': ['|',('type', '!=', 'contact'),
('ur_id','!=',%(cgscop_partner.riga_14234)d)]}"
>
<div
class="alert alert-warning"
role="alert"
>
Attention ces informations sous soumises à la règlementation RGPD.
</div>
<group>
<label for="street" string="Adresse" />
<div>
<div name="div_address" class="o_address_format">
<field
name="street"
placeholder="Rue..."
class="o_address_street"
/>
<field
name="street2"
placeholder="Rue 2..."
class="o_address_street"
/>
<field
name="street3"
placeholder="Rue 3..."
class="o_address_street"
/>
<field
name="zip_id"
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
placeholder="CP/Ville autocomplétion"
class="oe_edit_only"
/>
<field
name="zip"
placeholder="ZIP"
class="o_address_city"
/>
<field
name="city"
placeholder="Ville"
class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"
modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"
/>
<field name="city_id" invisible="1" />
<field
name="cedex"
placeholder="Cedex"
class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"
modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"
/>
<field
name="state_id"
class="o_address_zip"
placeholder="Région"
options='{"no_open": True, "no_create": True}'
context="{'country_id': country_id, 'zip': zip}"
/>
<field
name="country_id"
placeholder="Country"
class="o_address_country"
options='{"no_open": True, "no_create": True}'
/>
</div>
</div>
</group>
</page>
</notebook>
<field name="lang" invisible="1" />
<field name="image_128" invisible="1" />
<field name="user_id" invisible="1" />
......@@ -1960,7 +2041,9 @@
required="1"
widget="radio"
options="{'horizontal': true}"
attrs="{'invisible': [('id', '!=', False)]}"
/>
<field name="id" invisible="1" />
<field name="parent_id_onchange" invisible="1" />
<field name="parent_id" invisible="1" />
<field name="parent_is_cooperative" invisible="1" />
......@@ -2108,6 +2191,8 @@
/>
</group>
</group>
<notebook>
<page string="Abonnements">
<field
name="subscription_ids"
attrs="{'invisible': [('type', '!=', 'contact')]}"
......@@ -2117,6 +2202,82 @@
<field name="consent" />
</tree>
</field>
</page>
<page
string="Adresse"
attrs="{'invisible': ['|',('type', '!=', 'contact'),
('ur_id','!=',%(cgscop_partner.riga_14234)d)]}"
>
<div
class="alert alert-warning"
role="alert"
>
Attention ces informations sous soumises à la règlementation RGPD.
</div>
<group>
<label for="street" string="Adresse" />
<div>
<div name="div_address" class="o_address_format">
<field
name="street"
placeholder="Rue..."
class="o_address_street"
/>
<field
name="street2"
placeholder="Rue 2..."
class="o_address_street"
/>
<field
name="street3"
placeholder="Rue 3..."
class="o_address_street"
/>
<field
name="zip_id"
options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}"
placeholder="CP/Ville autocomplétion"
class="oe_edit_only"
/>
<field
name="zip"
placeholder="ZIP"
class="o_address_city"
/>
<field
name="city"
placeholder="Ville"
class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"
modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"
/>
<field name="city_id" invisible="1" />
<field
name="cedex"
placeholder="Cedex"
class="o_address_city"
attrs="{'readonly': [('type', '=', 'contact'), ('parent_id', '!=', False)]}"
modifiers="{'readonly':[['type','=','contact'],['parent_id','!=',false]]}"
/>
<field
name="state_id"
class="o_address_zip"
placeholder="Région"
options='{"no_open": True, "no_create": True}'
context="{'country_id': country_id, 'zip': zip}"
/>
<field
name="country_id"
placeholder="Country"
class="o_address_country"
options='{"no_open": True, "no_create": True}'
/>
</div>
</div>
</group>
</page>
</notebook>
<field name="lang" invisible="1" />
<field name="image_128" invisible="1" />
<field name="user_id" invisible="1" />
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter