diff --git a/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml b/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml
new file mode 100644
index 0000000000..e1de66df5c
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/data/en_us.data.itop-flow-map.xml
@@ -0,0 +1,21 @@
+
+
+
+ http
+
+
+ https
+
+
+ ftp
+
+
+ sftp
+
+
+ AS2
+
+
+ X.400
+
+
\ No newline at end of file
diff --git a/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
new file mode 100644
index 0000000000..3e2862c4b7
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+ cmdbAbstractObject
+
+ bizmodel,searchable
+ false
+ flow
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ status='inactive'
+
+
+ status
+
+
+
+
+ org_id
+
+
+ false
+ Organization
+ DEL_MANUAL
+ all
+
+
+ source_id
+
+
+ false
+ FunctionalCI
+ DEL_MANUAL
+ all
+
+
+ source_id
+ name
+
+
+ destination_id
+
+
+ false
+ FunctionalCI
+ DEL_MANUAL
+ all
+
+
+ destination_id
+ name
+
+
+ flowtype_id
+
+
+ false
+ FlowType
+ DEL_MANUAL
+ all
+
+
+ flowtype_id
+ name
+
+
+ description
+
+ true
+ all
+
+
+ status
+
+
+ active
+ 10
+
+
+
+ inactive
+ 20
+
+
+
+ label
+ active
+ false
+ list
+ all
+
+
+
+
+
+
+ -
+ 10
+
+ -
+ 20
+
+ -
+ 30
+
+ -
+ 40
+
+
+
+
+
+ -
+ 10
+
+ -
+ 20
+
+ -
+ 30
+
+ -
+ 40
+
+
+
+
+
+ -
+
+
-
+ 10
+
+ -
+ 20
+
+ -
+ 30
+
+ -
+ 40
+
+ -
+ 50
+
+ -
+ 60
+
+
+ 10
+
+
+
+
+
+ -
+ 10
+
+ -
+ 20
+
+ -
+ 30
+
+ -
+ 40
+
+ -
+ 50
+
+
+
+
+
+ -
+ 10
+
+ -
+ 20
+
+
+
+
+
+
+
+
+ destination_id
+ both
+
+
+
+
+
+
+ Typology
+
+ bizmodel,searchable
+ false
+ flowtype
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ 10
+
+
+
+
+
+ -
+ 10
+
+
+
+
+
+ -
+ 10
+
+
+
+
+
+
+
+
+
+
+ id]]>
+ source_id]]>
+ both
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php b/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php
new file mode 100644
index 0000000000..3ed2606288
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php
@@ -0,0 +1,49 @@
+ 'Flow maps',
+ 'Relation:flow/DownStream' => 'Impacts flow...',
+ 'Relation:flow/UpStream' => 'Depends flow...',
+
+ 'Class:Flow' => 'Flow',
+ 'Class:Flow+' => 'For application flow for example',
+ 'Class:Flow/Name' =>'%1$s %2$s %3$s',
+ 'Class:Flow/Attribute:source_id' => 'Source',
+ 'Class:Flow/Attribute:source_id+' => 'Source Ci of the flow',
+ 'Class:Flow/Attribute:source_name' => 'Source name',
+ 'Class:Flow/Attribute:source_name+' => 'Name of the source Ci of the flow',
+ 'Class:Flow/Attribute:destination_id' => 'Destination',
+ 'Class:Flow/Attribute:destination_id+' => 'Destination Ci for the flow',
+ 'Class:Flow/Attribute:destination_name' => 'Destination name',
+ 'Class:Flow/Attribute:destination_name+' => 'Name of the destination CI for the flow',
+ 'Class:Flow/Attribute:type_id' => 'Flow type',
+ 'Class:Flow/Attribute:type_id+' => 'Flow type such as : http, https, ftp..., will appear in the friendlyname',
+ 'Class:Flow/Attribute:description' => 'Description',
+ 'Class:Flow/Attribute:description+' => 'Flow description, will appear in the summary card',
+ 'Class:Flow/Attribute:source_id_friendlyname' => 'source_id_friendlyname',
+ 'Class:Flow/Attribute:source_id_friendlyname+' => 'Full name',
+ 'Class:Flow/Attribute:source_id_finalclass_recall' => 'source_id->CI sub-class',
+ 'Class:Flow/Attribute:source_id_finalclass_recall+' => 'Name of the final class',
+ 'Class:Flow/Attribute:source_id_obsolescence_flag' => 'source_id->Obsolete',
+ 'Class:Flow/Attribute:source_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
+ 'Class:Flow/Attribute:destination_id_friendlyname' => 'destination_id_friendlyname',
+ 'Class:Flow/Attribute:destination_id_friendlyname+' => 'Full name',
+ 'Class:Flow/Attribute:destination_id_finalclass_recall' => 'destination_id->CI sub-class',
+ 'Class:Flow/Attribute:destination_id_finalclass_recall+' => 'Name of the final class',
+ 'Class:Flow/Attribute:destination_id_obsolescence_flag' => 'destination_id->Obsolete',
+ 'Class:Flow/Attribute:destination_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
+ 'Class:Flow/Attribute:status' => 'Status',
+ 'Class:Flow/Attribute:status+' => '',
+ 'Class:Flow/Attribute:status/Value:active' => 'Active',
+ 'Class:Flow/Attribute:status/Value:inactive' => 'Inactive',
+ 'Class:Flow/Attribute:org_id' => 'Organization',
+ 'Class:Flow/Attribute:org_id+' => '',
+));
+?>
diff --git a/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php b/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php
new file mode 100644
index 0000000000..0a289b85cb
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php
@@ -0,0 +1,50 @@
+ 'Carte des fluxs',
+ 'Relation:flow/DownStream' => 'Impacte flux...',
+ 'Relation:flow/UpStream' => 'Dépend de flux...',
+
+ 'Class:Flow' => 'Flux',
+ 'Class:Flow+' => 'Pour les fluxs applicatifs par exemple',
+ 'Class:Flow/Name' =>'%1$s %2$s %3$s',
+ 'Class:Flow/Attribute:source_id' => 'Source',
+ 'Class:Flow/Attribute:source_id+' => 'Ci source du flux',
+ 'Class:Flow/Attribute:source_name' => 'Nom de la source ',
+ 'Class:Flow/Attribute:source_name+' => 'Nom du CI à la source du flux',
+ 'Class:Flow/Attribute:destination_id' => 'Destination',
+ 'Class:Flow/Attribute:destination_id+' => 'Ci destinataire du flux',
+ 'Class:Flow/Attribute:destination_name' => 'Nom du destinataire',
+ 'Class:Flow/Attribute:destination_name+' => 'Nom du Ci destinataire du flux',
+ 'Class:Flow/Attribute:type_id' => 'Type de flux',
+ 'Class:Flow/Attribute:type_id+' => 'Type de flux : http, https, ftp..., apparaitra dans le nom commun',
+ 'Class:Flow/Attribute:description' => 'Description',
+ 'Class:Flow/Attribute:description+' => 'Description du flux, apparaitra dans les informations résumées ',
+ 'Class:Flow/Attribute:source_id_friendlyname' => 'source_id_friendlyname',
+ 'Class:Flow/Attribute:source_id_friendlyname+' => 'Nom complet',
+ 'Class:Flow/Attribute:source_id_finalclass_recall' => 'source_id->CI sub-class',
+ 'Class:Flow/Attribute:source_id_finalclass_recall+' => 'Classe finale',
+ 'Class:Flow/Attribute:source_id_obsolescence_flag' => 'source_id->Obsolete',
+ 'Class:Flow/Attribute:source_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
+ 'Class:Flow/Attribute:destination_id_friendlyname' => 'destination_id_friendlyname',
+ 'Class:Flow/Attribute:destination_id_friendlyname+' => 'Nom complet',
+ 'Class:Flow/Attribute:destination_id_finalclass_recall' => 'destination_id->CI sub-class',
+ 'Class:Flow/Attribute:destination_id_finalclass_recall+' => 'Classe finale',
+ 'Class:Flow/Attribute:destination_id_obsolescence_flag' => 'destination_id->Obsolete',
+ 'Class:Flow/Attribute:destination_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
+ 'Class:Flow/Attribute:status' => 'Etat',
+ 'Class:Flow/Attribute:status+' => '',
+ 'Class:Flow/Attribute:status/Value:active' => 'Actif',
+ 'Class:Flow/Attribute:status/Value:inactive' => 'Inactif',
+ 'Class:Flow/Attribute:org_id' => 'Organisation',
+ 'Class:Flow/Attribute:org_id+' => '',
+
+));
+?>
diff --git a/datamodels/2.x/itop-flow-map/images/icons8-sorting-arrows-horizontal.svg b/datamodels/2.x/itop-flow-map/images/icons8-sorting-arrows-horizontal.svg
new file mode 100644
index 0000000000..6cee6f7a06
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/images/icons8-sorting-arrows-horizontal.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/datamodels/2.x/itop-flow-map/model.itop-flow-map.php b/datamodels/2.x/itop-flow-map/model.itop-flow-map.php
new file mode 100644
index 0000000000..ccc1b539e8
--- /dev/null
+++ b/datamodels/2.x/itop-flow-map/model.itop-flow-map.php
@@ -0,0 +1,17 @@
+ 'Add flow map in iTop',
+ 'category' => 'business',
+
+ // Setup
+ //
+ 'dependencies' => array(
+ 'itop-config-mgmt/3.2.0'
+ ),
+ 'mandatory' => false,
+ 'visible' => true,
+
+ // Components
+ //
+ 'datamodel' => array(
+ 'vendor/autoload.php',
+ 'model.itop-flow-map.php', // Contains the PHP code generated by the "compilation" of datamodel.Combodo-flow-map.xml
+ ),
+ 'webservice' => array(
+
+ ),
+ 'data.struct' => array(
+ 'data/en_us.data.itop-flow-map.xml',
+ ),
+ 'data.sample' => array(
+ // add your sample data XML files here,
+ ),
+
+ // Documentation
+ //
+ 'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+ 'doc.more_information' => '', // hyperlink to more information, if any
+
+ // Default settings
+ //
+ 'settings' => array(
+ // Module specific settings go here, if any
+ ),
+ )
+);
+
+
+?>