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

Compare commits

merge into: root:production-hfc
Branches Tags
root:production-hfc
root:feat-tva-multi
root:develop-tolotsoa
root:develop-ezway
root:production
...
pull from: root:production
Branches Tags
root:production-hfc
root:feat-tva-multi
root:develop-tolotsoa
root:develop-ezway
root:production

37 Commits
production ... production

Author SHA1 Message Date
narindraezway
5a880677c4 Merge branch 'staging' into production 2025-07-09 13:50:01 +03:00
Tiavina
f2f737d6f8 Merge branch 'staging' into production 2025-06-10 17:01:09 +03:00
Tiavina
024df6bcd8 Merge branch 'staging' into production 2025-06-10 15:30:32 +03:00
narindraezway
2b867f27ea Merge branch 'staging' into production 2025-06-05 10:56:58 +03:00
Tiavina
416f4b030a Merge branch 'staging' into production 2025-06-02 15:08:10 +03:00
Tiavina
2d3196ffe4 Merge branch 'staging' into production 2025-05-20 10:21:57 +03:00
narindraezway
fc37e8583d Merge branch 'staging' into production 2025-05-07 15:04:42 +03:00
Tiavina
db6839451b Merge branch 'staging' into production 2025-05-06 16:21:58 +03:00
narindraezway
625e81ac30 Merge branch 'staging' into production 2025-05-05 13:45:31 +03:00
Tiavina
fbce8789c1 Merge branch 'staging' into production 2025-04-30 18:10:30 +03:00
Tiavina
5396c6ad1b Merge branch 'staging' into production 2025-04-30 18:05:52 +03:00
Tiavina
01f9176d32 Merge branch 'staging' into production 2025-04-30 17:51:15 +03:00
Tiavina
f5d1426d12 Merge remote-tracking branch 'origin/staging' into production 2025-04-25 17:30:53 +03:00
Tiavina
8f13e48206 Merge branch 'staging' into production 2025-04-25 15:06:17 +03:00
Tiavina Handrianina
459fda7106 Merge branch 'staging' into 'production' 
HOTFIXESdevis list group facturation redirect

See merge request sottye/hytha35!6
 2025-04-15 12:27:05 +00:00
Tiavina Handrianina
45f0f81c03 Merge branch 'staging' into 'production' 
HOTFIXES OVERRIDE TEMPLATE TYPE CODE

See merge request sottye/hytha35!5
 2025-04-15 11:16:07 +00:00
Tiavina Handrianina
1c4a972222 Merge branch 'staging' into 'production' 
Deploying facturation at any date for HYTHA 35

See merge request sottye/hytha35!4
 2025-04-15 10:16:44 +00:00
Tiavina Handrianina
d065671291 Merge branch 'staging' into 'production' 
Deploying compte comptable into production

See merge request sottye/hytha35!3
 2025-04-14 13:07:56 +00:00
Tiavina Handrianina
5512c23004 Merge branch 'staging' into 'production' 
Merge staging into production

See merge request sottye/hytha35!2
 2025-04-10 15:23:52 +00:00
