From 16681ce7b00fd322a10f556bbce188dcdab69b10 Mon Sep 17 00:00:00 2001 From: thibdrev Date: Wed, 21 Aug 2024 00:25:00 +0200 Subject: [PATCH] qual: Parameter #6 $year of function dol_mktime expects int, string given. (#30693) * Update balance.php * Update export.php * Update list.php * Update listbyaccount.php * Update productMargins.php * Update thirdpartyMargins.php * Update productMargins.php --- htdocs/accountancy/bookkeeping/balance.php | 2 +- htdocs/accountancy/bookkeeping/export.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 2 +- htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/margin/tabs/productMargins.php | 4 ++-- htdocs/margin/tabs/thirdpartyMargins.php | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index fc21dd6945e..92945c6c3a6 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -102,7 +102,7 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) { $search_date_end = strtotime($fiscalYear->date_end); } else { $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year } diff --git a/htdocs/accountancy/bookkeeping/export.php b/htdocs/accountancy/bookkeeping/export.php index 4294363e751..fa9c68fa598 100644 --- a/htdocs/accountancy/bookkeeping/export.php +++ b/htdocs/accountancy/bookkeeping/export.php @@ -172,7 +172,7 @@ if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GE $search_date_end = strtotime($fiscalYear->date_end); } else { $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year } diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index b0710e6e109..88b34e5cba1 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -177,7 +177,7 @@ if (!in_array($action, array('delmouv', 'delmouvconfirm')) && !GETPOSTISSET('beg $search_date_end = strtotime($fiscalYear->date_end); } else { $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year } diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 1fff4a6a802..4c2fad27f0d 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -153,7 +153,7 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc $search_date_end = strtotime($fiscalYear->date_end); } else { $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year } diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 95694b1b193..4c8062adbbb 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -96,8 +96,8 @@ if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GET $search_invoice_date_start = strtotime($fiscalYear->date_start); $search_invoice_date_end = strtotime($fiscalYear->date_end); } else { - $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year } diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 5efcde97c71..f0fb30079af 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -105,8 +105,8 @@ if (empty($search_invoice_date_start) && empty($search_invoice_date_end) && !GET $search_invoice_date_start = strtotime($fiscalYear->date_start); $search_invoice_date_end = strtotime($fiscalYear->date_end); } else { - $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1); - $year_start = dol_print_date(dol_now(), '%Y'); + $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); + $year_start = (int) dol_print_date(dol_now(), '%Y'); if (dol_print_date(dol_now(), '%m') < $month_start) { $year_start--; // If current month is lower that starting fiscal month, we start last year }