From 084b9530203888406af1796122cbcb0f1cf256c6 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Mon, 20 Jan 2025 12:56:05 +0300 Subject: [PATCH 1/3] fix logo size --- .../Certificate/PdfHandler/CareCertificatePdfHandler.php | 2 +- gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php | 2 +- gestion/lib/Service/InvoicePdfHandler.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php b/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php index acd271b..61bd26f 100644 --- a/gestion/lib/Service/Certificate/PdfHandler/CareCertificatePdfHandler.php +++ b/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,''); diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php index e002659..9791dd1 100644 --- a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php +++ b/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,''); diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php index 9b4971a..5d0e5b5 100644 --- a/gestion/lib/Service/InvoicePdfHandler.php +++ b/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,''); From 703bddfabfea779b59e7d09ce44def2923032083 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Mon, 20 Jan 2025 13:16:41 +0300 Subject: [PATCH 2/3] when insert devis manually , generate devis number --- gestion/lib/Db/Bdd.php | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 799307a..727cbd5 100644 --- a/gestion/lib/Db/Bdd.php +++ b/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,?,?,?);"; - $this->execSQLNoData($sql, array($idNextcloud,"Nom du defunt",'Ajouter un lieu',$this->l->t('New'),$this->l->t('Comment'),$last)); + VALUES (NOW(),?,?,0,0,0,?,0,?,?,?,?,?);"; + $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 From 2a30b70e2a3a94879d1a8b131e5bc64be70d3e14 Mon Sep 17 00:00:00 2001 From: Tiavina Date: Mon, 20 Jan 2025 13:32:05 +0300 Subject: [PATCH 3/3] set nom prenom of client lieu in facture and devis instead of client_entreprise --- gestion/lib/Db/Bdd.php | 2 ++ gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php | 4 +++- gestion/lib/Service/InvoicePdfHandler.php | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php index 727cbd5..f8e55d2 100644 --- a/gestion/lib/Db/Bdd.php +++ b/gestion/lib/Db/Bdd.php @@ -2186,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, @@ -2340,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, diff --git a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php index 9791dd1..a2243a1 100644 --- a/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php +++ b/gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php @@ -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: diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php index 5d0e5b5..c933fb9 100644 --- a/gestion/lib/Service/InvoicePdfHandler.php +++ b/gestion/lib/Service/InvoicePdfHandler.php @@ -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: