root/THANASOFT-DV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-facture-text-position' into staging

Browse Source
This commit is contained in:
Tiavina 2025-01-02 16:15:14 +03:00
commit 8ef0912df9
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2287,6 +2287,24 @@ class Bdd {
$factureData = $this->setDevisStartAndEndTime($factureData);
$factureData["products"] = $products;
$factureData["configuration"] = $configuration;
$factureData["client_real_adress"] = "";
$factureData["client_adress_city"] = "";
$clientAdresses = explode("-",$factureData["client_adresse"]);
if(isset($clientAdresses[0])){
$factureData["client_real_adress"] = trim($clientAdresses[0]);
}
if(isset($clientAdresses[1])){
$factureData["client_adress_city"] = trim($clientAdresses[1]);
}
$factureData["configuration_adresse"] = "";
$factureData["configuration_adresse_city"] = "";
$configurationAdresses = explode("-",$configuration->adresse);
if(isset($configurationAdresses[0])){
$factureData["configuration_adresse"] = trim($configurationAdresses[0]);
}
if(isset($configurationAdresses[1])){
$factureData["configuration_adresse_city"] = trim($configurationAdresses[1]);
}
return $factureData;
}

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

@ -81,8 +81,10 @@ sera due sur présentation de justificatifs ( articles L.441-3 et L.441-6 du cod
$this->SetFont('Arial', '', 12);
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['configuration']->entreprise)), 0, 0);
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['client_nom'] . ' ' . $this->factureData['client_entreprise'])), 0, 1,'R');
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['configuration']->adresse)), 0, 0);border:
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['client_adresse'])), 0, 1,'R');
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['configuration_adresse'])), 0, 0);
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['client_real_adress'])), 0, 1,'R');
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['configuration_adresse_city'])), 0, 0);border:
$this->Cell(0, 7, utf8_decode(html_entity_decode($this->factureData['client_adress_city'])), 0, 1,'R');
$this->Cell(0, 7, utf8_decode(html_entity_decode('Tél : ')) . utf8_decode(html_entity_decode($this->factureData['configuration']->telephone)) , 0, 1);
$this->Cell(0, 7, 'Mail : ' . $this->factureData['configuration']->mail, 0, 1);