Correction bug #15929
This commit is contained in:
parent
69b49f07ff
commit
5d10fd8338
@ -302,7 +302,11 @@ class pdf_propale_azur extends ModelePDFPropales
|
|||||||
|
|
||||||
if ($nexY > 200 && $i < ($nblignes - 1))
|
if ($nexY > 200 && $i < ($nblignes - 1))
|
||||||
{
|
{
|
||||||
$this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY);
|
//$this->_tableau($pdf, $tab_top, $tab_height + 20, $nexY);
|
||||||
|
if ($pagenb == 1)
|
||||||
|
$this->_tableau($pdf, $tab_top, $nexY - $tab_top + 20, $nexY);
|
||||||
|
else
|
||||||
|
$this->_tableau($pdf, $tab_top_newpage, $nexY - $tab_top_newpage + 20, $nexY);
|
||||||
$this->_pagefoot($pdf);
|
$this->_pagefoot($pdf);
|
||||||
|
|
||||||
// Nouvelle page
|
// Nouvelle page
|
||||||
@ -319,13 +323,18 @@ class pdf_propale_azur extends ModelePDFPropales
|
|||||||
// Affiche cadre tableau
|
// Affiche cadre tableau
|
||||||
if ($pagenb == 1)
|
if ($pagenb == 1)
|
||||||
{
|
{
|
||||||
$this->_tableau($pdf, $tab_top, $tab_height, $nexY);
|
//$this->_tableau($pdf, $tab_top, $tab_height, $nexY);
|
||||||
$bottomlasttab=$tab_top + $tab_height + 1;
|
//$bottomlasttab=$tab_top + $tab_height + 1;
|
||||||
|
|
||||||
|
$this->_tableau($pdf, $tab_top, $nexY - $tab_top + 20, $nexY);
|
||||||
|
$bottomlasttab=$tab_top + $nexY - $tab_top + 20 + 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$this->_tableau($pdf, $tab_top_newpage, $tab_height, $nexY);
|
//$this->_tableau($pdf, $tab_top_newpage, $tab_height, $nexY);
|
||||||
$bottomlasttab=$tab_top_newpage + $tab_height + 1;
|
//$bottomlasttab=$tab_top_newpage + $tab_height + 1;
|
||||||
|
$this->_tableau($pdf, $tab_top_newpage, $nexY - $tab_top_newpage + 20, $nexY);
|
||||||
|
$bottomlasttab=$tab_top_newpage + $nexY - $tab_top_newpage + 20 + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
$deja_regle = "";
|
$deja_regle = "";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user