slambert/Thanasoft-H2F
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set nom prenom of client lieu in facture and devis instead of client_entreprise

Browse Source
This commit is contained in:
Tiavina 2025-01-20 13:32:05 +03:00
parent 703bddfabf
commit 2a30b70e2a
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/lib/Db/Bdd.php
View File

@ -2186,6 +2186,7 @@ class Bdd {
devis.num as calendar_uuid, devis.num as calendar_uuid,
devis.comment as devis_comment, devis.comment as devis_comment,
client.nom as client_nom, client.nom as client_nom,
client.prenom as client_prenom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,
defunt.nom as defunt_nom, defunt.nom as defunt_nom,
@ -2340,6 +2341,7 @@ class Bdd {
devis.devis_full_number as devis_full_number, devis.devis_full_number as devis_full_number,
devis.comment as devis_comment, devis.comment as devis_comment,
client.nom as client_nom, client.nom as client_nom,
client.prenom as client_prenom,
client.entreprise as client_entreprise, client.entreprise as client_entreprise,
client.adresse as client_adresse, client.adresse as client_adresse,
defunt.nom as defunt_nom, defunt.nom as defunt_nom,

4
gestion/lib/Service/Devis/Pdf/DevisPdfHandler.php
View File

@ -74,7 +74,9 @@ class DevisPdfHandler extends FPDF {
$this->SetY(40); $this->SetY(40);
$this->SetFont('Arial', '', 12); $this->SetFont('Arial', '', 12);
$this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration']->entreprise), 0, 0); $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, 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, 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: $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->devisData['configuration_adresse_city']), 0, 0);border:

4
gestion/lib/Service/InvoicePdfHandler.php
View File

@ -94,7 +94,9 @@ class InvoicePdfHandler extends FPDF {
$this->SetY(40); $this->SetY(40);
$this->SetFont('Arial', '', 12); $this->SetFont('Arial', '', 12);
$this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['configuration']->entreprise), 0, 0); $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, 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, 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: $this->Cell(0, 7, FileExportHelpers::FormatTextForExport($this->factureData['configuration_adresse_city']), 0, 0);border: