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

HOTFIX facture

Browse Source
This commit is contained in:
ezway 2025-09-04 17:33:49 +02:00
parent a2ca034507
commit 3a8eb35681
1 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3357,39 +3357,48 @@ class Bdd {
} }
public function getInvoicePdfData($factureId,$configuration){ public function getInvoicePdfData($factureId, $configuration)
$factureData = $this->getFactureByIdWithDevis($factureId); {
if($factureData == null){ $factureData = $this->getFactureByIdWithDevis($factureId);
return null; if($factureData == null) {
} return null;
$products = $this->getDevisProduits($factureData["devis_id"]); }
$isDevisNegative = $this->isDevisNegative($factureData['devis_id'],$factureData['client_id']);
$factureData = $this->setDevisStartAndEndTime($factureData); $products = $this->getDevisProduits($factureData["devis_id"]);
$isDevisNegative = $this->isDevisNegative($factureData['devis_id'], $factureData['client_id']);
$factureData = $this->setDevisStartAndEndTime($factureData);
$factureData["products"] = $products; $factureData["products"] = $products;
$factureData["configuration"] = $configuration; $factureData["configuration"] = $configuration;
$isClientInsideGroup = $factureData["group_id"] != null;
if($isClientInsideGroup){
$factureData["client_real_adress"] = $factureData["group_address"];
$factureData["client_adress_city"] = $factureData["group_postal_code"]." ".$factureData["group_city"];
$factureData["client_mail"] = $factureData["group_email"];
$factureData["siret"] = $factureData["group_siret_number"];
}
else{
$factureData["siret"] = $factureData["client_legal_one"];
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($factureData["client_adresse"]);
$factureData["client_real_adress"] = $clientAdresses["address"];
$factureData["client_adress_city"] = $clientAdresses["city"];
}
$factureData['is_negative'] = $isDevisNegative;
$configurationAdresses = FileExportHelpers::GetAddressAndCityFromAddress($configuration->adresse); // Récupération des informations client et gestion TVA
$factureData["configuration_adresse"] = $configurationAdresses["address"]; $client = $this->getClientById($factureData['client_id']);
$factureData["configuration_adresse_city"] = $configurationAdresses["city"]; $hasTva = ($client && isset($client['tva'])) ? ($client['tva'] == 1) : true;
return $factureData; $groupClient = $this->getTvaItracomuIdClient($factureData['client_id']);
}
$isClientInsideGroup = $factureData["group_id"] != null;
if($isClientInsideGroup) {
$factureData["client_real_adress"] = $factureData["group_address"];
$factureData["client_adress_city"] = $factureData["group_postal_code"]." ".$factureData["group_city"];
$factureData["client_mail"] = $factureData["group_email"];
$factureData["siret"] = $factureData["group_siret_number"];
} else {
$factureData["siret"] = $factureData["client_legal_one"];
$clientAdresses = FileExportHelpers::GetAddressAndCityFromAddress($factureData["client_adresse"]);
$factureData["client_real_adress"] = $clientAdresses["address"];
$factureData["client_adress_city"] = $clientAdresses["city"];
}
$factureData['is_negative'] = $isDevisNegative;
$factureData["is_tva"] = $hasTva;
$factureData["client_tva_intracommu"] = $groupClient["tva_intracommu"];
$configurationAdresses = FileExportHelpers::GetAddressAndCityFromAddress($configuration->adresse);
$factureData["configuration_adresse"] = $configurationAdresses["address"];
$factureData["configuration_adresse_city"] = $configurationAdresses["city"];
return $factureData;
}
private function getDevisByClientIdsListAndMonthYear($clientIds,$month,$year){ private function getDevisByClientIdsListAndMonthYear($clientIds,$month,$year){
if(empty($clientIds)){ if(empty($clientIds)){