fix change is_tva in tva on Bdd.php

.gitignore

@@ -5,10 +5,6 @@
 !.gitignore
 !Jenkinsfile
 
-# Dossiers à inclure
-!calendar/
-!gestion/
-
 # Inclure tout le contenu de ces dossiers
 !calendar/**
 !gestion/**

gestion/lib/Constants/BddConstant.php

@@ -13,4 +13,7 @@ abstract class BddConstant
     const ISLEAVEPROPERTYONVCALENDAR = "ISLEAVE";
 
     const DEFAULT_THANATOS_GROUP_NAME = "Thanatos";
+
+    const DEFAULT_ATTESTATION_CC_EMAIL = "attestation@h-f-c.info";
+    const DEFAULT_INVOICE_CC_EMAIL = "attestation@h-f-c.info";
 }

gestion/lib/Controller/InvoiceController.php

@@ -116,10 +116,8 @@ class InvoiceController  extends Controller
             "<p> Vous trouverez en pièce jointe la facture des soins de " . $factureDate . ".</p>".
             $signature
             );
-            $appAdminEmail = $this->gestionRepository->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
+            $appAdminEmail =  BddConstant::DEFAULT_INVOICE_CC_EMAIL;
-            if ($appAdminEmail) {
             $message->setCc([$appAdminEmail]);
-            }
           
             $this->mailer->send($message);
             $this->gestionRepository->setFactureSentDate($factureId);

gestion/lib/Controller/PageController.php

@@ -1844,8 +1844,7 @@ class PageController extends Controller
 
     }
 
-    public function sendAttachmentToClientByDefunt($defuntId, $ff_pdf, $to, $subject, $body, $addName = false)
+	public function sendAttachmentToClientByDefunt($defuntId, $ff_pdf, $to,$subject, $body, $addName = false){
-    {
 		$devis = $this->myDb->getDevisOfDefunt($defuntId);
 		if($devis != null){
 			// try {
@@ -1865,17 +1864,16 @@ class PageController extends Controller
 				$message->attach($content);
 				$message->setSubject($subject);
 				$body_text = $addName ? ($body." de ".$devis['defunt_nom'] ) : $body;
+				$cautionText = "MERCI DE NE PAS REPONDRE A CET EMAIL.";
 				$signature = $this->mailerService->getFooterContent($this->getUserNameForEmailSignature());
 				$message->setHtmlBody(
 				"<p>Bonjour.</p>".
 				"<p>$body_text</p>".
-                 $signature
+				"<p>$cautionText</p>"
 				);
 				
-            $appAdminEmail = $this->myDb->getUserEmailByNextcloudId(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
+				$appAdminEmail = BddConstant::DEFAULT_ATTESTATION_CC_EMAIL;
-            if ($appAdminEmail) {
 				$message->setCc([$appAdminEmail]);
-            }
 				$this->mailer->send($message);
 				return new DataResponse("", 200, ['Content-Type' => 'application/json']);
 			// } catch (Exception $e) {
@@ -1883,8 +1881,7 @@ class PageController extends Controller
 			// }
 		}
 	}
-    public function getUserNameForEmailSignature()
+	public function getUserNameForEmailSignature (){
-    {
 			$configs = json_decode($this->myDb->getConfiguration(self::DEFAULT_NEXTCLOUD_ADMIN));
 			$currentConfig = $configs[0];
 			return $currentConfig->nom . " " . $currentConfig->prenom;

gestion/lib/Db/Bdd.php

@@ -4723,11 +4723,11 @@ COMMENTAIRES: ".$comment;
             FROM ".self::DEFAULT_TABLE_PREFIX."users as users
             JOIN .".self::DEFAULT_TABLE_PREFIX."group_user group_user ON users.uid = group_user.uid
             LEFT JOIN ".$this->tableprefix."thanato as thanato on users.uid = thanato.fk_user_uuid
-            WHERE group_user.gid = ? AND 
+            WHERE LOWER(group_user.gid) = ? AND 
             thanato.fk_user_uuid IS NULL;
         ";
 
-        return $this->execSQL($sql, [BddConstant::DEFAULT_THANATOS_GROUP_NAME]);
+        return $this->execSQL($sql,[strtolower(BddConstant::DEFAULT_THANATOS_GROUP_NAME)]);
     }
 
     public function doDevisIdsListIdsBelongsToTheSameClientFacturationGroup(array $devisIds)
@@ -5318,7 +5318,7 @@ COMMENTAIRES: ".$comment;
         $configuration = $this->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD);
         $configuration = json_decode($configuration);
         $currentConfig = $configuration[0];
-        $tvaValue = $currentConfig->tva_default;
+
         $isFactureSingleClient = $facture['fk_client_id'] != null
             && $facture['fk_client_id'] != 0;
 
@@ -5329,6 +5329,21 @@ COMMENTAIRES: ".$comment;
         $devis = $this->getDevisByFkFactureId($factureId);
         $factureGroupIsRelatedToAnyDevis = $devis != null;
 
+        // LOGIQUE TVA SIMPLIFIÉE
+        $tvaValue = (float)$currentConfig->tva_default;
+        $isTvaApplicable = true;
+
+        // Récupérer le statut TVA du client de cette facture
+        $clientId = $facture['fk_client_id'];
+        if ($clientId != null && $clientId != 0) {
+            $client = $this->getClientById($clientId);
+
+            $client = $this->getClientById($clientId);
+            if (isset($client['tva']) && $client['tva'] == 0) {
+                $isTvaApplicable = false;
+                $tvaValue = 0;
+            }
+        }
 
         if($isFactureSingleClient) {
             $client = $this->getClientById($facture['fk_client_id']);
@@ -5337,6 +5352,7 @@ COMMENTAIRES: ".$comment;
             $facture['client_address'] = $client["client_address"];
             $facture['siret'] = $client["client_legal_one"];
             $facture['mail'] = $client["client_mail"];
+
             if (!$factureGroupIsRelatedToAnyDevis) {
                 $devisList = $this->getDevisDataByClientIdAndMonthYear(
                     $facture['fk_client_id'],
@@ -5344,7 +5360,6 @@ COMMENTAIRES: ".$comment;
                     $facture['year'],
                     $devisMentionFilters
                 );
-
             } else {
                 $devisList = $this->getDevisDataGroupByFactureId($factureId, $devisMentionFilters);
             }
@@ -5355,6 +5370,7 @@ COMMENTAIRES: ".$comment;
             $facture['client_address'] = $clientGroupFacturation["address"] . ' - ' .$clientGroupFacturation["postal_code"] . ' ' . $clientGroupFacturation['city'];
             $facture['siret'] = $clientGroupFacturation["siret_number"];
             $facture['mail'] = $clientGroupFacturation["email"];
+
             if (!$factureGroupIsRelatedToAnyDevis) {
                 $devisList = $this->getDevisDataByClientGroupFacturationIdAndMonthYear(
                     $facture['fk_client_group_facturation_id'],
@@ -5366,22 +5382,36 @@ COMMENTAIRES: ".$comment;
                 $devisList = $this->getDevisDataGroupByFactureId($factureId, $devisMentionFilters);
             }
         }
+
         $factureTotalHt = 0;
         $factureTotalTva = 0;
         $factureTotalTtc = 0;
+
         foreach($devisList as &$currentDevis) {
             $totalHt = 0;
             $totalTva = 0;
             $totalTtc = 0;
             $devisProducts = $this->getDevisProduits($currentDevis['devis_id']);
+
             foreach($devisProducts as $currentProduct) {
                 $valueHt = $currentProduct['produit_price'] * $currentProduct['quantite'];
+
+                // CALCUL SIMPLE : TVA OU PAS TVA
+                if ($isTvaApplicable) {
+                    // Client soumis à TVA : utiliser le taux par défaut
                     $valueTtc = PriceHelpers::calculPriceWithVatValue($valueHt, $tvaValue);
+                    $tvaAmount = $valueTtc - $valueHt;
+                } else {
+                    // Client exonéré : TTC = HT
+                    $valueTtc = $valueHt;
+                    $tvaAmount = 0;
+                }
+
                 $totalHt += $valueHt;
                 $totalTtc += $valueTtc;
-                $tvaAmount = $valueTtc - $valueHt;
                 $totalTva += $tvaAmount;
             }
+
             $currentDevis["totalHt"] = $totalHt;
             $currentDevis["totalTtc"] = $totalTtc;
             $currentDevis["totalTva"] = $totalTva;
@@ -5390,10 +5420,19 @@ COMMENTAIRES: ".$comment;
             $factureTotalTva += $totalTva;
             $facture["devisList"][] = $currentDevis;
         }
+
         $facture["totalHt"] = $factureTotalHt;
         $facture["totalTtc"] = $factureTotalTtc;
         $facture["totalTva"] = $factureTotalTva;
         $facture["isFactureClientGroup"] = !$isFactureSingleClient;
+
+        // INFOS TVA POUR LE TEMPLATE
+        $facture["tvaInfo"] = [
+            'is_applicable' => $isTvaApplicable,
+            'rate' => $tvaValue,
+            'is_exempt' => !$isTvaApplicable
+        ];
+
         return $facture;
     }
 

gestion/lib/Service/InvoiceGroupPdfHandler/InvoiceGroupPdfHandler.php

@@ -27,7 +27,7 @@ declare(strict_types=1);
 namespace OCA\Gestion\Service\InvoiceGroupPdfHandler;
 
 use DateTime;
-use \FPDF;
+use FPDF;
 use OCA\Gestion\Helpers\FileExportHelpers;
 use OCA\Gestion\Helpers\PriceHelpers;
 
@@ -54,11 +54,11 @@ class InvoiceGroupPdfHandler extends FPDF
     public $additionalArticlesLineBasedOnMultiline = 0;
     public $interLigneHeader = 5;
 
-    function Header()
+    public function Header()
     {
         if ($this->logo != "nothing") {
             $this->Image($this->logoPath . "logo.png", 4, 2, 50, 35);
-            $this->AddWatermark();
+            //$this->AddWatermark();
         } else {
             $this->Cell(55, 30, '');
         }
@@ -66,7 +66,7 @@ class InvoiceGroupPdfHandler extends FPDF
         $this->DrawInvoiceCompanyAndClientInfo();
         $this->DrawInvoiceInfoTable();
     }
-    function AddWatermark()
+    public function AddWatermark()
     {
         $this->SetAlpha(0.2);
 
@@ -91,7 +91,7 @@ class InvoiceGroupPdfHandler extends FPDF
         $this->SetAlpha(0.1); // Définir l'opacité
     }
 
-    function SetAlpha($alpha)
+    public function SetAlpha($alpha)
     {
         // Appliquer la transparence au document
         $this->SetFillColor(255, 255, 255, $alpha * 255);
@@ -106,7 +106,7 @@ class InvoiceGroupPdfHandler extends FPDF
 
     }
 
-    function Footer()
+    public function Footer()
     {
         $this->SetY(-34);
         $this->SetFont('ComicSans', '', 7);
@@ -449,7 +449,7 @@ class InvoiceGroupPdfHandler extends FPDF
         $this->DrawBankAndTotalPriceInfo();
     }
 
-    function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
+    public function MultiAlignCell($w, $h, $text, $border = 0, $ln = 0, $align = 'L', $fill = false)
     {
         // Store reset values for (x,y) positions
         $x = $this->GetX() + $w;
@@ -464,19 +464,22 @@ class InvoiceGroupPdfHandler extends FPDF
         }
     }
 
-    function NbLines($w, $txt)
+    public function NbLines($w, $txt)
     {
         // Compute the number of lines a MultiCell of width w will take
-        if (!isset($this->CurrentFont))
+        if (!isset($this->CurrentFont)) {
             $this->Error('No font has been set');
+        }
         $cw = $this->CurrentFont['cw'];
-        if ($w == 0)
+        if ($w == 0) {
             $w = $this->w - $this->rMargin - $this->x;
+        }
         $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
         $s = str_replace("\r", '', (string) $txt);
         $nb = strlen($s);
-        if ($nb > 0 && $s[$nb - 1] == "\n")
+        if ($nb > 0 && $s[$nb - 1] == "\n") {
             $nb--;
+        }
         $sep = -1;
         $i = 0;
         $j = 0;
@@ -492,22 +495,26 @@ class InvoiceGroupPdfHandler extends FPDF
                 $nl++;
                 continue;
             }
-            if ($c == ' ')
+            if ($c == ' ') {
                 $sep = $i;
+            }
             $l += $cw[$c];
             if ($l > $wmax) {
                 if ($sep == -1) {
-                    if ($i == $j)
+                    if ($i == $j) {
                         $i++;
-                } else
+                    }
+                } else {
                     $i = $sep + 1;
+                }
                 $sep = -1;
                 $j = $i;
                 $l = 0;
                 $nl++;
-            } else
+            } else {
                 $i++;
             }
+        }
         return $nl;
     }
 
@@ -516,38 +523,42 @@ class InvoiceGroupPdfHandler extends FPDF
     {
         $k = $this->k;
         $hp = $this->h;
-        if ($style == 'F')
+        if ($style == 'F') {
             $op = 'f';
-        elseif ($style == 'FD' || $style == 'DF')
+        } elseif ($style == 'FD' || $style == 'DF') {
             $op = 'B';
-        else
+        } else {
             $op = 'S';
+        }
         $MyArc = 4 / 3 * (sqrt(2) - 1);
         $this->_out(sprintf('%.2F %.2F m', ($x + $r) * $k, ($hp - $y) * $k));
 
         $xc = $x + $w - $r;
         $yc = $y + $r;
         $this->_out(sprintf('%.2F %.2F l', $xc * $k, ($hp - $y) * $k));
-        if (strpos($corners, '2') === false)
+        if (strpos($corners, '2') === false) {
             $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - $y) * $k));
-        else
+        } else {
             $this->_Arc($xc + $r * $MyArc, $yc - $r, $xc + $r, $yc - $r * $MyArc, $xc + $r, $yc);
+        }
 
         $xc = $x + $w - $r;
         $yc = $y + $h - $r;
         $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - $yc) * $k));
-        if (strpos($corners, '3') === false)
+        if (strpos($corners, '3') === false) {
             $this->_out(sprintf('%.2F %.2F l', ($x + $w) * $k, ($hp - ($y + $h)) * $k));
-        else
+        } else {
             $this->_Arc($xc + $r, $yc + $r * $MyArc, $xc + $r * $MyArc, $yc + $r, $xc, $yc + $r);
+        }
 
         $xc = $x + $r;
         $yc = $y + $h - $r;
         $this->_out(sprintf('%.2F %.2F l', $xc * $k, ($hp - ($y + $h)) * $k));
-        if (strpos($corners, '4') === false)
+        if (strpos($corners, '4') === false) {
             $this->_out(sprintf('%.2F %.2F l', ($x) * $k, ($hp - ($y + $h)) * $k));
-        else
+        } else {
             $this->_Arc($xc - $r * $MyArc, $yc + $r, $xc - $r, $yc + $r * $MyArc, $xc - $r, $yc);
+        }
 
         $xc = $x + $r;
         $yc = $y + $r;
@@ -555,8 +566,9 @@ class InvoiceGroupPdfHandler extends FPDF
         if (strpos($corners, '1') === false) {
             $this->_out(sprintf('%.2F %.2F l', ($x) * $k, ($hp - $y) * $k));
             $this->_out(sprintf('%.2F %.2F l', ($x + $r) * $k, ($hp - $y) * $k));
-        } else
+        } else {
             $this->_Arc($xc - $r, $yc - $r * $MyArc, $xc - $r * $MyArc, $yc - $r, $xc, $yc - $r);
+        }
         $this->_out($op);
     }
 

gestion/templates/content/factureGroupDetails.php

@@ -2,6 +2,7 @@
 
 use OC\URLGenerator;
 use OCA\Gestion\Helpers\PriceHelpers;
+
 $facture = $_['facture'];
 $factureOrderNumber = $facture->facture_order_number == '' ? '-' : $facture->facture_order_number;
 $factureCaseNumber = $facture->facture_case_number == '' ? '-' : $facture->facture_case_number;
@@ -125,10 +126,27 @@ $currentConfig = json_decode($_['configuration'])[0];
         </thead>
         <tbody>
             <tr>
-                    <td class="text-center"><?php echo (PriceHelpers::formatDecimalPrice($facture->totalHt).'€'); ?></td>
+                <td class="text-center"><?php echo PriceHelpers::formatDecimalPrice($facture->totalHt).'€'; ?></td>
-                    <td class="text-center"><?php echo (PriceHelpers::formatDecimalPrice($currentConfig->tva_default).'€'); ?></td>
+                <td class="text-center">
-                    <td class="text-center"><?php echo (PriceHelpers::formatDecimalPrice($facture->totalTva).'€'); ?></td>
+                    <?php
-                    <td class="text-center"><?php echo (PriceHelpers::formatDecimalPrice($facture->totalTtc).'€'); ?></td>
+    // Affichage simple : Exonéré ou taux par défaut
+    if (isset($facture->tvaInfo) && $facture->tvaInfo->is_exempt) {
+        echo 'Exonéré';
+    } else {
+        echo PriceHelpers::formatDecimalPrice($facture->tvaInfo->rate).'%';
+    }
+?>
+                </td>
+                <td class="text-center">
+                    <?php
+if (isset($facture->tvaInfo) && $facture->tvaInfo->is_exempt) {
+    echo '0,00€';
+} else {
+    echo PriceHelpers::formatDecimalPrice($facture->totalTva).'€';
+}
+?>
+                </td>
+                <td class="text-center"><?php echo PriceHelpers::formatDecimalPrice($facture->totalTtc).'€'; ?></td>
             </tr>
         </tbody>
     </table>