Merge branch 'hotfixes/hotfix-h2f-facture-and-devis' into releases/release-h2f

gestion/lib/Db/Bdd.php

@@ -800,6 +800,13 @@ class Bdd {
         $last=0;
         $last = $this->lastinsertid("devis", $idNextcloud) + 1;
 
+        $devisDatetime = new Datetime();
+        $dateMonth = $devisDatetime->format('m');
+        $dateYear = $devisDatetime->format('Y');
+        $devisLastNumber = $this->getLastDevisNumberByMonthAndYear($dateMonth,$dateYear);
+        $devisNumber = $devisLastNumber + 1;
+        $devisFullNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($devisDatetime,$devisNumber,'DEV');
+
         $sql = "INSERT INTO `".$this->tableprefix."devis` ( `date`,
                                                             `id_nextcloud`,
                                                             `num`,
@@ -810,10 +817,21 @@ class Bdd {
                                                             `id_lieu`,
                                                             `mentions`,
                                                             `comment`,
-                                                            `user_id`
+                                                            `user_id`,
+                                                            `devis_number`,
+                                                            `devis_full_number`
                                                         ) 
-                                                VALUES (NOW(),?,?,0,0,0,?,0,?,?,?);";
+                                                VALUES (NOW(),?,?,0,0,0,?,0,?,?,?,?,?);";
-        $this->execSQLNoData($sql, array($idNextcloud,"Nom du defunt",'Ajouter un lieu',$this->l->t('New'),$this->l->t('Comment'),$last));
+        $this->execSQLNoData($sql, array(
+            $idNextcloud,
+            self::DEFAULT_CALENDAR_UUID_FOR_DEVIS,
+            $this->l->t('New'),
+            'Mention',
+            $this->l->t('Comment'),
+            $last,
+            $devisNumber,
+            $devisFullNumber
+        ));
         return true;
     }
 
@@ -993,6 +1011,17 @@ class Bdd {
                 $this->execSQLNoData($sql, array($data, $devis->devisid));
                 $updated_devis = json_decode($this->getOneDevis($devis->devisid, $idNextcloud))[0];
 
+                //update devis full number 
+                $devisDate = $updated_devis->date;
+                $devisDatetime = Datetime::createFromFormat("Y-m-d",$devisDate);
+                $dateMonth = $devisDatetime->format('m');
+                $dateYear = $devisDatetime->format('Y');
+                $devisLastNumber = $this->getLastDevisNumberByMonthAndYear($dateMonth,$dateYear);
+                $devisNumber = $devisLastNumber + 1;
+                $devisFullNumber = DateHelpers::GetFullFactureOrDevisNumberByDate($devisDatetime,$devisNumber,'DEV');
+                $sql = "UPDATE ".$this->tableprefix."devis SET devis_full_number = ?, devis_number = ? WHERE `id` = ?";
+                $this->execSQLNoData($sql, array($devisFullNumber, $devisNumber, $devis->devisid));
+
                 if($devis->id_lieu!=NULL) {
                     if(strcmp(explode('-', $devis->date)[1], explode('-', $updated_devis->date)[1]) != 0) { // si le mois a changé
                         // deplacer la ligne de trajet
@@ -2157,6 +2186,7 @@ class Bdd {
                     devis.num as calendar_uuid,
                     devis.comment as devis_comment,
                     client.nom as client_nom,
+                    client.prenom as client_prenom,
                     client.entreprise as client_entreprise,
                     client.adresse as client_adresse,
                     defunt.nom as defunt_nom,
@@ -2311,6 +2341,7 @@ class Bdd {
                     devis.devis_full_number as devis_full_number,
                     devis.comment as devis_comment,
                     client.nom as client_nom,
+                    client.prenom as client_prenom,
                     client.entreprise as client_entreprise,
                     client.adresse as client_adresse,
                     defunt.nom as defunt_nom,

gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php

@@ -42,7 +42,7 @@ class CareCertificatePdfHandler extends FPDF {
     function Header()
     {
         if($this->logo != "nothing"){
-            $this->Image($this->imagePath."logo.png", 10, 10, 90, 35);
+            $this->Image($this->imagePath."logo.png", 10, 10, 50, 25);
         }
         else{
             $this->Cell(55,30,'');

gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php

@@ -40,7 +40,7 @@ class DevisPdfHandler extends FPDF {
     function Header()
     {
         if($this->logo != "nothing"){
-            $this->Image($this->logoPath."logo.png", 10, 10, 75, 25);
+            $this->Image($this->logoPath."logo.png", 10, 10, 50, 25);
         }
         else{
             $this->Cell(55,30,'');
@@ -74,7 +74,9 @@ class DevisPdfHandler extends FPDF {
         $this->SetY(40);
         $this->SetFont('Arial', '', 12);
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration']->entreprise), 0, 0);
-        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['client_entreprise']), 0, 1,'R');
+        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport(
+            $this->devisData['client_nom']. ' '. $this->devisData['client_prenom']),
+0, 1,'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse']), 0, 0);
         $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->devisData['client_real_adress'])), 0, 1,'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse_city']), 0, 0);border: 

gestion/lib/Service/InvoicePdfHandler.php

@@ -42,7 +42,7 @@ class InvoicePdfHandler extends FPDF {
     function Header()
     {
         if($this->logo != "nothing"){
-            $this->Image($this->logoPath."logo.png", 10, 10, 75, 25);
+            $this->Image($this->logoPath."logo.png", 10, 10, 50, 25);
         }
         else{
             $this->Cell(55,30,'');
@@ -94,7 +94,9 @@ class InvoicePdfHandler extends FPDF {
         $this->SetY(40);
         $this->SetFont('Arial', '', 12);
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 0);
-        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['client_entreprise']), 0, 1,'R');
+        $this->Cell(0, 7, FileExportHelpers::FormatTextForExport(
+            $this->factureData['client_nom']. ' '.$this->factureData['client_prenom']),
+0, 1,'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse']), 0, 0);
         $this->Cell(0, 7, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_real_adress'])), 0, 1,'R');
         $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 0);border: