Fix warning
This commit is contained in:
parent
147a12a922
commit
fab9b3d50c
@ -24,6 +24,11 @@
|
|||||||
|
|
||||||
class WorkboardResponse
|
class WorkboardResponse
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* Unique key of the workboard
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
public $id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Image URL to represent the board item
|
* Image URL to represent the board item
|
||||||
|
|||||||
@ -593,9 +593,10 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
|
|||||||
//Remove any invalid response
|
//Remove any invalid response
|
||||||
//load_board can return an integer if failed or WorkboardResponse if OK
|
//load_board can return an integer if failed or WorkboardResponse if OK
|
||||||
$valid_dashboardlines = array();
|
$valid_dashboardlines = array();
|
||||||
foreach ($dashboardlines as $infoKey => $tmp) {
|
foreach ($dashboardlines as $workboardid => $tmp) {
|
||||||
if ($tmp instanceof WorkboardResponse) {
|
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) {
|
foreach ($dashboardgroup as $groupKey => $groupElement) {
|
||||||
$boards = array();
|
$boards = array();
|
||||||
|
|
||||||
if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
|
if (empty($conf->global->MAIN_DISABLE_NEW_OPENED_DASH_BOARD)) {
|
||||||
foreach ($groupElement['stats'] as $infoKey) {
|
foreach ($groupElement['stats'] as $infoKey) {
|
||||||
if (!empty($valid_dashboardlines[$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("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").')';
|
$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 .= '<br><span class="opacitymedium">'.$langs->trans("IfYouDontReconcileDisableProperty", $langs->transnoentitiesnoconv("Conciliable")).'</span>';
|
||||||
|
}
|
||||||
|
|
||||||
$textLate = '';
|
$textLate = '';
|
||||||
if ($board->nbtodolate > 0) {
|
if ($board->nbtodolate > 0) {
|
||||||
$textLate .= '<span title="'.dol_htmlentities($textLateTitle).'" class="classfortooltip badge badge-warning">';
|
$textLate .= '<span title="'.dol_escape_htmltag($textLateTitle).'" class="classfortooltip badge badge-warning">';
|
||||||
$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
|
$textLate .= '<i class="fa fa-exclamation-triangle"></i> '.$board->nbtodolate;
|
||||||
$textLate .= '</span>';
|
$textLate .= '</span>';
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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 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 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.
|
-- 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)
|
-- 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)
|
||||||
|
|||||||
@ -179,3 +179,4 @@ BankColorizeMovement=Colorize movements
|
|||||||
BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
|
BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
|
||||||
BankColorizeMovementName1=Background color for debit movement
|
BankColorizeMovementName1=Background color for debit movement
|
||||||
BankColorizeMovementName2=Background color for credit 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.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user