';
if (!empty($mysoc->country_code)) {
- print '';
+ print '';
} else {
print $countrynotdefined;
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index da9b0271b15..b75e50e7a01 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -984,7 +984,7 @@ if (empty($reshook)) {
}
$i = 0;
foreach ($listfieldmodify as $field) {
- $keycode = $listfieldvalue[$i];
+ $keycode = empty($listfieldvalue[$i]) ? '' : $listfieldvalue[$i];
if (empty($keycode)) {
$keycode = $field;
}
@@ -1001,7 +1001,7 @@ if (empty($reshook)) {
$sql .= ",";
}
$sql .= $field."=";
- if ($listfieldvalue[$i] == 'sortorder') { // For column name 'sortorder', we use the field name 'position'
+ if ($keycode == 'sortorder') { // For column name 'sortorder', we use the field name 'position'
$sql .= GETPOSTINT('position');
} elseif (GETPOST($keycode) == '' && !($keycode == 'code' && $id == 10)) {
$sql .= "null"; // For vat, we want/accept code = ''
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index a4911e94e52..c3a08c3612f 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -3,6 +3,7 @@
* Copyright (C) 2009-2018 Regis Houssin
* Copyright (C) 2010 Juanjo Menent
* Copyright (C) 2023 Alexandre Spangaro
+ * Copyright (C) 2024 MDW
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -80,7 +81,7 @@ if ($action == 'update' && !$cancel) {
}
if ($valmainroundingruletot) {
- if ($valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1) {
+ if ((float) $valmainroundingruletot * pow(10, $valmainmaxdecimalstot) < 1) {
$langs->load("errors");
$error++;
setEventMessages($langs->trans("ErrorMAIN_ROUNDING_RULE_TOTCanMAIN_MAX_DECIMALS_TOT"), null, 'errors');
@@ -239,7 +240,7 @@ if (empty($mysoc->country_code)) {
$s = 2 / 3;
$qty = 1;
$vat = 0;
- $tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
+ $tmparray = calcul_price_total(1, $qty * (float) price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
print ''.$langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
print ' x '.$langs->trans("Quantity").": ".$qty;
print ' - '.$langs->trans("VAT").": ".$vat.'%';
@@ -248,7 +249,7 @@ if (empty($mysoc->country_code)) {
$s = 10 / 3;
$qty = 1;
$vat = 0;
- $tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
+ $tmparray = calcul_price_total(1, $qty * (float) price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
print ''.$langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
print ' x '.$langs->trans("Quantity").": ".$qty;
print ' - '.$langs->trans("VAT").": ".$vat.'%';
@@ -257,7 +258,7 @@ if (empty($mysoc->country_code)) {
$s = 10 / 3;
$qty = 2;
$vat = 0;
- $tmparray = calcul_price_total(1, $qty * price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
+ $tmparray = calcul_price_total(1, $qty * (float) price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
print ''.$langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
print ' x '.$langs->trans("Quantity").": ".$qty;
print ' - '.$langs->trans("VAT").": ".$vat.'%';
@@ -277,7 +278,7 @@ if (empty($mysoc->country_code)) {
if ($num) {
for ($i = 0; $i < $num; $i++) {
$obj = $db->fetch_object($resql);
- $vat_rates[] = array('vat_rate'=>$obj->vat_rate, 'code'=>$obj->vat_code, 'localtax_rate1'=>$obj->localtax_rate1, 'locltax_rate2'=>$obj->localtax_rate2);
+ $vat_rates[] = array('vat_rate' => $obj->vat_rate, 'code' => $obj->vat_code, 'localtax_rate1' => $obj->localtax_rate1, 'locltax_rate2' => $obj->localtax_rate2);
}
}
} else {
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index ab111f7c67f..dd8278f19bf 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -144,14 +144,14 @@ if ($action == 'activate_MAIN_SECURITY_DISABLEFORGETPASSLINK') {
if ($action == 'updatepattern') {
$pattern = GETPOST("pattern", "alpha");
- $explodePattern = explode(';', $pattern);
+ $explodePattern = explode(';', $pattern); // List of ints separated with ';' containing counts
$patternInError = false;
- if ($explodePattern[0] < 1 || $explodePattern[4] < 0) {
+ if ((int) $explodePattern[0] < 1 || (int) $explodePattern[4] < 0) {
$patternInError = true;
}
- if ($explodePattern[0] < $explodePattern[1] + $explodePattern[2] + $explodePattern[3]) {
+ if ((int) $explodePattern[0] < (int) $explodePattern[1] + (int) $explodePattern[2] + (int) $explodePattern[3]) {
$patternInError = true;
}
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 71dc5df45f6..5475e20d0d1 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -3,6 +3,7 @@
* Copyright (C) 2005-2009 Regis Houssin
* Copyright (C) 2007 Rodolphe Quiedeville
* Copyright (C) 2013 Juanjo Menent
+ * Copyright (C) 2024 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -112,11 +113,16 @@ if ($action == 'set') {
dolibarr_del_const($db, 'SYSLOG_HANDLERS', -1); // To be sure there is not a setup into another entity
dolibarr_set_const($db, 'SYSLOG_HANDLERS', json_encode($activeModules), 'chaine', 0, '', 0);
-
+ $error = 0;
+ $errors = [];
// Check configuration
foreach ($activeModules as $modulename) {
$module = new $modulename();
- $error = $module->checkConfiguration();
+ $res = $module->checkConfiguration();
+ if (!$res) {
+ $error++;
+ $errors = array_merge($errors, $module->errors);
+ }
}
@@ -125,7 +131,7 @@ if ($action == 'set') {
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else {
$db->rollback();
- setEventMessages($error, $errors, 'errors');
+ setEventMessages('', $errors, 'errors');
}
}
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
index 56e33e2e317..1669e7b688f 100644
--- a/htdocs/asset/agenda.php
+++ b/htdocs/asset/agenda.php
@@ -129,7 +129,6 @@ $form = new Form($db);
if ($object->id > 0) {
$title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-card_agenda');
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index ed7a57e3af5..4c016282171 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -70,7 +70,7 @@ class Asset extends CommonObject
* Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
* 'label' the translation key.
* 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
* 'position' is the sort order of field.
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
@@ -1001,8 +1001,8 @@ class Asset extends CommonObject
// futures depreciation lines
//-----------------------------------------------------
- $nb_days_in_year = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_YEAR') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_YEAR : 365;
- $nb_days_in_month = getDolGlobalString('ASSET_DEPRECIATION_DURATION_PER_MONTH') ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_MONTH : 30;
+ $nb_days_in_year = getDolGlobalInt('ASSET_DEPRECIATION_DURATION_PER_YEAR', 365);
+ $nb_days_in_month = getDolGlobalInt('ASSET_DEPRECIATION_DURATION_PER_MONTH', 30);
$period_amount = (float) price2num($depreciation_period_amount / $fields['duration'], 'MT');
$first_period_found = false;
// TODO fix declaration of $begin_period
@@ -1576,43 +1576,4 @@ class Asset extends CommonObject
return "";
}
}
-
- /**
- * Create a document onto disk according to template module.
- *
- * @param string $modele Force template to use ('' to not force)
- * @param Translate $outputlangs object lang a utiliser pour traduction
- * @param int $hidedetails Hide details of lines
- * @param int $hidedesc Hide description
- * @param int $hideref Hide ref
- * @param null|array $moreparams Array to provide more information
- * @return int 0 if KO, 1 if OK
- */
- // public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
- // {
- // global $conf, $langs;
- //
- // $result = 0;
- // $includedocgeneration = 1;
- //
- // $langs->load("assets");
- //
- // if (!dol_strlen($modele)) {
- // $modele = 'standard_asset';
- //
- // if (!empty($this->model_pdf)) {
- // $modele = $this->model_pdf;
- // } elseif (!empty($conf->global->ASSET_ADDON_PDF)) {
- // $modele = $conf->global->ASSET_ADDON_PDF;
- // }
- // }
- //
- // $modelpath = "core/modules/asset/doc/";
- //
- // if ($includedocgeneration && !empty($modele)) {
- // $result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
- // }
- //
- // return $result;
- // }
}
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
index dac2d1ad194..e11ecfb9321 100644
--- a/htdocs/asset/class/assetdepreciationoptions.class.php
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -39,7 +39,7 @@ class AssetDepreciationOptions extends CommonObject
* Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
* 'label' the translation key.
* 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
* 'position' is the sort order of field.
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
index 51243277071..2ec02762b94 100644
--- a/htdocs/asset/class/assetmodel.class.php
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -76,7 +76,7 @@ class AssetModel extends CommonObject
* Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
* 'label' the translation key.
* 'picto' is code of a picto to show before value in forms
- * 'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+ * 'enabled' is a condition when the field must be managed (Example: 1 or 'getDolGlobalString("MY_SETUP_PARAM")'
* 'position' is the sort order of field.
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
@@ -796,7 +796,7 @@ class AssetModel extends CommonObject
*/
public function doScheduledJob()
{
- global $conf, $langs;
+ //global $conf, $langs;
//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
index 1eb0a2e850a..247d52408bf 100644
--- a/htdocs/asset/model/agenda.php
+++ b/htdocs/asset/model/agenda.php
@@ -135,7 +135,6 @@ $form = new Form($db);
if ($object->id > 0) {
$title = $langs->trans("Agenda");
- //if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-asset page-model-card_agenda');
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index bb385e34984..2604e35f362 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'bills', 'blockedlog', 'other'));
@@ -154,7 +155,10 @@ if ($action === 'downloadblockchain') {
$previoushash = '';
$firstid = '';
- if (!$error) {
+ if (! (GETPOSTINT('yeartoexport') > 0)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, "errors");
+ $error++;
+ } else {
// Get ID of first line
$sql = "SELECT rowid,date_creation,tms,user_fullname,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user,object_data";
$sql .= " FROM ".MAIN_DB_PREFIX."blockedlog";
@@ -292,6 +296,7 @@ if ($action === 'downloadblockchain') {
*/
$form = new Form($db);
+$formother = new FormOther($db);
if (GETPOST('withtab', 'alpha')) {
$title = $langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog');
@@ -374,24 +379,14 @@ if (GETPOST('withtab', 'alpha')) {
// Add $param from extra fields
//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-print '