From d5436afaa391e48baeeb8de11cfc7ae935791b15 Mon Sep 17 00:00:00 2001
From: Pek5892 <pek5892@gmail.com>
Date: Thu, 15 Jun 2023 10:31:26 +0200
Subject: [PATCH 1/3] Fix #1316

---
 modules/fatture/src/Fattura.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/fatture/src/Fattura.php b/modules/fatture/src/Fattura.php
index e6aa83766..3d113dcf6 100755
--- a/modules/fatture/src/Fattura.php
+++ b/modules/fatture/src/Fattura.php
@@ -358,12 +358,12 @@ class Fattura extends Document
      */
     public function getRitenutaAccontoAttribute()
     {
-        return $this->calcola('ritenuta_acconto');
+        return $this->getRigheContabili()->sum('ritenuta_acconto');
     }
 
     public function getTotaleRitenutaContributiAttribute()
     {
-        return $this->calcola('ritenuta_contributi');
+        return $this->getRigheContabili()->sum('ritenuta_contributi');
     }
 
     /**

From 2cc9b326b5547dec5c71138f70b2666584e55afa Mon Sep 17 00:00:00 2001
From: Luca <lucas@devcode.it>
Date: Thu, 15 Jun 2023 15:50:57 +0200
Subject: [PATCH 2/3] Ripristino dipendenze introdotte con commit precedente

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e199832af..6a76cbb77 100755
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
         "bootstrap-daterangepicker": "^2.1.25",
         "bootstrap-maxlength": "^1.10.1",
         "chart.js": "^3.8.0",
-        "ckeditor4": "^4.21.0",
+        "ckeditor4": "ckeditor/ckeditor4-releases#full/latest",
         "components-jqueryui": "^1.12.1",
         "datatables.net-bs": "^1.10.15",
         "datatables.net-buttons-bs": "^1.3.1",
@@ -35,7 +35,7 @@
         "moment": "^2.18.1",
         "numeral": "^2.0.6",
         "parsleyjs": "^2.7.2",
-        "pdfjs-viewer-element": "^2.3.1",
+        "pdf.js": "alekswebnet/pdfjs-viewer-element",
         "pwstrength-bootstrap": "^3.0.4",
         "select2": "^4.0.3",
         "select2-bootstrap-theme": "^0.1.0-beta.10",

From 6e2abd5110e0ff3f94c9be0bd67694260a95c713 Mon Sep 17 00:00:00 2001
From: loviuz <loviuz@mailbox.org>
Date: Thu, 15 Jun 2023 22:50:35 +0200
Subject: [PATCH 3/3] Correzione nome impostazione

---
 modules/anagrafiche/edit.php             | 2 +-
 modules/anagrafiche/modals/posizione.php | 2 +-
 modules/mappa/edit.php                   | 2 +-
 update/2_4_47.sql                        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index 1dafae80e..6afe77e07 100755
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -365,7 +365,7 @@ echo '
                     shadowSize: [41, 41]
                 });
 
-                L.tileLayer("'.setting("Tile layer OpenStreetMap").'", {
+                L.tileLayer("'.setting("Tile server OpenStreetMap").'", {
                     maxZoom: 17,
                     attribution: "© OpenStreetMap"
                 }).addTo(map); 
diff --git a/modules/anagrafiche/modals/posizione.php b/modules/anagrafiche/modals/posizione.php
index a438164f0..2c8833ac8 100644
--- a/modules/anagrafiche/modals/posizione.php
+++ b/modules/anagrafiche/modals/posizione.php
@@ -109,7 +109,7 @@ function caricaMappa() {
         shadowSize: [41, 41]
     });
 
-    L.tileLayer("'.setting("Tile layer OpenStreetMap").'", {
+    L.tileLayer("'.setting("Tile server OpenStreetMap").'", {
         maxZoom: 17,
         attribution: "© OpenStreetMap"
     }).addTo(map); 
diff --git a/modules/mappa/edit.php b/modules/mappa/edit.php
index 27481b07f..3f74ed4af 100644
--- a/modules/mappa/edit.php
+++ b/modules/mappa/edit.php
@@ -88,7 +88,7 @@ include_once __DIR__.'/../../core.php';
             gestureHandling: true
         });
 
-        L.tileLayer("<?php echo setting("Tile layer OpenStreetMap"); ?>", {
+        L.tileLayer("<?php echo setting("Tile server OpenStreetMap"); ?>", {
             maxZoom: 17,
             attribution: "© OpenStreetMap"
         }).addTo(map); 
diff --git a/update/2_4_47.sql b/update/2_4_47.sql
index 997772337..0fc17a0e9 100644
--- a/update/2_4_47.sql
+++ b/update/2_4_47.sql
@@ -15,4 +15,4 @@ UPDATE `zz_settings` SET `help` = "Valore espresso in Giga superato il quale vie
 -- Rimozione google maps
 DELETE FROM `zz_settings` WHERE `zz_settings`.`nome` = 'Google Maps API key';
 
-INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `created_at`, `order`, `help`) VALUES (NULL, 'Tile layer OpenStreetMap', 'https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png', 'string', '1', 'Generali', NULL, NULL, '') 
\ No newline at end of file
+INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `created_at`, `order`, `help`) VALUES (NULL, 'Tile server OpenStreetMap', 'https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png', 'string', '1', 'Generali', NULL, NULL, '') 
\ No newline at end of file