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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-15 03:34:08 +02:00
commit fd0e3861b0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/website.php
View File

@ -95,7 +95,7 @@ $tabfield[1] = "ref,description,virtualhost,position,date_creation";
// Nom des champs d'edition pour modification d'un enregistrement // Nom des champs d'edition pour modification d'un enregistrement
$tabfieldvalue = array(); $tabfieldvalue = array();
$tabfieldvalue[1] = "ref,description,virtualhost,position"; $tabfieldvalue[1] = "ref,description,virtualhost,position,entity";
// Nom des champs dans la table pour insertion d'un enregistrement // Nom des champs dans la table pour insertion d'un enregistrement
$tabfieldinsert = array(); $tabfieldinsert = array();

2
htdocs/compta/bank/class/account.class.php
View File

@ -1206,7 +1206,7 @@ class Account extends CommonObject
* Return current sold * Return current sold
* *
* @param int $option 1=Exclude future operation date (this is to exclude input made in advance and have real account sold) * @param int $option 1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
* @param tms $date_end Date until we want to get bank account sold * @param int $date_end Date until we want to get bank account sold
* @param string $field dateo or datev * @param string $field dateo or datev
* @return int current sold (value date <= today) * @return int current sold (value date <= today)
*/ */

4
htdocs/core/class/extrafields.class.php
View File

@ -1709,7 +1709,9 @@ class ExtraFields
$toprint = array(); $toprint = array();
if (is_array($value_arr)) { if (is_array($value_arr)) {
foreach ($value_arr as $keyval => $valueval) { foreach ($value_arr as $keyval => $valueval) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>'; if (!empty($valueval)) {
$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
}
} }
} }
$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>'; $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';