Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
This commit is contained in:
commit
f611e4fc0e
@ -1278,7 +1278,6 @@ abstract class CommonDocGenerator
|
|||||||
|
|
||||||
// for some type we need line break
|
// for some type we need line break
|
||||||
if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
|
if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
|
||||||
|
|
||||||
if ($itemsInRow > 0) {
|
if ($itemsInRow > 0) {
|
||||||
// close table row and empty cols
|
// close table row and empty cols
|
||||||
for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
|
for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
|
||||||
@ -1295,7 +1294,6 @@ abstract class CommonDocGenerator
|
|||||||
$html .= '<strong>' . $field->label . ' :</strong> ';
|
$html .= '<strong>' . $field->label . ' :</strong> ';
|
||||||
$html .= $field->content;
|
$html .= $field->content;
|
||||||
$html .= "</td>";
|
$html .= "</td>";
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$itemsInRow++;
|
$itemsInRow++;
|
||||||
$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
|
$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user