lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-05 14:56:01 +01:00
parent c09009d088
commit a2bb64354b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
View File

@ -651,16 +651,11 @@ class pdf_sponge extends ModelePDFFactures
else else
{ {
// We found a page break // We found a page break
<<<<<<< HEAD
$showpricebeforepagebreak = 0;
=======
// Allows data in the first page if description is long enough to break in multiples pages // 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)) if(!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
$showpricebeforepagebreak = 1; $showpricebeforepagebreak = 1;
else else
$showpricebeforepagebreak = 0; $showpricebeforepagebreak = 0;
>>>>>>> branch '11.0' of git@github.com:Dolibarr/dolibarr.git
} }
} }
else // No pagebreak else // No pagebreak