Merge remote-tracking branch 'origin/master'

consiglionazionaledellericerche · Oct 30, 2024 · ccbc102 · ccbc102
2 parents ed05028 + 4be7c67
commit ccbc102
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 9 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,22 @@
-## Release 6.6.5  -- _October 21, 2024_ 
+## Release 6.6.6  -- _October 30, 2024_ 
 **Changes**
 
+>**Aggiunti i mandati con stato "NON_SOSTITUITO" alla distinta degli annulli**
+>
+>[44624122f10bede](https://github.com/consiglionazionaledellericerche/sigla-main/commit/44624122f10bede) marco.spasiano *October 30, 2024*
+
+>**Aggiornato il calcolo dell'indice di tempestività dei pagamenti**
+>
+>[26a8e932fe64d38](https://github.com/consiglionazionaledellericerche/sigla-main/commit/26a8e932fe64d38) marco.spasiano *October 29, 2024*
+
+>**Rimossa la join con la riga del mandato per il calcolo dell'importo delle note legate a fattura**
+>
+>[236b1ae7b7c9513](https://github.com/consiglionazionaledellericerche/sigla-main/commit/236b1ae7b7c9513) marco.spasiano *October 28, 2024*
+
+>**Aggiunto controllo sulla causale in caso di sospensione della fattura**
+>
+>[6b5e5f6bd49f715](https://github.com/consiglionazionaledellericerche/sigla-main/commit/6b5e5f6bd49f715) marco.spasiano *October 28, 2024*
+
 >**fix: NPE sulla rimodulazione del progetto**
 >
 >[57f2632f061eb12](https://github.com/consiglionazionaledellericerche/sigla-main/commit/57f2632f061eb12) marco.spasiano *October 21, 2024*

diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,7 @@
 }
 
 project = 'Sistema Informativo Gestione Linee di Attività'
-release = '6.6.5'
+release = '6.6.6'
 author = u'Consiglio Nazionale delle Ricerche'
 
 show_authors = True

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>it.cnr.si.sigla</groupId>
-	<version>6.6.6-SNAPSHOT</version>
+	<version>6.6.7-SNAPSHOT</version>
 	<artifactId>sigla-parent</artifactId>
 	<description>Sistema Informativo per la Gestione delle Linee di Attività</description>
 	<packaging>pom</packaging>

diff --git a/publiccode.yml b/publiccode.yml
@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.4.0'
 name: sigla
-releaseDate: '2024-10-21'
+releaseDate: '2024-10-30'
 url: 'https://github.com/consiglionazionaledellericerche/sigla-main'
 applicationSuite: jada
-softwareVersion: 6.6.5
+softwareVersion: 6.6.6
 developmentStatus: stable
 softwareType: standalone/web
 platforms:

diff --git a/sigla-backend/pom.xml b/sigla-backend/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>it.cnr.si.sigla</groupId>
 		<artifactId>sigla-parent</artifactId>
-		<version>6.6.6-SNAPSHOT</version>
+		<version>6.6.7-SNAPSHOT</version>
 	</parent>
 	<build>
 		<pluginManagement>

diff --git a/sigla-ejb/pom.xml b/sigla-ejb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>it.cnr.si.sigla</groupId>
         <artifactId>sigla-parent</artifactId>
-        <version>6.6.6-SNAPSHOT</version>
+        <version>6.6.7-SNAPSHOT</version>
     </parent>
     <build>
         <pluginManagement>

diff --git a/sigla-web/pom.xml b/sigla-web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>it.cnr.si.sigla</groupId>
         <artifactId>sigla-parent</artifactId>
-        <version>6.6.6-SNAPSHOT</version>
+        <version>6.6.7-SNAPSHOT</version>
     </parent>
     <dependencyManagement>
         <dependencies>

diff --git a/sigla-ws/pom.xml b/sigla-ws/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>it.cnr.si.sigla</groupId>
 		<artifactId>sigla-parent</artifactId>
-		<version>6.6.6-SNAPSHOT</version>
+		<version>6.6.7-SNAPSHOT</version>
 	</parent>
 	<build>
 		<pluginManagement>