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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-26 11:00:58 +01:00
parent aba43b3e35
commit 2670d4fc17
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.form.class.php
View File

@ -316,6 +316,13 @@ class Form
$arraylist[$tmp[0]] = $tmp[1]; $arraylist[$tmp[0]] = $tmp[1];
} }
$ret .= $arraylist[$value]; $ret .= $arraylist[$value];
if ($htmlname == 'fk_product_type') {
if ($value == 0) {
$ret = img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
} else {
$ret = img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
}
}
} elseif (preg_match('/^ckeditor/', $typeofdata)) { } elseif (preg_match('/^ckeditor/', $typeofdata)) {
$tmpcontent = dol_htmlentitiesbr($value); $tmpcontent = dol_htmlentitiesbr($value);
if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

1
htdocs/product/card.php
View File

@ -1813,7 +1813,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Type // Type
if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
{ {
// TODO change for compatibility with edit in place
$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service"); $typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type'); print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');

9
htdocs/product/list.php
View File

@ -1113,17 +1113,10 @@ if ($resql)
{ {
print '<td class="center">'; print '<td class="center">';
$s = ''; $s = '';
if ($obj->fk_product_type == 0) if ($obj->fk_product_type == 0) {
{
//$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"'); $s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
//$s .= dol_substr($langs->trans("Product"), 0, 1);
//$s .= '</a>';
} else { } else {
//$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"'); $s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
//$s .= dol_substr($langs->trans("Service"), 0, 1);
//$s .= '</a>';
} }
print $s; print $s;
print '</td>'; print '</td>';