FIX: #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
This commit is contained in:
parent
ad2e10a679
commit
ed269a387f
@ -440,7 +440,12 @@ class pdf_einstein extends ModelePDFCommandes
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -572,7 +572,13 @@ class pdf_eratosthene extends ModelePDFCommandes
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -610,7 +616,13 @@ class pdf_eratosthene extends ModelePDFCommandes
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -391,7 +391,13 @@ class pdf_strato extends ModelePDFContract
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -433,7 +433,13 @@ class pdf_espadon extends ModelePdfExpedition
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -475,7 +481,13 @@ class pdf_espadon extends ModelePdfExpedition
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -452,7 +452,13 @@ class pdf_rouget extends ModelePdfExpedition
|
|||||||
$pdf->setPage($pageposbefore + 1);
|
$pdf->setPage($pageposbefore + 1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -494,7 +500,13 @@ class pdf_rouget extends ModelePdfExpedition
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -385,7 +385,13 @@ class pdf_standard extends ModeleExpenseReport
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -494,7 +494,13 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
$pdf->setPage($pageposbefore + 1);
|
$pdf->setPage($pageposbefore + 1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -534,7 +540,13 @@ class pdf_crabe extends ModelePDFFactures
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -600,7 +600,13 @@ class pdf_sponge extends ModelePDFFactures
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -639,7 +645,13 @@ class pdf_sponge extends ModelePDFFactures
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -409,7 +409,13 @@ class pdf_typhon extends ModelePDFDeliveryOrder
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -362,7 +362,13 @@ class pdf_baleine extends ModelePDFProjects
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
$forcedesconsamepage=1;
|
$forcedesconsamepage=1;
|
||||||
if ($forcedesconsamepage)
|
if ($forcedesconsamepage)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -512,7 +512,13 @@ class pdf_beluga extends ModelePDFProjects
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
$forcedesconsamepage=1;
|
$forcedesconsamepage=1;
|
||||||
if ($forcedesconsamepage)
|
if ($forcedesconsamepage)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -293,7 +293,13 @@ class pdf_timespent extends ModelePDFProjects
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
$forcedesconsamepage=1;
|
$forcedesconsamepage=1;
|
||||||
if ($forcedesconsamepage)
|
if ($forcedesconsamepage)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -502,7 +502,13 @@ class pdf_azur extends ModelePDFPropales
|
|||||||
$pdf->setPage($pageposbefore + 1);
|
$pdf->setPage($pageposbefore + 1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -543,7 +549,13 @@ class pdf_azur extends ModelePDFPropales
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -582,7 +582,13 @@ class pdf_cyan extends ModelePDFPropales
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -624,7 +630,13 @@ class pdf_cyan extends ModelePDFPropales
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -374,7 +374,13 @@ class pdf_squille extends ModelePdfReception
|
|||||||
$pdf->setPage($pageposbefore + 1);
|
$pdf->setPage($pageposbefore + 1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
if (isset($imglinesize['width']) && isset($imglinesize['height']))
|
||||||
@ -417,7 +423,13 @@ class pdf_squille extends ModelePdfReception
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak = 0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -383,7 +383,13 @@ class pdf_standard extends ModelePDFStock
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -543,7 +543,13 @@ class pdf_stdmovement extends ModelePDFMovement
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -430,7 +430,13 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -523,7 +523,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
||||||
@ -564,7 +570,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -445,7 +445,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
||||||
@ -492,7 +498,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -365,7 +365,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
@ -430,7 +430,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
|
|||||||
$pdf->setPage($pageposbefore+1);
|
$pdf->setPage($pageposbefore+1);
|
||||||
|
|
||||||
$curY = $tab_top_newpage;
|
$curY = $tab_top_newpage;
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
|
||||||
@ -480,7 +486,13 @@ class pdf_aurore extends ModelePDFSupplierProposal
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// We found a page break
|
// We found a page break
|
||||||
$showpricebeforepagebreak=0;
|
|
||||||
|
// Allows data in the first page if description is long enough to break in multiples pages
|
||||||
|
if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
|
||||||
|
$showpricebeforepagebreak = 1;
|
||||||
|
else
|
||||||
|
$showpricebeforepagebreak = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else // No pagebreak
|
else // No pagebreak
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user