diff --git a/htdocs/core/modules/commande/doc/pdf_edison.modules.php b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
index 962100e8b161f9d1a7391e2d87700984c0391fba..894efc2d7bec907e695d00cc611237f23facfbf5 100644
--- a/htdocs/core/modules/commande/doc/pdf_edison.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_edison.modules.php
@@ -547,7 +547,7 @@ class pdf_edison extends ModelePDFCommandes
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index b264fa4c73e9c3aaec9f1dfe3dc9597dbd12ab7e..f14dc4199abbc939171f09604f062b35864d049b 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -606,7 +606,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
$useborder=0;
$index = 0;
@@ -890,7 +890,7 @@ class pdf_einstein extends ModelePDFCommandes
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); // width=0 (auto), max height=24
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
index a76aea8c5b853bc4c3c9a7dd8f4b046bb13242d4..e5c8a7099cb40bdd4fba5c4147c11da17ea602a2 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -382,7 +382,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
{
if (is_readable($logo))
{
- $pdf->Image($logo,10, 5, 0, 22);
+ $pdf->Image($logo,10, 5, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index 6b1a62e8f3aa7536784b6bdaa422ffb972b71fd6..07be573a5d669346c7528487f328acf5551de18e 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -344,7 +344,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 3c14c48405793790e9e4856a9cfba50e290491ae..ea9987acc97a38181eee909d63da7e120fc7d3f7 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -727,7 +727,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
$useborder=0;
$index = 0;
@@ -1034,7 +1034,7 @@ class pdf_crabe extends ModelePDFFactures
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24); // width=0 (auto), max height=24
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
index ee1e51d3c8671c7c61a91125fd245abba9523155..3d17e5b4b496ece8be8d06a89f706314230ec9f9 100755
--- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php
@@ -617,8 +617,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164;
- $lltot = 200; $largcol2 = $lltot - $col2x;
+ $col1x=$this->marges['g']+110; $col2x=$this->marges['g']+164; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
$pdf->SetXY($this->marges['g'], $tab2_top + 0);
@@ -837,7 +836,7 @@ class pdf_oursin extends ModelePDFFactures
{
$taille=getimagesize($logo);
$length=$taille[0]/2.835;
- $pdf->Image($logo, $this->marges['g'], $this->marges['h'], 0, 24);
+ $pdf->Image($logo, $this->marges['g'], $this->marges['h'], 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index e6ed5c267dbdb06144e6cb368bed872934cb2729..1309cc243b567d5b339700ce13249bcb58b1c191 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -445,7 +445,7 @@ class pdf_soleil extends ModelePDFFicheinter
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
index 000b5537424139e043b42d0bc804b73bea556b7e..96fd21e87ee1e1b6ffd051346170935c3a5a2436 100644
--- a/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
@@ -511,7 +511,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
index 11b9fab9f42514d5f2dca9e406127283d9800882..db1adedfb2fd9a0fbdd212c35f07bbe9bab23227 100644
--- a/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/pdf/pdf_baleine.modules.php
@@ -352,7 +352,7 @@ class pdf_baleine extends ModelePDFProjects
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index e5218d17829fa3376be9ffcea57066f98ca5cca8..37a50c6400707ce253b7b8a8119aae771ccf59d4 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -623,7 +623,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
// Total HT
$pdf->SetFillColor(255,255,255);
@@ -924,7 +924,7 @@ class pdf_azur extends ModelePDFPropales
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
index 5673b38463fad74823a92b1e5306a03eba034821..81743d362f567606c57181226d7d5234738db3c9 100644
--- a/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_jaune.modules.php
@@ -609,7 +609,7 @@ class pdf_jaune extends ModelePDFPropales
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
// Total HT
$pdf->SetFillColor(255,255,255);
@@ -909,7 +909,7 @@ class pdf_jaune extends ModelePDFPropales
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 490866ea6550cd2478f3e0296718fce0d78e8c07..f1f66f6b3865ad1d6773a212de67d5ed041983e2 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -457,7 +457,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
}
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
// Total HT
$pdf->SetFillColor(255,255,255);
@@ -805,7 +805,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index da2c981e998f09d28e8e02448005c4e5b46111fe..0873468a3c57a446ccb9d8a9bd688383595db838 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -595,7 +595,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetFont('','', $default_font_size - 1);
// Tableau total
- $lltot = 200; $col1x = 120; $col2x = 170; $largcol2 = $lltot - $col2x;
+ $col1x = 120; $col2x = 170; $largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
$useborder=0;
$index = 0;
@@ -874,7 +874,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
{
if (is_readable($logo))
{
- $pdf->Image($logo, $this->marge_gauche, $posy, 0, 24);
+ $pdf->Image($logo, $this->marge_gauche, $posy, 0, 22); // width=0 (auto), max height=22
}
else
{