From c18751d9ce6ade012e58f8175f53d92401facf1c Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 31 Mar 2026 10:53:43 +0200 Subject: [PATCH 01/59] Add Organization, deprecate Enterprise --- agent.uml | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 213 insertions(+) diff --git a/agent.uml b/agent.uml index 7366896..7b3ce90 100644 --- a/agent.uml +++ b/agent.uml @@ -284,6 +284,9 @@ + + Deprecated. Replaced by IOrganization (ontology version 2). + @@ -429,6 +432,9 @@ + + Deprecated. Replaced by Organization (ontology version 2). + @@ -640,6 +646,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -823,4 +988,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 180e0dacc4384c65ff5e724071046b72a41ba0e0 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 31 Mar 2026 11:39:06 +0200 Subject: [PATCH 02/59] Constraint 1:1 for Stock:availabilityDate --- sale.uml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sale.uml b/sale.uml index 0fed073..f7e20df 100644 --- a/sale.uml +++ b/sale.uml @@ -915,7 +915,7 @@ - + @@ -1303,7 +1303,7 @@ - + @@ -1349,7 +1349,7 @@ - + From 954578ce0d5855730222584f81a71cc8ce73ffcc Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 31 Mar 2026 11:45:09 +0200 Subject: [PATCH 03/59] Constraint 1:1 for PaymentMethod:paymentMethodProvider and PaymentMethod:paymentMethodType --- sale.uml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sale.uml b/sale.uml index f7e20df..85e47f7 100644 --- a/sale.uml +++ b/sale.uml @@ -1562,12 +1562,12 @@ - + - + @@ -1586,12 +1586,12 @@ - + - + From 8c959b679a58f3a3981f03e56cc6eebfcc655b5c Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 31 Mar 2026 13:49:57 +0200 Subject: [PATCH 04/59] Add Catalog begin and end date. Change Ellapsable datatype to DateTime. --- common.uml | 17 +++++++---------- sale.uml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/common.uml b/common.uml index f7bd457..6d6f2a4 100644 --- a/common.uml +++ b/common.uml @@ -91,25 +91,22 @@ + - - + + - - + + - - - + - - - + diff --git a/sale.uml b/sale.uml index 85e47f7..e251327 100644 --- a/sale.uml +++ b/sale.uml @@ -295,7 +295,13 @@ + + + + + + @@ -552,11 +558,16 @@ + + + - + + - + + @@ -568,10 +579,12 @@ - + + - + + @@ -686,6 +699,9 @@ + + + @@ -695,6 +711,14 @@ + + + + + + + + @@ -706,6 +730,14 @@ + + + + + + + + @@ -2416,4 +2448,16 @@ + + + + + + + + + + + + From 04a426c8a3118f6a1352bcc66ebbb98df08ab326 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 2 Apr 2026 14:37:55 +0200 Subject: [PATCH 05/59] Add Vevent and ValueRecur classes --- common.uml | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/common.uml b/common.uml index 6d6f2a4..309f019 100644 --- a/common.uml +++ b/common.uml @@ -513,6 +513,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -662,4 +799,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4e40ecd220c9f416482cd538bb9bed275ce36e04 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 10:11:37 +0200 Subject: [PATCH 06/59] Add Datable, IProductOptionValue, ProductOptionValue --- common.uml | 10 ++++++++++ product.uml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/common.uml b/common.uml index 309f019..878d011 100644 --- a/common.uml +++ b/common.uml @@ -650,6 +650,14 @@ + + + + + + + + @@ -845,4 +853,6 @@ + + diff --git a/product.uml b/product.uml index 96feda6..6a926c3 100644 --- a/product.uml +++ b/product.uml @@ -1835,6 +1835,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2338,4 +2374,20 @@ + + + + + + + + + + + + + + + + From 9f693c64c75b1b987e0972afbf1b0a5799b49e23 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 10:28:58 +0200 Subject: [PATCH 07/59] Add ProductOption, add missing ProductOptionValue constructor --- product.uml | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/product.uml b/product.uml index 6a926c3..22a887d 100644 --- a/product.uml +++ b/product.uml @@ -1870,6 +1870,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2390,4 +2481,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 76dbdeac04281ddfd51ccdb39f78ac458bca00a5 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 10:48:51 +0200 Subject: [PATCH 08/59] Add VariantCharacteristic --- product.uml | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/product.uml b/product.uml index 22a887d..3e51af1 100644 --- a/product.uml +++ b/product.uml @@ -1895,6 +1895,7 @@ + @@ -1962,6 +1963,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2514,4 +2609,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 0b64a708455c09269d36ba743b9dfe134b2d00a0 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 11:17:29 +0200 Subject: [PATCH 09/59] Add Variant --- product.uml | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/product.uml b/product.uml index 3e51af1..6fb3e19 100644 --- a/product.uml +++ b/product.uml @@ -2057,6 +2057,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2643,4 +2753,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From df92e9985b057a356745381b9cf043a7e31b38ac Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 11:27:55 +0200 Subject: [PATCH 10/59] Move isVariantOf to Variant --- product.uml | 76 +++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/product.uml b/product.uml index 6fb3e19..f01cfeb 100644 --- a/product.uml +++ b/product.uml @@ -242,24 +242,6 @@ - - - - - - - - - - - - - - - - - - @@ -406,10 +388,6 @@ - - - - @@ -493,10 +471,6 @@ - - - - @@ -2078,7 +2052,13 @@ + + + + + + @@ -2167,6 +2147,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -2396,13 +2398,13 @@ - - - - - - - + + + + + + + @@ -2801,5 +2803,11 @@ - + + + + + + + From 57d7970ad21e7251d30d5e05192039b4c282c7bc Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 7 Apr 2026 12:18:33 +0200 Subject: [PATCH 11/59] Add TemplateSaleSession, add SaleSession missing hosting places --- agent.uml | 49 +++++++++++++++++ sale.uml | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 203 insertions(+), 1 deletion(-) diff --git a/agent.uml b/agent.uml index 7b3ce90..551a71d 100644 --- a/agent.uml +++ b/agent.uml @@ -670,6 +670,9 @@ + + + @@ -707,6 +710,11 @@ + + + + + @@ -763,6 +771,11 @@ + + + + + @@ -785,6 +798,9 @@ + + + @@ -804,6 +820,32 @@ + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + @@ -1036,4 +1078,11 @@ + + + + + + + diff --git a/sale.uml b/sale.uml index e251327..0eadc58 100644 --- a/sale.uml +++ b/sale.uml @@ -196,9 +196,14 @@ + + + + + @@ -221,6 +226,18 @@ + + + + + + + + + + + + @@ -561,6 +578,7 @@ + @@ -576,6 +594,10 @@ + + + + @@ -593,6 +615,10 @@ + + + + @@ -1834,6 +1860,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1927,7 +2049,7 @@ - + @@ -2460,4 +2582,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d2c11891975ff4f98a53cbcbc3824c2db4de4c1e Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Sat, 11 Apr 2026 15:53:40 +0200 Subject: [PATCH 12/59] Add the Certification class with its data properties Add isCertifiedBy object property to Organization class. --- agent.uml | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) diff --git a/agent.uml b/agent.uml index 551a71d..79fa89b 100644 --- a/agent.uml +++ b/agent.uml @@ -673,6 +673,7 @@ + @@ -715,6 +716,10 @@ + + + + @@ -801,6 +806,7 @@ + @@ -836,6 +842,7 @@ + @@ -846,6 +853,187 @@ + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + + + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + + + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + + + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1085,4 +1273,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 110b5f2d9928d50f9d7fc66423322edf1741ed40 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 10:44:38 +0200 Subject: [PATCH 13/59] Add GeoJSON interfaces - Features - Properties - Geometry - Point - Polygon --- sale.uml | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/sale.uml b/sale.uml index 0eadc58..a06f7d8 100644 --- a/sale.uml +++ b/sale.uml @@ -1956,6 +1956,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2613,4 +2674,12 @@ + + + + + + + + From c4d7fd43584101268272b47610307124d5e05867 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 11:26:20 +0200 Subject: [PATCH 14/59] Add interfaces Step, Shipment, Route --- sale.uml | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/sale.uml b/sale.uml index a06f7d8..eccd7f2 100644 --- a/sale.uml +++ b/sale.uml @@ -774,6 +774,12 @@ + + + + + + @@ -2017,6 +2023,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2682,4 +2858,24 @@ + + + + + + + + + + + + + + + + + + + + From dc29803998a3e68c7db8ee20b2184634a84b2759 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 11:31:45 +0200 Subject: [PATCH 15/59] Add GeoJSON feature to interfaces PhysicalPlace and Route --- sale.uml | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/sale.uml b/sale.uml index eccd7f2..ca226d5 100644 --- a/sale.uml +++ b/sale.uml @@ -853,6 +853,7 @@ + @@ -953,6 +954,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2030,6 +2055,8 @@ + + @@ -2154,6 +2181,8 @@ + + @@ -2184,6 +2213,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2878,4 +2931,12 @@ + + + + + + + + From 20a528a872ad0d3d276a0e8522ff37293e2df8f2 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 11:36:57 +0200 Subject: [PATCH 16/59] Add feature to class PhysicalPlace --- sale.uml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sale.uml b/sale.uml index ca226d5..c076ad8 100644 --- a/sale.uml +++ b/sale.uml @@ -1554,6 +1554,7 @@ + @@ -1592,6 +1593,10 @@ + + + + @@ -1634,6 +1639,10 @@ + + + + @@ -2939,4 +2948,7 @@ + + + From 41c335587d80dfbd5fee327f02c2ac4bc58ae387 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 12:12:45 +0200 Subject: [PATCH 17/59] Add class Route --- sale.uml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/sale.uml b/sale.uml index c076ad8..46cc5f3 100644 --- a/sale.uml +++ b/sale.uml @@ -2255,6 +2255,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2951,4 +2989,25 @@ + + + + + + + + + + + + + + + + + + + + + From c0a0fa5dba6388f8b2951854be257eee8724cc7d Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 12:21:53 +0200 Subject: [PATCH 18/59] Add classes Step, DeliveryStep and PickUpStep --- sale.uml | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/sale.uml b/sale.uml index 46cc5f3..3b7237c 100644 --- a/sale.uml +++ b/sale.uml @@ -2293,6 +2293,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3010,4 +3100,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d9fa2684abfcb8658229226d5743d2b9dd06c965 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 12:26:39 +0200 Subject: [PATCH 19/59] Fix Step routes properties --- sale.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale.uml b/sale.uml index 3b7237c..6426181 100644 --- a/sale.uml +++ b/sale.uml @@ -3111,8 +3111,8 @@ - - + + From deb08a7c0af269eef241a2ef574e8b45384a83a2 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 12:36:55 +0200 Subject: [PATCH 20/59] Fix Step constructors --- sale.uml | 86 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 12 deletions(-) diff --git a/sale.uml b/sale.uml index 6426181..f8cb2f1 100644 --- a/sale.uml +++ b/sale.uml @@ -2296,7 +2296,7 @@ - + @@ -2307,10 +2307,20 @@ - + + + + + + + + + + + @@ -2325,16 +2335,28 @@ - + + + + + + + + + + + + + - + @@ -2351,17 +2373,29 @@ - + + + + + + + + + + + + + - + @@ -2377,9 +2411,21 @@ - - - + + + + + + + + + + + + + + + @@ -3113,8 +3159,8 @@ - - + + @@ -3145,5 +3191,21 @@ - + + + + + + + + + + + + + + + + + From b846dc7c264ab586c0be62a47538bea206a0b686 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 15:05:28 +0200 Subject: [PATCH 21/59] Add customer category membership --- agent.uml | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/agent.uml b/agent.uml index 79fa89b..0db3a3e 100644 --- a/agent.uml +++ b/agent.uml @@ -266,6 +266,7 @@ + @@ -282,6 +283,28 @@ + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + @@ -337,10 +360,33 @@ + + + + + The localization to add like an `Address`. + + + + + + + + + + + + + + + + + + @@ -397,6 +443,10 @@ + + + + @@ -429,6 +479,10 @@ + + + + @@ -560,6 +614,7 @@ + @@ -596,18 +651,31 @@ + + + + + + + + + + + + + @@ -781,6 +849,10 @@ + + + + @@ -1309,4 +1381,22 @@ + + + + + + + + + + + + + + + + + + From af9079a56da7e2a5d217a21da8135a2095c08c6b Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 19:19:28 +0200 Subject: [PATCH 22/59] Add referenceProductOptions --- CHANGELOG.md | 7 ++++ SUPPORTED.md | 110 +++++++++++++++++++++++++++++++-------------------- product.uml | 60 ++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8f0efe..df7a7ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 TODO: - Create top classes `Subject` and `Relation` to be generalized by all DFC subjects and relations. +## [4.0.0] + +### Added + +- `SuppliedProduct:constructor` variants parameter +- `TechnicalProduct:constructor` variants parameter + ## [3.1.0] - 2025-06-26 Add logistic concepts: diff --git a/SUPPORTED.md b/SUPPORTED.md index c5a2006..1f9666c 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -97,6 +97,7 @@ Here is a list of the DFC features that the model currently supports. - [x] description - [ ] date - [ ] definedBy + - [x] hasMember - `DeliveryOption` - [x] name - [x] description @@ -111,52 +112,30 @@ Here is a list of the DFC features that the model currently supports. - [x] endDate - [x] fee - [x] selectedBy -- `Enterprise` - - [ ] name - - [x] description - - [ ] date - - [x] hasAddress - - [x] hasPhoneNumber - - [x] hasSocialMedia - - [x] logo - - [ ] orders - - [ ] requests - - [ ] owns - - [x] email - - [x] websitePage - - [x] VATnumber - - [x] defines - - [x] hasMainContact - - [x] supplies - - [x] manages - - [x] proposes - - [ ] transforms - - [x] maintains - - [ ] affiliates - - [ ] coordinatedBy +- `Enterprise` (deprecated, see Organization) - `FunctionalProduct` - - [x] name - - [x] description + - [ ] name + - [ ] description - [ ] date - - [x] hasType - - [x] hasQuantity - - [x] alcoholPercentage - - [x] lifetime - - [x] hasClaim - - [x] usageOrStorageConditions - - [x] hasAllergenCharacteristic - - [x] hasNutrientCharacteristic - - [x] hasPhysicalCharacteristic - - [x] hasGeographicalOrigin - - [x] hasCertifications - - [x] hasNatureOrigin - - [x] hasPartOrigin + - [ ] hasType + - [ ] hasQuantity + - [ ] alcoholPercentage + - [ ] lifetime + - [ ] hasClaim + - [ ] usageOrStorageConditions + - [ ] hasAllergenCharacteristic + - [ ] hasNutrientCharacteristic + - [ ] hasPhysicalCharacteristic + - [ ] hasGeographicalOrigin + - [ ] hasCertifications + - [ ] hasNatureOrigin + - [ ] hasPartOrigin - [ ] hasBrand - [ ] hasProcess - - [x] hasVariant - - [x] isVariantOf - - [x] image - - [x] referencedBy + - [ ] hasVariant + - [ ] isVariantOf + - [ ] image + - [ ] referencedBy - [ ] consumedBy - [ ] referenceOf - [ ] requestedBy @@ -201,6 +180,32 @@ Here is a list of the DFC features that the model currently supports. - [x] hasPrice - [x] concerns - [x] partOf +- `Organization` + - [ ] name + - [x] description + - [ ] date + - [x] hasAddress + - [x] hasPhoneNumber + - [x] hasSocialMedia + - [x] hasTemplateSaleSession + - [x] isCertifiedBy + - [x] isMemberOf + - [x] logo + - [ ] orders + - [ ] requests + - [ ] owns + - [x] email + - [x] websitePage + - [x] VATnumber + - [x] defines + - [x] hasMainContact + - [x] supplies + - [x] manages + - [x] proposes + - [ ] transforms + - [x] maintains + - [ ] affiliates + - [ ] coordinatedBy - `PaymentMethod` - [x] name - [x] description @@ -216,6 +221,7 @@ Here is a list of the DFC features that the model currently supports. - [x] hasAddress - [x] hasPhoneNumber - [x] hasSocialMedia + - [x] isMemberOf - [x] logo - [ ] orders - [ ] requests @@ -237,6 +243,7 @@ Here is a list of the DFC features that the model currently supports. - [ ] date - [x] hosts - [x] hasAddress + - [x] hasGeoJsonFeature - [x] hasPhoneNumber - [x] hasMainContact - `PhysicalProduct` @@ -282,10 +289,16 @@ Here is a list of the DFC features that the model currently supports. - [x] isStoredIn - [x] identifies - [x] constitutes +- `Route` + - [x] description + - [x] hasGeoJsonFeature + - [x] hasStep + - [x] name - `SaleSession` - [ ] date - [x] beginDate - [x] endDate + - [x] hostedAt - [x] quantity - [x] lists - `Shipment` @@ -318,6 +331,7 @@ Here is a list of the DFC features that the model currently supports. - [x] hasCertifications - [x] hasNatureOrigin - [x] hasPartOrigin + - [x] hasReferenceProductOption - [ ] hasBrand - [ ] hasProcess - [x] hasVariant @@ -345,6 +359,7 @@ Here is a list of the DFC features that the model currently supports. - [x] hasCertifications - [x] hasNatureOrigin - [x] hasPartOrigin + - [x] hasReferenceProductOption - [ ] hasBrand - [ ] hasProcess - [x] hasVariant @@ -355,6 +370,9 @@ Here is a list of the DFC features that the model currently supports. - [ ] referenceOf - [ ] satisfies - [ ] industrializedBy +- `TemplateSaleSession` + - [x] isTemplateSaleSessionOf + - [x] hostedAt - `TheoreticalStock` - [ ] date - [x] availabilityDate @@ -370,6 +388,12 @@ Here is a list of the DFC features that the model currently supports. - [ ] from - [ ] to - [ ] concerns +- `VariantCharacteristic` + - [x] name + - [x] description + - [ ] date + - [x] hasProductOption + - [x] hasProductOptionValue - `Vehicle` - [ ] name - [ ] description @@ -386,4 +410,4 @@ Here is a list of the DFC features that the model currently supports. - [ ] date - [x] hosts - [x] URL - - [ ] websitePage \ No newline at end of file + - [ ] websitePage diff --git a/product.uml b/product.uml index f01cfeb..e4ef84a 100644 --- a/product.uml +++ b/product.uml @@ -158,6 +158,7 @@ + @@ -242,6 +243,24 @@ + + + + + + + + + + + + + + + + + + @@ -311,6 +330,7 @@ + @@ -388,6 +408,10 @@ + + + + @@ -471,6 +495,10 @@ + + + + @@ -494,6 +522,8 @@ + + @@ -591,6 +621,14 @@ + + + + + + + + @@ -619,6 +657,9 @@ + + + @@ -694,6 +735,14 @@ + + + + + + + + @@ -2810,4 +2859,15 @@ + + + + + + + + + + + From a062998e31fa48fc962927253eae323ec5f51483 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 19:40:15 +0200 Subject: [PATCH 23/59] Add Variant:variantCharacteristics --- product.uml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/product.uml b/product.uml index e4ef84a..e163728 100644 --- a/product.uml +++ b/product.uml @@ -2102,11 +2102,16 @@ + + + + + @@ -2194,10 +2199,15 @@ + + + + + @@ -2217,6 +2227,24 @@ + + + + + + + + + + + + + + + + + + @@ -2870,4 +2898,11 @@ + + + + + + + From 28f494529294d4bcaae0d3003270247d958b3f55 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 19:42:45 +0200 Subject: [PATCH 24/59] Fix Variant:variantCharacteristics bindings --- product.uml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product.uml b/product.uml index e163728..c8d76ed 100644 --- a/product.uml +++ b/product.uml @@ -2902,7 +2902,7 @@ - + From f72afcce782f04b73e215de2f5685089f08ba77b Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 19:46:22 +0200 Subject: [PATCH 25/59] Add referenceProductOptions to Variant constructor --- product.uml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/product.uml b/product.uml index c8d76ed..7b49e04 100644 --- a/product.uml +++ b/product.uml @@ -2103,6 +2103,7 @@ + @@ -2203,6 +2204,10 @@ + + + + @@ -2905,4 +2910,5 @@ + From d9fd1c032300179cfc586344bcbddbd9b7f6c586 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 16 Apr 2026 19:59:51 +0200 Subject: [PATCH 26/59] Complete SUPPORTED.md --- SUPPORTED.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/SUPPORTED.md b/SUPPORTED.md index 1f9666c..15a73ba 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -87,6 +87,11 @@ Here is a list of the DFC features that the model currently supports. - [x] offeredThrough - [x] listedIn - [ ] managedBy +- `Certification` + - [x] certiferReference + - [x] certificationScore + - [x] certifies + - [x] operatorId - `Coordination` - [ ] date - [ ] coordinates @@ -282,6 +287,11 @@ Here is a list of the DFC features that the model currently supports. - [x] bestBeforeDate - [x] expirationDate - [x] productionDate +- `ProductOption` + - [x] name + - [x] description + - [x] date + - [x] hasReferenceProductOptionValue - `RealStock` - [ ] date - [x] availabilityDate @@ -314,6 +324,17 @@ Here is a list of the DFC features that the model currently supports. - [ ] description - [ ] date - [x] URL +- `Step` + - [x] arrivalDate + - [ ] date + - [x] delivery + - [x] description + - [x] duration + - [x] isStepOf + - [x] name + - [x] pickUp + - [ ] usedInRoute + - [ ] useVehicle - `SuppliedProduct` - [x] name - [x] description @@ -388,6 +409,29 @@ Here is a list of the DFC features that the model currently supports. - [ ] from - [ ] to - [ ] concerns +- `Variant` + - [x] name + - [x] description + - [ ] date + - [x] hasType + - [x] hasQuantity + - [x] alcoholPercentage + - [x] lifetime + - [x] hasClaim + - [x] usageOrStorageConditions + - [x] hasAllergenCharacteristic + - [x] hasNutrientCharacteristic + - [x] hasPhysicalCharacteristic + - [x] hasGeographicalOrigin + - [x] hasCertifications + - [x] hasNatureOrigin + - [x] hasPartOrigin + - [x] hasReferenceProductOption + - [x] hasVariant + - [x] hasVariantCaracteristic (with typo) + - [x] isVariantOf + - [x] image + - [x] referencedBy - `VariantCharacteristic` - [x] name - [x] description From a3aef38c90532af627b1c17e344c093d8a90ff6e Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Mon, 20 Apr 2026 20:05:35 +0200 Subject: [PATCH 27/59] Fix Certification --- agent.uml | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/agent.uml b/agent.uml index 0db3a3e..e673ffd 100644 --- a/agent.uml +++ b/agent.uml @@ -1087,23 +1087,42 @@ - + + + + + + + + + + + + - - + + + + + + + + + + @@ -1399,4 +1418,16 @@ + + + + + + + + + + + + From 339ca15d3d29639ea3abdf995f01638fabb30070 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 28 Apr 2026 12:05:30 +0200 Subject: [PATCH 28/59] Removed Enterprise --- CHANGELOG.md | 15 ++++ SUPPORTED.md | 1 - agent.uml | 245 +++++++++------------------------------------------ sale.uml | 12 +-- 4 files changed, 61 insertions(+), 212 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df7a7ac..1c71edd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,11 +12,26 @@ TODO: ## [4.0.0] +This major version implements the ontology version 2 changes. It introduces several breaking changes. + ### Added - `SuppliedProduct:constructor` variants parameter - `TechnicalProduct:constructor` variants parameter +### Changed + +- Domain : isVariantOf, DefinedProduct -> Variant (**BREAKING CHANGE**) +- Constraint 1:1 for Stock:availabilityDate (**BREAKING CHANGE**) +- Constraint 1:1 for PaymentMethod:paymentMethodProvider (**BREAKING CHANGE**) +- Constraint 1:1 for PaymentMethod:paymentMethodType (**BREAKING CHANGE**) +- Domain : beginDate, (AsPlannedLocalTransformation | AsRealizedTransformation | SaleSession | Shipment | Shipping option) -> (AsPlannedTransformation | AsRealizedTransformation | Catalog | SaleSession | Shipment | Shipping option) +- Domain : endDate, (AsPlannedLocalTransformation | AsRealizedTransformation | SaleSession | Shipment | Shipping option) -> (AsPlannedTransformation | AsRealizedTransformation | Catalog | SaleSession | Shipment | Shipping option) + +### Removed + +- The `Enterprise` class has been replaced by `Organization` (**BREAKING CHANGE**). + ## [3.1.0] - 2025-06-26 Add logistic concepts: diff --git a/SUPPORTED.md b/SUPPORTED.md index 15a73ba..99d83a5 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -117,7 +117,6 @@ Here is a list of the DFC features that the model currently supports. - [x] endDate - [x] fee - [x] selectedBy -- `Enterprise` (deprecated, see Organization) - `FunctionalProduct` - [ ] name - [ ] description diff --git a/agent.uml b/agent.uml index e673ffd..e863b1b 100644 --- a/agent.uml +++ b/agent.uml @@ -198,18 +198,18 @@ - + - + - + - + @@ -306,49 +306,6 @@ - - - Deprecated. Replaced by IOrganization (ontology version 2). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -485,131 +442,9 @@ - - - Deprecated. Replaced by Organization (ontology version 2). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -622,7 +457,7 @@ - + @@ -643,7 +478,7 @@ - + @@ -788,7 +623,7 @@ - + @@ -1168,27 +1003,27 @@ - + - + - - + + - - + + - - + + @@ -1202,47 +1037,47 @@ - + - - + + - + - + - - - - - + + + + + - + - - - + + + - - + + - + @@ -1268,9 +1103,9 @@ - - - + + + @@ -1291,19 +1126,19 @@ - + - - + + - + diff --git a/sale.uml b/sale.uml index f8cb2f1..0685c14 100644 --- a/sale.uml +++ b/sale.uml @@ -82,11 +82,11 @@ - + - + @@ -111,7 +111,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -733,7 +733,7 @@ - + @@ -748,7 +748,7 @@ - + From 2a03a3849f678349bd5557cb2dc636defbe8a430 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 28 Apr 2026 17:24:02 +0200 Subject: [PATCH 29/59] Fix Agent setters for localizations and phone numbers --- agent.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent.uml b/agent.uml index e863b1b..9abbe0f 100644 --- a/agent.uml +++ b/agent.uml @@ -990,7 +990,7 @@ - + @@ -1086,7 +1086,7 @@ - + From e03355b85b0c0a05cdaa5674a4ad58f0cae46a15 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 10:31:16 +0200 Subject: [PATCH 30/59] Fix ILocalizedProduct consumptionFlow -> localConsumptionFlow --- product.uml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product.uml b/product.uml index 7b49e04..e7d0e50 100644 --- a/product.uml +++ b/product.uml @@ -1056,19 +1056,19 @@ - + - + - + - + From 821d8fa5a03e55cf52c45fe385e3bdf09e5b67a6 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 10:47:12 +0200 Subject: [PATCH 31/59] Exhibitable now has adder and remover, image -> images --- common.uml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/common.uml b/common.uml index 878d011..2c7078d 100644 --- a/common.uml +++ b/common.uml @@ -2,14 +2,32 @@ - + + + - + + + + + + + + + + + + + + + + + @@ -855,4 +873,6 @@ + + From 83b16d856d337cc97bddb71eb80f5e39e6223281 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 10:59:03 +0200 Subject: [PATCH 32/59] LocalizedProduct is now Exhibitable --- product.uml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/product.uml b/product.uml index e7d0e50..34932a6 100644 --- a/product.uml +++ b/product.uml @@ -978,12 +978,18 @@ + + + + + + @@ -2588,11 +2594,6 @@ - - - - - @@ -2911,4 +2912,11 @@ + + + + + + + From 4c25a69359acbd332141d0e63cb4476512b1f899 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 11:01:47 +0200 Subject: [PATCH 33/59] DefinedProduct and subclasses are now Exhibitable_ --- product.uml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/product.uml b/product.uml index 34932a6..0fab74d 100644 --- a/product.uml +++ b/product.uml @@ -159,6 +159,9 @@ + + + @@ -168,6 +171,9 @@ + + + @@ -208,23 +214,6 @@ - - - - - - - - - - - - - - - - - @@ -743,6 +732,11 @@ + + + + + @@ -2472,10 +2466,15 @@ - - - - + + + + + + + + + @@ -2919,4 +2918,5 @@ + From 60372372e20dce9cd232099605b5abb2926a8d7e Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 11:11:08 +0200 Subject: [PATCH 34/59] Fix Order paymentMethod --- SUPPORTED.md | 1 + sale.uml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/SUPPORTED.md b/SUPPORTED.md index 99d83a5..4bef15c 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -170,6 +170,7 @@ Here is a list of the DFC features that the model currently supports. - [x] hasFulfilmentStatus - [x] hasOrderStatus - [x] hasPart + - [x] hasPaymentMethod - [x] hasPaymentStatus - [x] orderedBy - [x] orderNumber diff --git a/sale.uml b/sale.uml index 0685c14..e824bd6 100644 --- a/sale.uml +++ b/sale.uml @@ -628,6 +628,7 @@ + @@ -657,6 +658,9 @@ + + + @@ -691,6 +695,10 @@ + + + + @@ -3208,4 +3216,7 @@ + + + From df45cd47ae920a5a26d80696dd9ce445779c1cbe Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 11:37:20 +0200 Subject: [PATCH 35/59] Add certifications param in Organization constructor, fix missing semantic stereotype on IOrganization, ICertification and ITemplateSaleSession --- agent.uml | 12 +++++++++--- sale.uml | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/agent.uml b/agent.uml index 9abbe0f..f82f002 100644 --- a/agent.uml +++ b/agent.uml @@ -576,7 +576,7 @@ - + @@ -688,6 +688,10 @@ + + + + @@ -779,7 +783,7 @@ - + @@ -1191,7 +1195,6 @@ - @@ -1265,4 +1268,7 @@ + + + diff --git a/sale.uml b/sale.uml index e824bd6..c460c61 100644 --- a/sale.uml +++ b/sale.uml @@ -3219,4 +3219,5 @@ + From d4cf91f96b547c285329b3242cf2ae4fe73cb91b Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 11:52:21 +0200 Subject: [PATCH 36/59] Fix PlannedLocalTransformation bad outcome and associated constructor param types --- product.uml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product.uml b/product.uml index 0fab74d..09cd51d 100644 --- a/product.uml +++ b/product.uml @@ -1692,11 +1692,11 @@ - + - + @@ -2666,7 +2666,7 @@ - + From 687f1317119193c68f88f962b31255999fef432c Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 12:09:07 +0200 Subject: [PATCH 37/59] Fix RealStock quantity (remove Quantifiable) --- sale.uml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sale.uml b/sale.uml index c460c61..d4a2bd5 100644 --- a/sale.uml +++ b/sale.uml @@ -992,9 +992,6 @@ - - - From fa8bf7470aa5fd182dd940ac88441ec5109c0bcd Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 12:21:31 +0200 Subject: [PATCH 38/59] Add SuppliedProduct referenceOf --- SUPPORTED.md | 3 +-- product.uml | 14 +++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/SUPPORTED.md b/SUPPORTED.md index 4bef15c..7d72459 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -360,9 +360,8 @@ Here is a list of the DFC features that the model currently supports. - [x] image - [x] referencedBy - [ ] consumedBy - - [ ] referenceOf + - [x] referenceOf - [x] totalTheoreticalStock - - [ ] referenceOf - `TechnicalProduct` - [x] name - [x] description diff --git a/product.uml b/product.uml index 09cd51d..ef5554a 100644 --- a/product.uml +++ b/product.uml @@ -513,10 +513,15 @@ + + + + + @@ -614,10 +619,14 @@ - + + + + + @@ -2919,4 +2928,7 @@ + + + From ea91adbf82447a72c6d44c22beefe165429db20e Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 12:24:58 +0200 Subject: [PATCH 39/59] Add TechnicalProduct referenceProductOptions --- SUPPORTED.md | 2 +- product.uml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SUPPORTED.md b/SUPPORTED.md index 7d72459..a016d23 100644 --- a/SUPPORTED.md +++ b/SUPPORTED.md @@ -387,7 +387,7 @@ Here is a list of the DFC features that the model currently supports. - [x] image - [x] referencedBy - [ ] consumedBy - - [ ] referenceOf + - [x] referenceOf - [ ] satisfies - [ ] industrializedBy - `TemplateSaleSession` diff --git a/product.uml b/product.uml index ef5554a..2c3086f 100644 --- a/product.uml +++ b/product.uml @@ -737,7 +737,7 @@ - + From 24ddd28fb5f2fab7c6b1086fd493a3c595f6eb0f Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 12:29:14 +0200 Subject: [PATCH 40/59] Fix Variant missing constructor parameter types, add semantic stereotype to IVariantCharacteristic --- product.uml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/product.uml b/product.uml index 2c3086f..6b5f23e 100644 --- a/product.uml +++ b/product.uml @@ -2209,11 +2209,11 @@ - + - + @@ -2931,4 +2931,5 @@ + From ca28252e0e67b23f4ca0b5d030efd81d68e3ab90 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 17:08:34 +0200 Subject: [PATCH 41/59] Fix DefinedProduct referenceProductOption type, add missing semantic steteotypes --- product.uml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/product.uml b/product.uml index 6b5f23e..6b21a07 100644 --- a/product.uml +++ b/product.uml @@ -2905,7 +2905,7 @@ - + @@ -2932,4 +2932,6 @@ + + From 5f8d494483496596b13f87f3ffff8a2ed13ff99a Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 17:11:30 +0200 Subject: [PATCH 42/59] Fix DeliveryOption wrong interface realization --- sale.uml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale.uml b/sale.uml index d4a2bd5..81f4650 100644 --- a/sale.uml +++ b/sale.uml @@ -1851,7 +1851,7 @@ - + From 0622fd0f1e2d25999fdc88c47173aea74bdf2aec Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 29 Apr 2026 17:21:27 +0200 Subject: [PATCH 43/59] Fix LocalizedProduct quantity getter and setter --- product.uml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/product.uml b/product.uml index 6b21a07..3eba985 100644 --- a/product.uml +++ b/product.uml @@ -984,6 +984,9 @@ + + + @@ -1100,6 +1103,17 @@ + + + + + + + + + + + @@ -2592,7 +2606,7 @@ - + @@ -2934,4 +2948,6 @@ + + From a0ebad1e7a91ac5be80327826c2c147d1f637714 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 00:13:20 +0200 Subject: [PATCH 44/59] Fix Agent customerCategoriesMembership and Organization constructor --- agent.uml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/agent.uml b/agent.uml index f82f002..033a08f 100644 --- a/agent.uml +++ b/agent.uml @@ -196,6 +196,15 @@ + + + + + + + + + @@ -373,6 +382,7 @@ + @@ -436,7 +446,7 @@ - + @@ -1161,7 +1171,7 @@ - + @@ -1271,4 +1281,6 @@ + + From 21fbe834ee8d0b528f9a0d7b86b7e45b7f0acfad Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 00:18:28 +0200 Subject: [PATCH 45/59] Fix PaymentMethod price getter and setter --- sale.uml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sale.uml b/sale.uml index 81f4650..40b31aa 100644 --- a/sale.uml +++ b/sale.uml @@ -1674,7 +1674,7 @@ - + @@ -2927,10 +2927,7 @@ - - - - + From 9d68702ca57bc50bac33a62bf8526313df8ff297 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 00:32:54 +0200 Subject: [PATCH 46/59] Fix PhysicalPlace, add semantic stereotype to IGeoJsonFeature --- common.uml | 1 + sale.uml | 37 +++++++++++++++---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/common.uml b/common.uml index 2c7078d..027a12f 100644 --- a/common.uml +++ b/common.uml @@ -875,4 +875,5 @@ + diff --git a/sale.uml b/sale.uml index 40b31aa..c7e072f 100644 --- a/sale.uml +++ b/sale.uml @@ -1580,15 +1580,15 @@ - + - - + + - + - + @@ -1626,15 +1626,15 @@ - + - - + + - + - + @@ -2871,22 +2871,10 @@ - - - - - - - - - - - - @@ -3214,4 +3202,9 @@ + + + + + From d7214272104d9aa5a3121dbb6561af259c477d7b Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 12:39:39 +0200 Subject: [PATCH 47/59] Fix PhysicalProduct quantity and images properties --- product.uml | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/product.uml b/product.uml index 3eba985..402ab31 100644 --- a/product.uml +++ b/product.uml @@ -1131,12 +1131,21 @@ + + + + + + + + + @@ -1239,6 +1248,17 @@ + + + + + + + + + + + @@ -2651,12 +2671,7 @@ - - - - - - + @@ -2950,4 +2965,13 @@ + + + + + + + + + From 9eb984f37abccde5eb86aa33c174a055da5b9000 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 13:04:06 +0200 Subject: [PATCH 48/59] Fix PlannedLocalConsumptionFlow wrong method bindings --- product.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.uml b/product.uml index 402ab31..9554e97 100644 --- a/product.uml +++ b/product.uml @@ -2723,9 +2723,9 @@ - + - + From e7e6e5a9d5737c9c1b22a153822d4f14f0522ab8 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 13:06:22 +0200 Subject: [PATCH 49/59] Fix PlannedLocalProductionFlow wrong method bindings --- product.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.uml b/product.uml index 9554e97..36b347a 100644 --- a/product.uml +++ b/product.uml @@ -2732,9 +2732,9 @@ - + - + From e66ddf188092104cb715d7984e17088ca913f236 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:21:50 +0200 Subject: [PATCH 50/59] Fix ProductBatch wrong method bindings --- sale.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale.uml b/sale.uml index c7e072f..3b5907c 100644 --- a/sale.uml +++ b/sale.uml @@ -1483,7 +1483,7 @@ - + @@ -2799,7 +2799,7 @@ - + From 39ea71f9090051662add2a5bdf2f137e0ce8263c Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:25:01 +0200 Subject: [PATCH 51/59] Fix RealizedConsumptionFlow wrong method bindings --- product.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.uml b/product.uml index 36b347a..5b0f54c 100644 --- a/product.uml +++ b/product.uml @@ -2765,9 +2765,9 @@ - + - + From 2d3e24371e83b2192ba5a5f08f9c443d5eaeb25f Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:26:22 +0200 Subject: [PATCH 52/59] Fix RealizedProductionFlow wrong method bindings --- product.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product.uml b/product.uml index 5b0f54c..49787de 100644 --- a/product.uml +++ b/product.uml @@ -2774,9 +2774,9 @@ - + - + From 62efb6afd5b147c30eb689c612969e5b66108a3a Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:39:37 +0200 Subject: [PATCH 53/59] Fix RealizedTransformation wrong method bindings --- product.uml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product.uml b/product.uml index 49787de..b395b19 100644 --- a/product.uml +++ b/product.uml @@ -2741,7 +2741,7 @@ - + @@ -2754,9 +2754,9 @@ - + - + From ea04c56c9e4108e121dbfaf9d9faac5df8e8aff1 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:42:13 +0200 Subject: [PATCH 54/59] Add semantic stereotype to IStep, IShipment, IRoute --- sale.uml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sale.uml b/sale.uml index 3b5907c..452dbef 100644 --- a/sale.uml +++ b/sale.uml @@ -3207,4 +3207,7 @@ + + + From a7603e875bbb4329a25fdc008937c35f456b234c Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:45:38 +0200 Subject: [PATCH 55/59] Fix TemplateSaleSession missing date property --- sale.uml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sale.uml b/sale.uml index 452dbef..0cb53f6 100644 --- a/sale.uml +++ b/sale.uml @@ -1988,6 +1988,10 @@ + + + + @@ -3210,4 +3214,9 @@ + + + + + From e63964b24bf1085ff2c1a0fdd0bb431957da164e Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 30 Apr 2026 14:48:38 +0200 Subject: [PATCH 56/59] Fix VEvent wrong method binding and wrong URIs bindings --- common.uml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common.uml b/common.uml index 027a12f..2874819 100644 --- a/common.uml +++ b/common.uml @@ -829,7 +829,7 @@ - + @@ -840,8 +840,8 @@ - - + + From 261cb4ab1143fa7767e4d302b20e6f71b78931aa Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Tue, 5 May 2026 16:46:28 +0200 Subject: [PATCH 57/59] Rename incomeOf, outcomeOf, hasIncome, hasOutcome --- product.uml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/product.uml b/product.uml index b395b19..6643660 100644 --- a/product.uml +++ b/product.uml @@ -2476,7 +2476,7 @@ - + @@ -2485,7 +2485,7 @@ - + @@ -2506,9 +2506,9 @@ - + - + @@ -2703,9 +2703,9 @@ - + - + @@ -2724,7 +2724,7 @@ - + @@ -2733,7 +2733,7 @@ - + @@ -2755,9 +2755,9 @@ - + - + @@ -2766,7 +2766,7 @@ - + @@ -2775,7 +2775,7 @@ - + From 56d12051a9fb211611187e73bf80a457790023f0 Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Wed, 10 Jun 2026 15:41:27 +0200 Subject: [PATCH 58/59] Keep changelog to v4.0.0 --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5faea11..2a727d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ TODO: - Create top classes `Subject` and `Relation` to be generalized by all DFC subjects and relations. - Rename IQuantity to IQuantitativeValue (**Breaking change**). -## [3.5.0] - 2026-06-10 +## [4.0.0] - 2026-06-10 This major version implements the ontology version 2 changes. It introduces several breaking changes in the generated code. @@ -474,8 +474,8 @@ Classes: - sale.uml - skos.uml -[unreleased]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.5.0...HEAD -[3.5.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.4.0...v3.5.0 +[unreleased]: https://github.com/datafoodconsortium/data-model-uml/compare/v4.0.0...HEAD +[4.0.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.4.0...v4.0.0 [3.4.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.3.0...v3.4.0 [3.3.0]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.2.1...v3.3.0 [3.2.1]: https://github.com/datafoodconsortium/data-model-uml/compare/v3.2.0...v3.2.1 From 9d2fa044f651bb19459e276329cc9959f11f383d Mon Sep 17 00:00:00 2001 From: Maxime Lecoq-Gaillard Date: Thu, 11 Jun 2026 10:04:34 +0200 Subject: [PATCH 59/59] Fix Catalog:removeMaintainer and Catalog:setMaintainers wrong type (Browsable) The type was IEnterprise so I changed it to IOrganization. --- sale.uml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sale.uml b/sale.uml index b228269..5be0967 100644 --- a/sale.uml +++ b/sale.uml @@ -145,14 +145,14 @@ - + - +