diff --git a/ChangeLog b/ChangeLog index 89a0ea246e4..b9a3e0b5794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ For users: - New: EMails links are show with function dol_print_email - New: Add graph report on number of entities in product statistics page. - New: Can delete a supplier order whatever is its status. +- New: No limit on free text on PDF generated documents. - Fix: Failed to go on the future view of bank transaction if there is no future bank transaction already wrote. - Fix: Bad ref in supplier list. diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index f0877266ca2..0e68ee76317 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -154,7 +154,10 @@ class Form */ function textwithhelp($text,$htmltext,$direction=1,$usehelpcursor=1) { - return $this->textwithtooltip($text,$htmltext,2,$direction,img_help($usehelpcursor,0)); + global $conf; + $alt=''; + if (empty($conf->use_javascript_ajax)) $alt='Help disabled (javascript disabled)'; + return $this->textwithtooltip($text,$htmltext,2,$direction,img_help($usehelpcursor,$alt)); } /** diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php index 76779fa2e94..c4d9707f346 100644 --- a/htdocs/includes/modules/action/rapport.pdf.php +++ b/htdocs/includes/modules/action/rapport.pdf.php @@ -208,9 +208,7 @@ class CommActionRapport $y2 = $pdf->GetY(); $pdf->SetXY(106,$y); - //$pdf->Cell(94, 4, eregi_replace('
',"\n",dolibarr_trunc($obj->note,150)), 0, 'L', 0); $pdf->MultiCell(94, $height, $outputlangs->convToOutputCharset($text), 0, 'L', 0); - //$pdf->writeHTMLCell(dol_htmlentitiesbr($obj->note,1)); $y3 = $pdf->GetY(); //$pdf->MultiCell(94,2,"y=$y y3=$y3",0,'L',0); diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 8388a46e177..a26a64a6266 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -324,7 +324,7 @@ class pdf_einstein extends ModelePDFCommandes //on recupere la description du produit suivant $follow_descproduitservice = $outputlangs->convToOutputCharset($com->lignes[$i+1]->desc); //on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres) - $nblineFollowDesc = (num_lines($follow_descproduitservice,52)*4); + $nblineFollowDesc = (dol_num_lines($follow_descproduitservice,52)*4); } else // If it's last line { diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 2ade047124a..4fb421a4b43 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -344,7 +344,7 @@ class pdf_crabe extends ModelePDFFactures //on récupère la description du produit suivant $follow_descproduitservice = $fac->lignes[$i+1]->desc; //on compte le nombre de ligne afin de vérifier la place disponible (largeur de ligne 52 caracteres) - $nblineFollowDesc = num_lines($follow_descproduitservice,52)*4; + $nblineFollowDesc = dol_nboflines_bis($follow_descproduitservice,52)*4; // Et si on affiche dates de validite, on ajoute encore une ligne if ($fac->lignes[$i]->date_start && $fac->lignes[$i]->date_end) { diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php index 68db8053b7d..3acb0dc78df 100644 --- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php +++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php @@ -281,7 +281,7 @@ class pdf_soleil extends ModelePDFFicheinter $pdf->SetXY (10, $tab_top + 4 + $j * $height); $pdf->writeHTMLCell(0, 4, 20, $tab_top + 4 + $j * $height, dol_htmlentitiesbr($outputlangs->convToOutputCharset($fichinterligne->desc),1), 0, 0, 0); - //$tab_height+=num_lines($fichinterligne->desc,52)*4; + //$tab_height+=dol_nboflines_bis($fichinterligne->desc,52)*4; $tab_height+=($height+4); $j++; diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php index f2ae42aebb5..c98b9117d88 100644 --- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php @@ -335,7 +335,7 @@ class pdf_propale_azur extends ModelePDFPropales //on récupère la description du produit suivant $follow_descproduitservice = $propale->lignes[$i+1]->desc; //on compte le nombre de ligne afin de vérifier la place disponible (largeur de ligne 52 caracteres) - $nblineFollowDesc = (num_lines($follow_descproduitservice,52)*4); + $nblineFollowDesc = (dol_nboflines_bis($follow_descproduitservice,52)*4); } else // If it's last line { diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index cddf5355ff2..a19f9f14501 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -1102,7 +1102,9 @@ function img_delete($alt = "default") /** * \brief Affiche logo help avec curseur "?" - * \return string Retourne tag img + * \param usehelpcursor + * \param usealttitle + * \return string Retourne tag img */ function img_help($usehelpcursor=1,$usealttitle=1) { @@ -1110,7 +1112,11 @@ function img_help($usehelpcursor=1,$usealttitle=1) $s ='theme.'/img/info.png" border="0"'; - if ($usealttitle) $s.=' alt="'.$langs->trans("Info").'" title="'.$langs->trans("Info").'"'; + if ($usealttitle) + { + if (is_string($usealttitle)) $s.=' alt="'.$usealttitle.'" title="'.$usealttitle.'"'; + else $s.=' alt="'.$langs->trans("Info").'" title="'.$langs->trans("Info").'"'; + } $s.='>'; return $s; }