diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index e3dd89a6bc0..b1e4a0bb0e8 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -120,9 +120,41 @@ $arraydetailsforpdffoot = array( 3 => $langs->transnoentitiesnoconv('DisplayCompanyInfoAndManagers') ); +$s = $langs->trans("LibraryToBuildPDF")."
"; +$i = 0; +$pdf = pdf_getInstance('A4'); +if (class_exists('FPDF') && !class_exists('TCPDF')) +{ + if ($i) $s .= ' + '; + $s .= 'FPDF'; + $s .= ' ('.@constant('FPDF_PATH').')'; + $i++; +} +if (class_exists('TCPDF')) +{ + if ($i) $s .= ' + '; + $s .= 'TCPDF'; + $s .= ' ('.@constant('TCPDF_PATH').')'; + $i++; +} +if (class_exists('FPDI')) +{ + if ($i) $s .= ' + '; + $s .= 'FPDI'; + $s .= ' ('.@constant('FPDI_PATH').')'; + $i++; +} +if (class_exists('TCPDI')) +{ + if ($i) $s .= ' + '; + $s .= 'TCPDI'; + $s .= ' ('.@constant('TCPDI_PATH').')'; + $i++; +} + print load_fiche_titre($langs->trans("PDF"), '', 'title_setup'); -print ''.$langs->trans("PDFDesc")."
\n"; +print ''.$form->textwithpicto($langs->trans("PDFDesc"), $s)."
\n"; print "
\n"; $noCountryCode = (empty($mysoc->country_code) ? true : false); @@ -316,62 +348,6 @@ print ''; print ''; print ''; - -/* - * Library - */ - -print '
'; -print load_fiche_titre($langs->trans("Library"), '', ''); - -print '
'; -print ''."\n"; - -print ''."\n"; -print ''."\n"; -print ''."\n"; -print "\n"; - -print ''."\n"; -print ''."\n"; -print ''."\n"; -print ''."\n"; - -print "
'.$langs->trans("Name").''.$langs->trans("Value").'
'.$langs->trans("LibraryToBuildPDF").''; -$i = 0; -$pdf = pdf_getInstance('A4'); -if (class_exists('FPDF') && !class_exists('TCPDF')) -{ - if ($i) print ' + '; - print 'FPDF'; - print ' ('.@constant('FPDF_PATH').')'; - $i++; -} -if (class_exists('TCPDF')) -{ - if ($i) print ' + '; - print 'TCPDF'; - print ' ('.@constant('TCPDF_PATH').')'; - $i++; -} -if (class_exists('FPDI')) -{ - if ($i) print ' + '; - print 'FPDI'; - print ' ('.@constant('FPDI_PATH').')'; - $i++; -} -if (class_exists('TCPDI')) -{ - if ($i) print ' + '; - print 'TCPDI'; - print ' ('.@constant('TCPDI_PATH').')'; - $i++; -} -print '
\n"; -print '
'; - - print '
'; print ''; print '
'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 17b71553395..256d29ed6de 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -387,7 +387,7 @@ ModuleMustBeEnabledFirst=Module %s must be enabled first if you need this SecurityToken=Key to secure URLs NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s PDF=PDF -PDFDesc=Global options for PDF generation. +PDFDesc=Global options for PDF generation PDFAddressForging=Rules for address boxes HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT PDFRulesForSalesTax=Rules for Sales Tax / VAT