updated features

sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -442,7 +442,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -462,7 +462,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -39,
+    'weight' => -38,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -585,7 +585,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -42,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1029,7 +1029,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1049,7 +1049,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,

sites/all/modules/features/materio_administration/materio_administration.features.workflow_access.inc

@@ -12,6 +12,16 @@ function materio_administration_workflow_access_features_default_settings() {
 
   $workflows['Publication'] = array();
   $workflows['Publication']['(creation)'] = array();
+  $workflows['Publication']['(creation)']['Translator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
+  $workflows['Publication']['(creation)']['Admin showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['(creation)']['administrator'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -72,12 +82,12 @@ function materio_administration_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['(creation)']['Translator'] = array(
-    'grant_view' => 0,
-    'grant_update' => 0,
+  $workflows['Publication']['Importé'] = array();
+  $workflows['Publication']['Importé']['Translator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Importé'] = array();
   $workflows['Publication']['Importé']['Admin showroom'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -143,11 +153,6 @@ function materio_administration_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Importé']['Translator'] = array(
-    'grant_view' => 0,
-    'grant_update' => 0,
-    'grant_delete' => 0,
-  );
   $workflows['Publication']['Édité'] = array();
   $workflows['Publication']['Édité']['Student'] = array(
     'grant_view' => 1,
@@ -164,6 +169,11 @@ function materio_administration_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Édité']['Translator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Édité']['Admin showroom'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -214,17 +224,17 @@ function materio_administration_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Édité']['Translator'] = array(
-    'grant_view' => 0,
-    'grant_update' => 0,
-    'grant_delete' => 0,
-  );
   $workflows['Publication']['Masqué'] = array();
   $workflows['Publication']['Masqué']['Utilisateur Alpha Tester'] = array(
     'grant_view' => 1,
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Masqué']['Translator'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Masqué']['Admin showroom'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -285,11 +295,6 @@ function materio_administration_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
-  $workflows['Publication']['Masqué']['Translator'] = array(
-    'grant_view' => 0,
-    'grant_update' => 0,
-    'grant_delete' => 0,
-  );
   $workflows['Publication']['Publié'] = array();
   $workflows['Publication']['Publié']['utilisateur anonyme'] = array(
     'grant_view' => 1,
@@ -338,7 +343,7 @@ function materio_administration_workflow_access_features_default_settings() {
   );
   $workflows['Publication']['Publié']['Translator'] = array(
     'grant_view' => 0,
-    'grant_update' => 0,
+    'grant_update' => 1,
     'grant_delete' => 0,
   );
   $workflows['Publication']['Publié']['Admin showroom'] = array(

sites/all/modules/features/materio_administration/materio_administration.views_default.inc

@@ -424,7 +424,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Field: Content: Référence Materio */
+  /* Field: Nœud: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -434,13 +434,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: Content: Manufacturer */
+  /* Field: Nœud: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['label'] = 'Fabricants / Distributeurs';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Field: Content: Distributor */
+  /* Field: Nœud: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -795,7 +795,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
   $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
@@ -819,7 +819,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  /* Field: Content: Image */
+  /* Field: Nœud: Image */
   $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['field'] = 'field_materiau_image';
@@ -830,7 +830,7 @@ function materio_administration_views_default_views() {
   );
   $handler->display->display_options['fields']['field_materiau_image']['delta_limit'] = '1';
   $handler->display->display_options['fields']['field_materiau_image']['delta_offset'] = '0';
-  /* Field: Content: Image */
+  /* Field: Nœud: Image */
   $handler->display->display_options['fields']['field_visuel']['id'] = 'field_visuel';
   $handler->display->display_options['fields']['field_visuel']['table'] = 'field_data_field_visuel';
   $handler->display->display_options['fields']['field_visuel']['field'] = 'field_visuel';
@@ -845,13 +845,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Field: Content: Titre */
+  /* Field: Nœud: Titre */
   $handler->display->display_options['fields']['title_field']['id'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
   $handler->display->display_options['fields']['title_field']['field'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
-  /* Field: Content: Référence Materio */
+  /* Field: Nœud: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -869,7 +869,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = 'Translate';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = '<a class="node-edit" href="/node/[nid]/translate">Translate</a>';
-  /* Field: Content: Manufacturer */
+  /* Field: Nœud: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
@@ -878,7 +878,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_fab']['alter']['text'] = 'Fab :<br/>
 [field_company_fab] ';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Field: Content: Distributor */
+  /* Field: Nœud: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -886,7 +886,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_distrib']['alter']['text'] = 'Distrib : <br />
 [field_company_distrib]';
   $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0';
-  /* Field: Content: Onthologie */
+  /* Field: Nœud: Onthologie */
   $handler->display->display_options['fields']['field_onthologie']['id'] = 'field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['table'] = 'field_data_field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['field'] = 'field_onthologie';
@@ -894,13 +894,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_onthologie']['delta_limit'] = '5';
   $handler->display->display_options['fields']['field_onthologie']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_onthologie']['multi_type'] = 'ol';
-  /* Field: Content: Tags libres */
+  /* Field: Nœud: Tags libres */
   $handler->display->display_options['fields']['field_tags_libres']['id'] = 'field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['table'] = 'field_data_field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['field'] = 'field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['delta_limit'] = '0';
   $handler->display->display_options['fields']['field_tags_libres']['delta_offset'] = '0';
-  /* Field: Content: Materiau(x) lié(s) */
+  /* Field: Nœud: Materiau(x) lié(s) */
   $handler->display->display_options['fields']['field_materiau_ref']['id'] = 'field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['table'] = 'field_data_field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['field'] = 'field_materiau_ref';
@@ -911,7 +911,7 @@ function materio_administration_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_materiau_ref']['delta_offset'] = '0';
-  /* Field: Content: Brève(s) liée(s) */
+  /* Field: Nœud: Brève(s) liée(s) */
   $handler->display->display_options['fields']['field_breve_ref']['id'] = 'field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['table'] = 'field_data_field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['field'] = 'field_breve_ref';
@@ -929,17 +929,17 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Field: Content: Fichiers joints */
+  /* Field: Nœud: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Field: Content: Localisation */
+  /* Field: Nœud: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
-  /* Field: Content: Samples */
+  /* Field: Nœud: Samples */
   $handler->display->display_options['fields']['field_location']['id'] = 'field_location';
   $handler->display->display_options['fields']['field_location']['table'] = 'field_data_field_location';
   $handler->display->display_options['fields']['field_location']['field'] = 'field_location';
@@ -1039,7 +1039,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Content: Famille (field_famille) */
+  /* Filter criterion: Nœud: Famille (field_famille) */
   $handler->display->display_options['filters']['field_famille_value']['id'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['table'] = 'field_data_field_famille';
   $handler->display->display_options['filters']['field_famille_value']['field'] = 'field_famille_value';
@@ -1050,7 +1050,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_famille_value']['expose']['operator'] = 'field_famille_value_op';
   $handler->display->display_options['filters']['field_famille_value']['expose']['identifier'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['expose']['remember'] = TRUE;
-  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
+  /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1061,18 +1061,18 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['label'] = 'Référence';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator'] = 'field_reference_materio_value_op';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['identifier'] = 'field_reference_materio_value';
-  /* Filter criterion: Content: Localisation (field_localisation) */
-  $handler->display->display_options['filters']['field_localisation_value']['id'] = 'field_localisation_value';
-  $handler->display->display_options['filters']['field_localisation_value']['table'] = 'field_data_field_localisation';
-  $handler->display->display_options['filters']['field_localisation_value']['field'] = 'field_localisation_value';
-  $handler->display->display_options['filters']['field_localisation_value']['operator'] = 'contains';
-  $handler->display->display_options['filters']['field_localisation_value']['group'] = 1;
-  $handler->display->display_options['filters']['field_localisation_value']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['field_localisation_value']['expose']['operator_id'] = 'field_localisation_value_op';
-  $handler->display->display_options['filters']['field_localisation_value']['expose']['label'] = 'Localisation';
-  $handler->display->display_options['filters']['field_localisation_value']['expose']['operator'] = 'field_localisation_value_op';
-  $handler->display->display_options['filters']['field_localisation_value']['expose']['identifier'] = 'field_localisation_value';
-  $handler->display->display_options['filters']['field_localisation_value']['expose']['remember_roles'] = array(
+  /* Filter criterion: Nœud: Samples (field_location:location) */
+  $handler->display->display_options['filters']['field_location_location']['id'] = 'field_location_location';
+  $handler->display->display_options['filters']['field_location_location']['table'] = 'field_data_field_location';
+  $handler->display->display_options['filters']['field_location_location']['field'] = 'field_location_location';
+  $handler->display->display_options['filters']['field_location_location']['operator'] = 'contains';
+  $handler->display->display_options['filters']['field_location_location']['group'] = 1;
+  $handler->display->display_options['filters']['field_location_location']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_location_location']['expose']['operator_id'] = 'field_location_location_op';
+  $handler->display->display_options['filters']['field_location_location']['expose']['label'] = 'Samples';
+  $handler->display->display_options['filters']['field_location_location']['expose']['operator'] = 'field_location_location_op';
+  $handler->display->display_options['filters']['field_location_location']['expose']['identifier'] = 'field_location_location';
+  $handler->display->display_options['filters']['field_location_location']['expose']['remember_roles'] = array(
     2 => '2',
     1 => 0,
     9 => 0,
@@ -1082,6 +1082,8 @@ function materio_administration_views_default_views() {
     6 => 0,
     5 => 0,
     8 => 0,
+    12 => 0,
+    13 => 0,
     3 => 0,
     4 => 0,
   );
@@ -1198,7 +1200,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
@@ -1234,7 +1236,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: Content: Adresse */
+  /* Field: Nœud: Adresse */
   $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
   $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1245,7 +1247,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Content: Phone */
+  /* Field: Nœud: Phone */
   $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
@@ -1267,21 +1269,21 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['translate']['field'] = 'translate';
   $handler->display->display_options['fields']['translate']['exclude'] = TRUE;
   $handler->display->display_options['fields']['translate']['not'] = 0;
-  /* Field: Content: website */
+  /* Field: Nœud: website */
   $handler->display->display_options['fields']['field_website']['id'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['table'] = 'field_data_field_website';
   $handler->display->display_options['fields']['field_website']['field'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['click_sort_column'] = 'url';
-  /* Field: Content: Email */
+  /* Field: Nœud: Email */
   $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
   $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
-  /* Field: Content: Note */
+  /* Field: Nœud: Note */
   $handler->display->display_options['fields']['field_note']['id'] = 'field_note';
   $handler->display->display_options['fields']['field_note']['table'] = 'field_data_field_note';
   $handler->display->display_options['fields']['field_note']['field'] = 'field_note';
-  /* Field: Content: Fichiers joints */
+  /* Field: Nœud: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
@@ -1356,7 +1358,7 @@ function materio_administration_views_default_views() {
     'looping_embed_video' => 'looping_embed_video',
   );
   $handler->display->display_options['filters']['type_2']['group'] = 1;
-  /* Filter criterion: Content: Adresse - Postal code */
+  /* Filter criterion: Nœud: Adresse - Postal code */
   $handler->display->display_options['filters']['field_public_address_postal_code']['id'] = 'field_public_address_postal_code';
   $handler->display->display_options['filters']['field_public_address_postal_code']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_postal_code']['field'] = 'field_public_address_postal_code';
@@ -1379,7 +1381,7 @@ function materio_administration_views_default_views() {
     3 => 0,
     4 => 0,
   );
-  /* Filter criterion: Content: Adresse - Locality (i.e. City) */
+  /* Filter criterion: Nœud: Adresse - Locality (i.e. City) */
   $handler->display->display_options['filters']['field_public_address_locality']['id'] = 'field_public_address_locality';
   $handler->display->display_options['filters']['field_public_address_locality']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_locality']['field'] = 'field_public_address_locality';
@@ -1433,7 +1435,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
   $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
@@ -1490,13 +1492,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Field: Content: Fichiers joints */
+  /* Field: Nœud: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Field: Content: Localisation */
+  /* Field: Nœud: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
@@ -1594,7 +1596,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
+  /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1741,7 +1743,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: Content */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'node';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_node';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
   $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
@@ -1765,7 +1767,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  /* Field: Content: Showroom */
+  /* Field: Nœud: Showroom */
   $handler->display->display_options['fields']['field_tode_showroom']['id'] = 'field_tode_showroom';
   $handler->display->display_options['fields']['field_tode_showroom']['table'] = 'field_data_field_tode_showroom';
   $handler->display->display_options['fields']['field_tode_showroom']['field'] = 'field_tode_showroom';
@@ -1781,16 +1783,16 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
-  /* Field: Content: Email */
+  /* Field: Nœud: Email */
   $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
   $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
-  /* Field: Content: Phone */
+  /* Field: Nœud: Phone */
   $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
-  /* Field: Content: Adresse */
+  /* Field: Nœud: Adresse */
   $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
   $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1801,7 +1803,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Content: Body */
+  /* Field: Nœud: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
   $handler->display->display_options['fields']['body']['field'] = 'body';
@@ -1959,6 +1961,7 @@ function materio_administration_views_default_views() {
     t('Title / Name contains'),
     t('Famille'),
     t('Référence'),
+    t('Samples'),
     t('Onto'),
     t('Tag libres'),
     t('Société'),
@@ -2238,7 +2241,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
   $handler->display->display_options['header']['result']['label'] = 'Résumé';
-  /* Relationship: User: Profile */
+  /* Relationship: User: Profil */
   $handler->display->display_options['relationships']['profile']['id'] = 'profile';
   $handler->display->display_options['relationships']['profile']['table'] = 'users';
   $handler->display->display_options['relationships']['profile']['field'] = 'profile';
@@ -2247,7 +2250,7 @@ function materio_administration_views_default_views() {
   );
   /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_user';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -2292,19 +2295,19 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profile: Title */
+  /* Field: Profil: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profile: First name */
+  /* Field: Profil: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profile: Name */
+  /* Field: Profil: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2334,18 +2337,18 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: User: Company */
+  /* Field: Utilisateur: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profile: Organization */
+  /* Field: Profil: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profile: service */
+  /* Field: Profil: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2354,7 +2357,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profile: Quality */
+  /* Field: Profil: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2363,7 +2366,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profile: SIRET */
+  /* Field: Profil: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2371,7 +2374,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profile: Employee */
+  /* Field: Profil: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2385,14 +2388,14 @@ function materio_administration_views_default_views() {
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profile: Website */
+  /* Field: Profil: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profile: Adresse */
+  /* Field: Profil: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2404,7 +2407,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Profile: Phone */
+  /* Field: Profil: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2484,7 +2487,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'users';
   $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = '0';
+  $handler->display->display_options['filters']['status']['value'] = 'All';
   $handler->display->display_options['filters']['status']['group'] = 1;
   $handler->display->display_options['filters']['status']['exposed'] = TRUE;
   $handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
@@ -2502,9 +2505,9 @@ print user_pass_reset_url($account);
     5 => 0,
     8 => 0,
     12 => 0,
+    13 => 0,
     3 => 0,
     4 => 0,
-    13 => 0,
   );
   /* Filter criterion: User: Roles */
   $handler->display->display_options['filters']['rid']['id'] = 'rid';
@@ -2543,7 +2546,7 @@ print user_pass_reset_url($account);
     13 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: User: Company (field_company) */
+  /* Filter criterion: Utilisateur: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2555,7 +2558,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profile: Organization (field_organization) */
+  /* Filter criterion: Profil: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -2691,7 +2694,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_user';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -2736,19 +2739,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profile: Title */
+  /* Field: Profil: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profile: First name */
+  /* Field: Profil: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profile: Name */
+  /* Field: Profil: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2774,18 +2777,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: User: Company */
+  /* Field: Utilisateur: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profile: Organization */
+  /* Field: Profil: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profile: service */
+  /* Field: Profil: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2794,7 +2797,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profile: Quality */
+  /* Field: Profil: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2803,7 +2806,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profile: SIRET */
+  /* Field: Profil: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2811,7 +2814,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profile: Employee */
+  /* Field: Profil: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2825,14 +2828,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profile: Website */
+  /* Field: Profil: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profile: Adresse */
+  /* Field: Profil: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2844,7 +2847,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profile: Phone */
+  /* Field: Profil: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2955,7 +2958,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: User: Company (field_company) */
+  /* Filter criterion: Utilisateur: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2967,7 +2970,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profile: Organization (field_organization) */
+  /* Filter criterion: Profil: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3079,7 +3082,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_user';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -3134,7 +3137,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: User: Company */
+  /* Field: Utilisateur: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
@@ -3269,7 +3272,7 @@ print user_pass_reset_url($account);
     13 => 0,
   );
   $handler->display->display_options['filters']['rid_1']['expose']['reduce'] = TRUE;
-  /* Filter criterion: User: Company (field_company) */
+  /* Filter criterion: Utilisateur: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3370,7 +3373,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_user';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -3415,19 +3418,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profile: Title */
+  /* Field: Profil: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profile: First name */
+  /* Field: Profil: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profile: Name */
+  /* Field: Profil: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3453,18 +3456,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: User: Company */
+  /* Field: Utilisateur: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profile: Organization */
+  /* Field: Profil: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profile: service */
+  /* Field: Profil: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3473,7 +3476,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profile: Quality */
+  /* Field: Profil: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3482,7 +3485,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profile: SIRET */
+  /* Field: Profil: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3490,7 +3493,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profile: Employee */
+  /* Field: Profil: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3504,14 +3507,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profile: Website */
+  /* Field: Profil: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profile: Adresse */
+  /* Field: Profil: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3523,7 +3526,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profile: Phone */
+  /* Field: Profil: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -3634,7 +3637,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: User: Company (field_company) */
+  /* Filter criterion: Utilisateur: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3646,7 +3649,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profile: Organization (field_organization) */
+  /* Filter criterion: Profil: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3757,7 +3760,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Bulk operations: User */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_user';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Utilisateur';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -3802,19 +3805,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profile: Title */
+  /* Field: Profil: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profile: First name */
+  /* Field: Profil: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profile: Name */
+  /* Field: Profil: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3840,18 +3843,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: User: Company */
+  /* Field: Utilisateur: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profile: Organization */
+  /* Field: Profil: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profile: service */
+  /* Field: Profil: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3860,7 +3863,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profile: Quality */
+  /* Field: Profil: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3869,7 +3872,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profile: SIRET */
+  /* Field: Profil: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3877,7 +3880,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profile: Employee */
+  /* Field: Profil: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3891,14 +3894,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profile: Website */
+  /* Field: Profil: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profile: Adresse */
+  /* Field: Profil: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3910,7 +3913,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profile: Phone */
+  /* Field: Profil: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -4012,7 +4015,7 @@ print user_pass_reset_url($account);
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
   $handler->display->display_options['filters']['rid']['reduce_duplicates'] = TRUE;
-  /* Filter criterion: User: Company (field_company) */
+  /* Filter criterion: Utilisateur: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -4024,7 +4027,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profile: Organization (field_organization) */
+  /* Filter criterion: Profil: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -4158,7 +4161,7 @@ print user_pass_reset_url($account);
     t('dernier »'),
     t('Résumé'),
     t('Displaying @start - @end of @total'),
-    t('Profile'),
+    t('Profil'),
     t('Utilisateur'),
     t('- Choose an operation -'),
     t('Title'),
@@ -4315,7 +4318,7 @@ print user_pass_reset_url($account);
   );
   /* Field: Bulk operations: Taxonomy term */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'taxonomy_term_data';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_taxonomy_term';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['label'] = 'Terme de taxonomie';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
@@ -4445,7 +4448,7 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Filter criterion: Taxonomy term: Nom (name_field) */
+  /* Filter criterion: Terme de taxonomie: Nom (name_field) */
   $handler->display->display_options['filters']['name_field_value']['id'] = 'name_field_value';
   $handler->display->display_options['filters']['name_field_value']['table'] = 'field_data_name_field';
   $handler->display->display_options['filters']['name_field_value']['field'] = 'name_field_value';
@@ -4556,7 +4559,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['style_plugin'] = 'table';
   /* Field: Bulk operations: Taxonomy term */
   $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
-  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'taxonomy_term_data';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'views_entity_taxonomy_term';
   $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
   $handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;

sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc

@@ -758,7 +758,6 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         0 => array(
           'vocabulary' => 'tag_libres',
           'parent' => 0,
-          'depth' => '',
         ),
       ),
       'entity_translation_sync' => FALSE,

sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc

@@ -2670,7 +2670,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_default',
-        'weight' => 16,
+        'weight' => 17,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
@@ -3298,7 +3298,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'text',
         'settings' => array(),
         'type' => 'text_plain',
-        'weight' => 17,
+        'weight' => 18,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
@@ -3454,7 +3454,7 @@ function materio_content_types_field_default_field_instances() {
         'track_list_order' => 1,
       ),
       'type' => 'term_reference_tree',
-      'weight' => 22,
+      'weight' => 24,
     ),
   );
 
@@ -3483,7 +3483,7 @@ function materio_content_types_field_default_field_instances() {
         'module' => 'computed_field',
         'settings' => array(),
         'type' => 'computed_field_plain',
-        'weight' => 18,
+        'weight' => 17,
       ),
       'cardmedium' => array(
         'label' => 'hidden',
@@ -3620,11 +3620,19 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
       'active' => 1,
       'module' => 'synonyms',
       'settings' => array(
-        'auto_creation' => 0,
+        'auto_creation' => 1,
+        'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
+        'content_taxonomy_autocomplete_new_terms' => 'deny',
+        'delimiter' => '',
+        'limit' => 10,
+        'min_length' => 0,
+        'not_found_message' => 'The term \'@term\' will be added.',
         'size' => 60,
-        'suggest_only_unique' => 0,
+        'sort' => 'weight',
+        'suggest_only_unique' => FALSE,
         'suggestion_size' => 10,
         'synonyms_autocomplete_path' => 'synonyms/autocomplete-taxonomy-term',
+        'use_synonyms' => 1,
       ),
       'type' => 'synonyms_autocomplete_taxonomy_term',
       'weight' => 23,

sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -1039,6 +1039,7 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1072,8 +1073,10 @@ function materio_content_types_user_default_permissions() {
     'name' => 'view field_company_distrib',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1085,8 +1088,10 @@ function materio_content_types_user_default_permissions() {
     'name' => 'view field_company_fab',
     'roles' => array(
       'Adhérent' => 'Adhérent',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1100,6 +1105,7 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1183,6 +1189,7 @@ function materio_content_types_user_default_permissions() {
   $permissions['view field_materiau_image'] = array(
     'name' => 'view field_materiau_image',
     'roles' => array(
+      'Unverified' => 'Unverified',
       'anonymous user' => 'anonymous user',
       'authenticated user' => 'authenticated user',
     ),
@@ -1198,6 +1205,7 @@ function materio_content_types_user_default_permissions() {
       'Premium' => 'Premium',
       'Student' => 'Student',
       'Translator' => 'Translator',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1218,6 +1226,7 @@ function materio_content_types_user_default_permissions() {
   $permissions['view field_nature_titre'] = array(
     'name' => 'view field_nature_titre',
     'roles' => array(
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'anonymous user' => 'anonymous user',
       'authenticated user' => 'authenticated user',
@@ -1255,6 +1264,7 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1281,6 +1291,7 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1296,6 +1307,7 @@ function materio_content_types_user_default_permissions() {
       'Premium' => 'Premium',
       'Student' => 'Student',
       'Translator' => 'Translator',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1351,6 +1363,7 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1408,7 +1421,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['view own field_company_distrib'] = array(
     'name' => 'view own field_company_distrib',
     'roles' => array(
-      'Admin showroom' => 'Admin showroom',
       'Translator' => 'Translator',
       'administrator' => 'administrator',
       'root' => 'root',
@@ -1666,6 +1678,7 @@ function materio_content_types_user_default_permissions() {
   $permissions['view title_field'] = array(
     'name' => 'view title_field',
     'roles' => array(
+      'Unverified' => 'Unverified',
       'anonymous user' => 'anonymous user',
       'authenticated user' => 'authenticated user',
     ),

sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc

@@ -635,10 +635,10 @@ function materio_content_types_field_group_info() {
       0 => 'group_base',
       1 => 'group_contact_ope',
       2 => 'group_fichiers',
-      3 => 'group_media',
-      4 => 'group_referencement',
-      5 => 'group_showroom',
-      6 => 'group_liens',
+      3 => 'group_liens',
+      4 => 'group_media',
+      5 => 'group_referencement',
+      6 => 'group_showroom',
     ),
     'format_type' => 'htabs',
     'format_settings' => array(

sites/all/modules/features/materio_content_types/materio_content_types.info

@@ -355,6 +355,21 @@ features[user_permission][] = view own field_weight
 features[user_permission][] = view own field_workflow_state
 features[user_permission][] = view own title_field
 features[user_permission][] = view title_field
+features[variable][] = diff_enable_revisions_page_node_breve
+features[variable][] = diff_enable_revisions_page_node_company
+features[variable][] = diff_enable_revisions_page_node_materiau
+features[variable][] = diff_enable_revisions_page_node_page
+features[variable][] = diff_enable_revisions_page_node_webform
+features[variable][] = diff_show_preview_changes_node_breve
+features[variable][] = diff_show_preview_changes_node_company
+features[variable][] = diff_show_preview_changes_node_materiau
+features[variable][] = diff_show_preview_changes_node_page
+features[variable][] = diff_show_preview_changes_node_webform
+features[variable][] = diff_view_mode_preview_node_breve
+features[variable][] = diff_view_mode_preview_node_company
+features[variable][] = diff_view_mode_preview_node_materiau
+features[variable][] = diff_view_mode_preview_node_page
+features[variable][] = diff_view_mode_preview_node_webform
 features[variable][] = field_bundle_settings_node__breve
 features[variable][] = field_bundle_settings_node__company
 features[variable][] = field_bundle_settings_node__materiau

sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc

@@ -10,6 +10,111 @@
 function materio_content_types_strongarm() {
   $export = array();
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_enable_revisions_page_node_breve';
+  $strongarm->value = 1;
+  $export['diff_enable_revisions_page_node_breve'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_enable_revisions_page_node_company';
+  $strongarm->value = 1;
+  $export['diff_enable_revisions_page_node_company'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_enable_revisions_page_node_materiau';
+  $strongarm->value = 1;
+  $export['diff_enable_revisions_page_node_materiau'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_enable_revisions_page_node_page';
+  $strongarm->value = 1;
+  $export['diff_enable_revisions_page_node_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_enable_revisions_page_node_webform';
+  $strongarm->value = 0;
+  $export['diff_enable_revisions_page_node_webform'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_show_preview_changes_node_breve';
+  $strongarm->value = 1;
+  $export['diff_show_preview_changes_node_breve'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_show_preview_changes_node_company';
+  $strongarm->value = 1;
+  $export['diff_show_preview_changes_node_company'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_show_preview_changes_node_materiau';
+  $strongarm->value = 1;
+  $export['diff_show_preview_changes_node_materiau'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_show_preview_changes_node_page';
+  $strongarm->value = 1;
+  $export['diff_show_preview_changes_node_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_show_preview_changes_node_webform';
+  $strongarm->value = 0;
+  $export['diff_show_preview_changes_node_webform'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_view_mode_preview_node_breve';
+  $strongarm->value = 'full';
+  $export['diff_view_mode_preview_node_breve'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_view_mode_preview_node_company';
+  $strongarm->value = 'full';
+  $export['diff_view_mode_preview_node_company'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_view_mode_preview_node_materiau';
+  $strongarm->value = 'full';
+  $export['diff_view_mode_preview_node_materiau'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_view_mode_preview_node_page';
+  $strongarm->value = 'full';
+  $export['diff_view_mode_preview_node_page'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'diff_view_mode_preview_node_webform';
+  $strongarm->value = 'full';
+  $export['diff_view_mode_preview_node_webform'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;

sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.user_permission.inc

@@ -42,6 +42,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_company'.
+  $permissions['create field_company'] = array(
+    'name' => 'create field_company',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_employee'.
   $permissions['create field_employee'] = array(
     'name' => 'create field_employee',
@@ -68,6 +78,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_memo'.
+  $permissions['create field_memo'] = array(
+    'name' => 'create field_memo',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_naf'.
   $permissions['create field_naf'] = array(
     'name' => 'create field_naf',
@@ -115,6 +135,7 @@ function materio_user_profiles_user_default_permissions() {
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
@@ -216,6 +237,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_company'.
+  $permissions['edit field_company'] = array(
+    'name' => 'edit field_company',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_employee'.
   $permissions['edit field_employee'] = array(
     'name' => 'edit field_employee',
@@ -236,6 +267,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_memo'.
+  $permissions['edit field_memo'] = array(
+    'name' => 'edit field_memo',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_naf'.
   $permissions['edit field_naf'] = array(
     'name' => 'edit field_naf',
@@ -359,6 +400,15 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_company'.
+  $permissions['edit own field_company'] = array(
+    'name' => 'edit own field_company',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_employee'.
   $permissions['edit own field_employee'] = array(
     'name' => 'edit own field_employee',
@@ -384,6 +434,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_memo'.
+  $permissions['edit own field_memo'] = array(
+    'name' => 'edit own field_memo',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_naf'.
   $permissions['edit own field_naf'] = array(
     'name' => 'edit own field_naf',
@@ -534,6 +594,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_company'.
+  $permissions['view field_company'] = array(
+    'name' => 'view field_company',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_employee'.
   $permissions['view field_employee'] = array(
     'name' => 'view field_employee',
@@ -554,6 +624,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_memo'.
+  $permissions['view field_memo'] = array(
+    'name' => 'view field_memo',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_naf'.
   $permissions['view field_naf'] = array(
     'name' => 'view field_naf',
@@ -685,6 +765,15 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_company'.
+  $permissions['view own field_company'] = array(
+    'name' => 'view own field_company',
+    'roles' => array(
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_employee'.
   $permissions['view own field_employee'] = array(
     'name' => 'view own field_employee',
@@ -710,6 +799,16 @@ function materio_user_profiles_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_memo'.
+  $permissions['view own field_memo'] = array(
+    'name' => 'view own field_memo',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_naf'.
   $permissions['view own field_naf'] = array(
     'name' => 'view own field_naf',
@@ -757,6 +856,7 @@ function materio_user_profiles_user_default_permissions() {
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'root' => 'root',
     ),
     'module' => 'field_permissions',

sites/all/modules/features/materio_user_profiles/materio_user_profiles.info

@@ -66,8 +66,10 @@ features[profile2_type][] = contact_operationnel
 features[user_permission][] = administer profile types
 features[user_permission][] = administer profiles
 features[user_permission][] = create field_adresse
+features[user_permission][] = create field_company
 features[user_permission][] = create field_employee
 features[user_permission][] = create field_first_name
+features[user_permission][] = create field_memo
 features[user_permission][] = create field_naf
 features[user_permission][] = create field_name
 features[user_permission][] = create field_organization
@@ -80,8 +82,10 @@ features[user_permission][] = create field_user_website
 features[user_permission][] = edit any adherent profile
 features[user_permission][] = edit any contact_operationnel profile
 features[user_permission][] = edit field_adresse
+features[user_permission][] = edit field_company
 features[user_permission][] = edit field_employee
 features[user_permission][] = edit field_first_name
+features[user_permission][] = edit field_memo
 features[user_permission][] = edit field_naf
 features[user_permission][] = edit field_name
 features[user_permission][] = edit field_organization
@@ -94,8 +98,10 @@ features[user_permission][] = edit field_user_website
 features[user_permission][] = edit own adherent profile
 features[user_permission][] = edit own contact_operationnel profile
 features[user_permission][] = edit own field_adresse
+features[user_permission][] = edit own field_company
 features[user_permission][] = edit own field_employee
 features[user_permission][] = edit own field_first_name
+features[user_permission][] = edit own field_memo
 features[user_permission][] = edit own field_naf
 features[user_permission][] = edit own field_name
 features[user_permission][] = edit own field_organization
@@ -108,8 +114,10 @@ features[user_permission][] = edit own field_user_website
 features[user_permission][] = view any adherent profile
 features[user_permission][] = view any contact_operationnel profile
 features[user_permission][] = view field_adresse
+features[user_permission][] = view field_company
 features[user_permission][] = view field_employee
 features[user_permission][] = view field_first_name
+features[user_permission][] = view field_memo
 features[user_permission][] = view field_naf
 features[user_permission][] = view field_name
 features[user_permission][] = view field_organization
@@ -122,8 +130,10 @@ features[user_permission][] = view field_user_website
 features[user_permission][] = view own adherent profile
 features[user_permission][] = view own contact_operationnel profile
 features[user_permission][] = view own field_adresse
+features[user_permission][] = view own field_company
 features[user_permission][] = view own field_employee
 features[user_permission][] = view own field_first_name
+features[user_permission][] = view own field_memo
 features[user_permission][] = view own field_naf
 features[user_permission][] = view own field_name
 features[user_permission][] = view own field_organization

sites/all/modules/features/showroom/showroom.features.field_instance.inc

@@ -114,7 +114,7 @@ function showroom_field_default_field_instances() {
         'module' => 'materio_showroom',
         'settings' => array(),
         'type' => 'materio_showroom_location_simple_text',
-        'weight' => 17,
+        'weight' => 16,
       ),
       'cardmedium' => array(
         'label' => 'above',

sites/all/modules/features/showroom/showroom.features.user_permission.inc

@@ -311,6 +311,7 @@ function showroom_user_default_permissions() {
       'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Unverified' => 'Unverified',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',