diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php index e2d9cc2c0d7..ac1d8fe9676 100644 --- a/htdocs/core/class/workboardresponse.class.php +++ b/htdocs/core/class/workboardresponse.class.php @@ -24,6 +24,11 @@ class WorkboardResponse { + /** + * Unique key of the workboard + * @var string + */ + public $id; /** * Image URL to represent the board item diff --git a/htdocs/index.php b/htdocs/index.php index 5290e2623a2..706e9a1a1ef 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -593,9 +593,10 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { //Remove any invalid response //load_board can return an integer if failed or WorkboardResponse if OK $valid_dashboardlines = array(); - foreach ($dashboardlines as $infoKey => $tmp) { + foreach ($dashboardlines as $workboardid => $tmp) { if ($tmp instanceof WorkboardResponse) { - $valid_dashboardlines[$infoKey] = $tmp; + $tmp->id = $workboardid; // Complete the object to add its id into its name + $valid_dashboardlines[$workboardid] = $tmp; } } @@ -651,7 +652,6 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { foreach ($dashboardgroup as $groupKey => $groupElement) { $boards = array(); - if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) { foreach ($groupElement['stats'] as $infoKey) { if (!empty($valid_dashboardlines[$infoKey])) { @@ -719,9 +719,13 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate); $textLateTitle .= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')'; + if ($board->id == 'bank_account') { + $textLateTitle .= '
'.$langs->trans("IfYouDontReconcileDisableProperty", $langs->transnoentitiesnoconv("Conciliable")).''; + } + $textLate = ''; if ($board->nbtodolate > 0) { - $textLate .= ''; + $textLate .= ''; $textLate .= ' '.$board->nbtodolate; $textLate .= ''; } diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index fca9b8dbe23..033db4620d1 100644 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -470,6 +470,14 @@ UPDATE llx_chargesociales SET date_creation = tms WHERE date_creation IS NULL; -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE'; -- VMYSQL4.1 update llx_facture_fourn set date_lim_reglement = null where DATE(STR_TO_DATE(date_lim_reglement, '%Y-%m-%d')) IS NULL; +-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES'; +-- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL; +-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE'; +-- VMYSQL4.1 update llx_inventory set date_cre = null where DATE(STR_TO_DATE(date_cre, '%Y-%m-%d')) IS NULL; + +-- Note that you can manually set the default value of a date to CURRENT_TIMESTAMP with: +--ALTER TABLE llx_table modify column columnname datetime DEFAULT CURRENT_TIMESTAMP; + -- Backport a change of value into the hourly rate. -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null) diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index ffe5ee9ca1c..9500a5b8b2e 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -179,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.