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

integrate fix from V14

Browse Source
This commit is contained in:
John BOTELLA 2021-11-01 10:11:43 +01:00
parent c28e9f5f7c
commit 4c016cc3be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.formsetup.class.php
View File

@ -447,7 +447,7 @@ class formSetupItem
* because this two class will quickly evolve it's important to not set directly $this->type (will be protected) so this method exist * because this two class will quickly evolve it's important to not set directly $this->type (will be protected) so this method exist
* to be sure we can manage evolution easily * to be sure we can manage evolution easily
* @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type' * @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
* @deprecated yes this method came deprecated because it exists only for manage setup convertion * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup convertion
* @return bool * @return bool
*/ */
public function setTypeFromTypeString($type) public function setTypeFromTypeString($type)
@ -521,7 +521,7 @@ class formSetupItem
foreach ($ways as $way) { foreach ($ways as $way) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>'; $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
} }
$out.= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>'; $out.='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
} elseif (preg_match('/thirdparty_type/', $this->type)) { } elseif (preg_match('/thirdparty_type/', $this->type)) {
if ($this->fieldValue==2) { if ($this->fieldValue==2) {
$out.= $this->langs->trans("Prospect"); $out.= $this->langs->trans("Prospect");