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

finish folder name change to client_nom instead of client_entreprise(code comptable)

Browse Source
This commit is contained in:
Tiavina 2025-01-23 10:33:33 +03:00
parent 114aba68ab
commit 17ac3cbf9b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/lib/Service/Devis/Pdf/DevisPdfService.php
View File

@ -137,7 +137,7 @@ class DevisPdfService {
} }
private function getDevisPdfFolder(array $devisPdfData,$racinePath){ private function getDevisPdfFolder(array $devisPdfData,$racinePath){
$clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_entreprise"]).'/'; $clientRacineFolder = $racinePath.'CLIENTS/'.strtoupper($devisPdfData["client_nom"]).'/';
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.strtoupper($devisPdfData['defunt_nom']).'/'.'DEVIS'.'/'; $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.strtoupper($devisPdfData['defunt_nom']).'/'.'DEVIS'.'/';
$devisDate = $devisPdfData['devis_date']; $devisDate = $devisPdfData['devis_date'];
$devisDatetime = new DateTime($devisDate); $devisDatetime = new DateTime($devisDate);

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

@ -77,10 +77,10 @@ class InvoicePdfHandler extends FPDF {
foreach($this->multipleFactureData as $factureData){ foreach($this->multipleFactureData as $factureData){
$factureType = $factureData["facture_type"]; $factureType = $factureData["facture_type"];
if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){ if($factureType == MultipleFactureTypeConstant::CLIENT_FILTER_TYPE){
$filename = mb_strtoupper($factureData["client_entreprise"],'UTF-8'); $filename = mb_strtoupper($factureData["client_prenom"],'UTF-8');
} }
else{ else{
$filename = 'GROUP_'.mb_strtoupper($factureData["client_entreprise"],'UTF-8'); $filename = 'GROUP_'.mb_strtoupper($factureData["client_nom"],'UTF-8');
} }
$filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :''; $filename .= $month != 0 ? '_'.DateHelpers::GetMonthPlainString($month) :'';
$filename .= "_".$year; $filename .= "_".$year;

2
gestion/lib/Service/InvoicePdfService.php
View File

@ -101,7 +101,7 @@ class InvoicePdfService {
} }
private function getFacturesFolder(array $factureData,$racinePath){ private function getFacturesFolder(array $factureData,$racinePath){
$clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_entreprise"],'UTF-8').'/'; $clientRacineFolder = $racinePath.'CLIENTS/'.mb_strtoupper($factureData["client_nom"],'UTF-8').'/';
$defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/'; $defuntsFolder = $clientRacineFolder.'DEFUNTS/'.mb_strtoupper($factureData['defunt_nom'],'UTF-8').'/'.'FACTURES'.'/';
$devisDate = $factureData['devis_date']; $devisDate = $factureData['devis_date'];
$devisDatetime = new DateTime($devisDate); $devisDatetime = new DateTime($devisDate);