Tiavina
3ea9d4ed52 Merge remote-tracking branch 'origin/staging' into releases/release-hytha-prod 2025-04-07 16:53:43 +03:00
Tiavina
602466d9a9 Merge branch 'staging' into releases/release-hytha-prod 2025-04-04 19:43:40 +03:00
Tiavina
b1fabe9804 Merge branch 'staging' into releases/release-hytha-prod 2025-03-27 08:51:59 +03:00
Tiavina
2bbfe390eb Merge branch 'staging' into releases/release-hytha-prod 2025-03-26 19:55:15 +03:00
Tiavina
12a751c1c3 Merge branch 'staging' into releases/release-hytha-prod 2025-03-26 19:43:51 +03:00
Tiavina
0276655040 Merge branch 'features/feature-devis-group' into releases/release-hytha-prod 2025-03-26 13:06:50 +03:00
Tiavina
5ab91d4be7 Merge branch 'staging' into releases/release-hytha-prod 2025-03-25 13:34:15 +03:00
Tiavina
91c67452c2 Merge branch 'staging' into releases/release-hytha-prod 2025-03-21 09:29:13 +03:00
Tiavina
31633b04d9 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 11:38:00 +03:00
Tiavina
dc3da8d425 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:50:02 +03:00
Tiavina
ea119f5c73 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:43:24 +03:00
Tiavina
4bd86ae762 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:30:55 +03:00
Tiavina
2c1e771472 Merge branch 'hotfixes/hotfix-update-client' into releases/release-hytha-prod 2025-03-19 10:13:45 +03:00
Tiavina
c07c4aaf88 Merge branch 'staging' into releases/release-hytha-prod 2025-03-18 10:19:21 +03:00
Tiavina
95be6e4827 Merge branch 'staging' into releases/release-hytha-prod 2025-03-17 16:16:16 +03:00
Tiavina
e7c51a4d73 Merge branch 'fixes/fix-rapport-bijoux-text' into releases/release-hytha-prod 2025-03-13 12:06:47 +03:00
Tiavina
f509f5e988 Merge branch 'staging' into releases/release-hytha-prod 2025-03-13 10:53:37 +03:00
Tiavina
f8ff4c6b3e Merge branch 'hotfixes/hotfixe-show-facture-case-and-order-number' into releases/release-hytha-prod 2025-03-07 13:17:00 +03:00
3 changed files with 39 additions and 39 deletions
Show Stats Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class DevisPdfHandler extends FPDF {
function Header() function Header()
{ {
if($this->logo != "nothing"){ if($this->logo != "nothing"){
$this->Image($this->logoPath."logo.png", 2, 2, 50,35); $this->Image($this->logoPath."logo.png", 10, 10, 75, 25);
} }
else{ else{
$this->Cell(55,30,''); $this->Cell(55,30,'');

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

@ -48,7 +48,7 @@ class InvoicePdfHandler extends FPDF
private $articleTablesHeight = 130; private $articleTablesHeight = 130;
public $interLigneHeader = 5; public $interLigneHeader = 5;
function Header() function Header()
{ {
if ($this->logo != "nothing") { if ($this->logo != "nothing") {
@ -77,7 +77,7 @@ class InvoicePdfHandler extends FPDF
$height = $originalHeight * $scale; $height = $originalHeight * $scale;
// Calculer la position pour centrer l'image // Calculer la position pour centrer l'image
$x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm $x = (210 - $width) / 2 + 15; // Décalage à droite de 15 mm
$y = ((297 - $height) / 2 ) + 21; // 297 mm est la hauteur d'une page A4 $y = ((297 - $height) / 2) + 21; // 297 mm est la hauteur d'une page A4
// Ajouter l'image en filigrane // Ajouter l'image en filigrane
$this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur $this->Image($imagePath, $x, $y, $width, $height); // Chemin, position x, position y, largeur, hauteur
@ -96,13 +96,13 @@ class InvoicePdfHandler extends FPDF
function Footer() function Footer()
{ {
$this->SetY(-34); $this->SetY(-34);
$this->SetFont('ComicSans', '', 7); $this->SetFont('ComicSans', '', 7);
$this->MultiCell(0,4,utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal '))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode('Tout retard de paiement entraînera de plein droit une pénalité de retard de 3 fois le taux légal ')));
$this->MultiCell(0,4,utf8_decode(html_entity_decode('(Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.'))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode('(Loi 2008-776 du 4 août 2008) et une indemnité forfaitaire de 40 EUR pour frais de recouvrement sera appliquée.')));
$this->Ln(1); $this->Ln(1);
$this->MultiCell(0,4,utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire'))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode('Si les frais de recouvrement sont supérieurs à ce montant forfaitaire, une indemnisation complémentaire')));
$this->MultiCell(0,4,utf8_decode(html_entity_decode('sera due sur présentation de justificatifs (articles L.441-3 et L.441-6 du code de commerce).'))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode('sera due sur présentation de justificatifs (articles L.441-3 et L.441-6 du code de commerce).')));
$this->SetY(-10); $this->SetY(-10);
$this->SetFont('ComicSans', '', 7); $this->SetFont('ComicSans', '', 7);
@ -204,7 +204,7 @@ class InvoicePdfHandler extends FPDF
$this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city']))); $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
$clientInfoYAxis += $this->interLigneHeader; $clientInfoYAxis += $this->interLigneHeader;
$this->SetXY($clientInfoXAxis, $clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, $this->interLigneHeader,'Siret: ' . $this->factureData['siret']); $this->Cell(0, $this->interLigneHeader, 'Siret: ' . $this->factureData['siret']);
$clientInfoYAxis += $this->interLigneHeader; $clientInfoYAxis += $this->interLigneHeader;
$this->SetXY($clientInfoXAxis, $clientInfoYAxis); $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
$this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']); $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']);
@ -268,16 +268,16 @@ class InvoicePdfHandler extends FPDF
$this->SetLineWidth(0.2); $this->SetLineWidth(0.2);
$gapBetweenStartingOfArticlesTableAndColumnName = 8; $gapBetweenStartingOfArticlesTableAndColumnName = 8;
$tableHeight = $this->thereIsOrderOrCaseNumber ? $this->articleTablesHeight : $this->articleTablesHeight + 9; $tableHeight = $this->thereIsOrderOrCaseNumber ? $this->articleTablesHeight : $this->articleTablesHeight + 9;
$this->Rect(3, $this->startingYOfArticlesTable , 204, $tableHeight, "D"); $this->Rect(3, $this->startingYOfArticlesTable, 204, $tableHeight, "D");
// cadre titre des colonnes // cadre titre des colonnes
$this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName); $this->Line(3, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName, 207, $this->startingYOfArticlesTable + $gapBetweenStartingOfArticlesTableAndColumnName);
// les traits verticaux colonnes // les traits verticaux colonnes
$additionalMargRight = 1; $additionalMargRight = 1;
$endingLine = $this->thereIsOrderOrCaseNumber ? 231 : 230; // mois +1 pour le groupe $endingLine = $this->thereIsOrderOrCaseNumber ? 231 : 230; // mois +1 pour le groupe
$this->Line(27 + $additionalMargRight, $this->startingYOfArticlesTable, 27+ $additionalMargRight , $endingLine); $this->Line(27 + $additionalMargRight, $this->startingYOfArticlesTable, 27 + $additionalMargRight, $endingLine);
$this->Line(142 + $additionalMargRight, $this->startingYOfArticlesTable, 142+ $additionalMargRight , $endingLine); $this->Line(142 + $additionalMargRight, $this->startingYOfArticlesTable, 142 + $additionalMargRight, $endingLine);
$this->Line(164 + $additionalMargRight, $this->startingYOfArticlesTable, 164+ $additionalMargRight , $endingLine); $this->Line(164 + $additionalMargRight, $this->startingYOfArticlesTable, 164 + $additionalMargRight, $endingLine);
$this->Line(182 + $additionalMargRight, $this->startingYOfArticlesTable, 182+ $additionalMargRight , $endingLine); $this->Line(182 + $additionalMargRight, $this->startingYOfArticlesTable, 182 + $additionalMargRight, $endingLine);
} }
private function DrawArticlesTableHeader() private function DrawArticlesTableHeader()
@ -332,7 +332,7 @@ class InvoicePdfHandler extends FPDF
$this->Cell(5, 6, $dateValue, 0, 0); $this->Cell(5, 6, $dateValue, 0, 0);
$this->SetXY(30, $yValue); $this->SetXY(30, $yValue);
$this->MultiAlignCell($maxDescriptionWidth , 6, utf8_decode(html_entity_decode($productDescription)), 0, '0',); $this->MultiAlignCell($maxDescriptionWidth, 6, utf8_decode(html_entity_decode($productDescription)), 0, '0', );
@ -358,13 +358,13 @@ class InvoicePdfHandler extends FPDF
private function DrawBankAndTotalPriceInfo($totalPriceArray) private function DrawBankAndTotalPriceInfo($totalPriceArray)
{ {
$startOfYAfterMainTable = 236; $startOfYAfterMainTable = 236;
$this->SetY( $startOfYAfterMainTable); $this->SetY($startOfYAfterMainTable);
$this->SetFont('ComicSans', '', 8); $this->SetFont('ComicSans', '', 8);
$this->MultiCell(0,4,utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de ". $this->factureData['configuration']->entreprise))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode("Paiement à votre convenance par chèque à l'ordre de " . $this->factureData['configuration']->entreprise)));
$this->MultiCell(0,4,utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :"))); $this->MultiCell(0, 4, utf8_decode(html_entity_decode("en indiquant le numéro de facture, ou par virement :")));
$this->Ln(1); $this->Ln(1);
$startOftable = 3 ; $startOftable = 3;
$this->SetX($startOftable); $this->SetX($startOftable);
// Table IBAN // Table IBAN
$this->SetFont('ComicSans', '', 8); $this->SetFont('ComicSans', '', 8);
@ -380,15 +380,15 @@ class InvoicePdfHandler extends FPDF
// Position correcte de la 2e table // Position correcte de la 2e table
$startOfArrayX = $pageWidth - $tableWidth - $marginRight; $startOfArrayX = $pageWidth - $tableWidth - $marginRight;
$startOfArrayY = $startOfYAfterMainTable + 0.5; $startOfArrayY = $startOfYAfterMainTable + 0.5;
$this->SetFont('ComicSans', '', 10); $this->SetFont('ComicSans', '', 10);
foreach($totalPriceArray as $label => $price){ foreach ($totalPriceArray as $label => $price) {
$this->SetXY($startOfArrayX,$startOfArrayY); $this->SetXY($startOfArrayX, $startOfArrayY);
$this->Cell(24, 6.5, $label, 1, 1, 'C'); $this->Cell(24, 6.5, $label, 1, 1, 'C');
$this->SetXY($startOfArrayX + 24,$startOfArrayY); $this->SetXY($startOfArrayX + 24, $startOfArrayY);
$this->Cell(24, 6.5, number_format($price,2,'.','').chr(128), 1, 1, 'C'); $this->Cell(24, 6.5, number_format($price, 2, '.', '') . chr(128), 1, 1, 'C');
$startOfArrayY += 6.5; $startOfArrayY += 6.5;
} }
} }
@ -437,7 +437,7 @@ class InvoicePdfHandler extends FPDF
if ($w == 0) if ($w == 0)
$w = $this->w - $this->rMargin - $this->x; $w = $this->w - $this->rMargin - $this->x;
$wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize; $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
$s = str_replace("\r", '', (string)$txt); $s = str_replace("\r", '', (string) $txt);
$nb = strlen($s); $nb = strlen($s);
if ($nb > 0 && $s[$nb - 1] == "\n") if ($nb > 0 && $s[$nb - 1] == "\n")
$nb--; $nb--;

8
gestion/lib/Service/InvoiceRecap/InvoiceRecapService.php
View File

@ -171,7 +171,7 @@ class InvoiceRecapService {
// logo : 80 de largeur et 55 de hauteur // logo : 80 de largeur et 55 de hauteur
if($doesLogoExist){ if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
} }
//adresse de mon entreprise //adresse de mon entreprise
@ -276,7 +276,7 @@ class InvoiceRecapService {
$pdf->SetMargins(0,0,10); $pdf->SetMargins(0,0,10);
if($doesLogoExist){ if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
} }
//adresse de mon entreprise //adresse de mon entreprise
@ -589,7 +589,7 @@ class InvoiceRecapService {
// logo : 80 de largeur et 55 de hauteur // logo : 80 de largeur et 55 de hauteur
if($doesLogoExist){ if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
} }
//adresse de mon entreprise //adresse de mon entreprise
@ -692,7 +692,7 @@ class InvoiceRecapService {
$pdf->SetAutoPagebreak(False); $pdf->SetAutoPagebreak(False);
$pdf->SetMargins(0,0,10); $pdf->SetMargins(0,0,10);
if($doesLogoExist){ if($doesLogoExist){
$pdf->Image($this->defaultImagePath."logo.png", 2, 2, 50,35); $pdf->Image($this->defaultImagePath."logo.png", 10, 10, 75, 25);
} }
//adresse de mon entreprise //adresse de mon entreprise