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

Fix look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-01-16 14:10:37 +01:00
parent 4864808e4d
commit 68302d74ba
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -320,10 +320,13 @@ if ($nolinesbefore) {
echo '</div>'; echo '</div>';
} }
if (is_object($objectline)) { if (is_object($objectline)) {
$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');;
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">'; print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
print $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line'); print $temps;
print '</div>'; print '</div>';
} }
}
echo '</td>'; echo '</td>';
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines
{ {

5
htdocs/core/tpl/objectline_edit.tpl.php
View File

@ -128,10 +128,13 @@ $coldisplay++;
//Line extrafield //Line extrafield
if (!empty($extrafields)) if (!empty($extrafields))
{ {
$temps = $line->showOptionals($extrafields, 'edit', array('class'=>'tredited'), '', '', 1, 'line');
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">'; print '<div style="padding-top: 10px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
print $line->showOptionals($extrafields, 'edit', array('class'=>'tredited'), '', '', 1, 'line'); print $temps
print '</div>'; print '</div>';
} }
}
// Show autofill date for recuring invoices // Show autofill date for recuring invoices
if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec') if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')

5
htdocs/core/tpl/objectline_view.tpl.php
View File

@ -160,10 +160,13 @@ if (($line->info_bits & 2) == 2) {
//Line extrafield //Line extrafield
if (!empty($extrafields)) if (!empty($extrafields))
{ {
$temps = $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
if (!empty($temps)) {
print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">'; print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
print $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line'); print $temps;
print '</div>'; print '</div>';
} }
}
} }
if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0) if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0)