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

Merge branch 'hotfixes/hotfix-chrono-facture-update-date-paiement' into staging

Browse Source
This commit is contained in:
Tiavina 2025-03-03 11:34:13 +03:00
commit 00a21e60b7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4488,6 +4488,7 @@ class Bdd {
$facture["totalHt"] = $factureTotalHt; $facture["totalHt"] = $factureTotalHt;
$facture["totalTtc"] = $factureTotalTtc; $facture["totalTtc"] = $factureTotalTtc;
$facture["totalTva"] = $factureTotalTva; $facture["totalTva"] = $factureTotalTva;
$facture["isFactureClientGroup"] = !$isFactureSingleClient;
return $facture; return $facture;
} }
} }

4
gestion/templates/content/factureGroupDetails.php
View File

@ -5,6 +5,7 @@ use OCA\Gestion\Helpers\PriceHelpers;
$facture = $_['facture']; $facture = $_['facture'];
$factureOrderNumber = $facture->facture_order_number == '' ? '-' : $facture->facture_order_number; $factureOrderNumber = $facture->facture_order_number == '' ? '-' : $facture->facture_order_number;
$factureCaseNumber = $facture->facture_case_number == '' ? '-' : $facture->facture_case_number; $factureCaseNumber = $facture->facture_case_number == '' ? '-' : $facture->facture_case_number;
$isFactureClientGroup = $facture->isFactureClientGroup;
$currentConfig = json_decode($_['configuration'])[0]; $currentConfig = json_decode($_['configuration'])[0];
?> ?>
<div class="bootstrap-iso"> <div class="bootstrap-iso">
@ -41,7 +42,10 @@ $currentConfig = json_decode($_['configuration'])[0];
<p style="min-height:180px;" <p style="min-height:180px;"
class="p-3 m-0 h-100 text-center text-dark text-center border border-top-0 border-2 border-dark"> class="p-3 m-0 h-100 text-center text-dark text-center border border-top-0 border-2 border-dark">
<span><?php echo $facture->group_name; ?></span><br /> <span><?php echo $facture->group_name; ?></span><br />
<?php if($isFactureClientGroup == false){
?>
<span><?php echo $facture->client_name; ?></span><br /> <span><?php echo $facture->client_name; ?></span><br />
<?php }?>
<span><?php echo $facture->client_address; ?></span><br /> <span><?php echo $facture->client_address; ?></span><br />
<span><?php echo $facture->mail; ?></span><br /> <span><?php echo $facture->mail; ?></span><br />
<span><?php echo $facture->siret; ?></span><br /> <span><?php echo $facture->siret; ?></span><br />