} $totalarray';
+if (!function_exists('printTotalValCell')) { // allow two list with total on same screen
+
+ /** print a total cell value according to its type
+ *
+ * @param string $type of field (duration, string..)
+ * @param string $val the value to display
+ *
+ * @return void (direct print)
+ */
+ function printTotalValCell($type, $val)
+ {
+ // if $totalarray['type'] not present we consider it as number
+ if (empty($type)) {
+ $type = 'real';
+ }
+ switch ($type) {
+ case 'duration':
+ print '| ';
+ print(!empty($val) ? convertSecondToTime((int) $val, 'allhourmin') : 0);
+ print ' | ';
+ break;
+ case 'string': // This type is no more used. type is now varchar(x)
+ print '';
+ print(!empty($val) ? $val : '');
+ print ' | ';
+ break;
+ case 'stock':
+ print '';
+ print price2num(!empty($val) ? $val : 0, 'MS');
+ print ' | ';
+ break;
+ default:
+ print '';
+ print price(!empty($val) ? $val : 0);
+ print ' | ';
+ break;
+ }
+ }
+}
+
// Move fields of totalizable into the common array pos and val
if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) {
foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) {
@@ -107,40 +147,3 @@
}
//print '';
}
-
-/** print a total cell value according to its type
- *
- * @param string $type of field (duration, string..)
- * @param string $val the value to display
- *
- * @return void (direct print)
- */
-function printTotalValCell($type, $val)
-{
- // if $totalarray['type'] not present we consider it as number
- if (empty($type)) {
- $type = 'real';
- }
- switch ($type) {
- case 'duration':
- print '';
- print(!empty($val) ? convertSecondToTime((int) $val, 'allhourmin') : 0);
- print ' | ';
- break;
- case 'string': // This type is no more used. type is now varchar(x)
- print '';
- print(!empty($val) ? $val : '');
- print ' | ';
- break;
- case 'stock':
- print '';
- print price2num(!empty($val) ? $val : 0, 'MS');
- print ' | ';
- break;
- default:
- print '';
- print price(!empty($val) ? $val : 0);
- print ' | ';
- break;
- }
-}
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index f7bb85395c8b1..b814567f71002 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1223,7 +1223,7 @@ public function run_jobs(string $userlogin)
dol_syslog(get_class($this)."::run_jobs jobtype=".$this->jobtype." userlogin=".$userlogin, LOG_DEBUG);
// Increase limit of time. Works only if we are not in safe mode
- $ExecTimeLimit = 600;
+ $ExecTimeLimit = getDolGlobalInt('MAIN_CRON_EXEC_TIME_LIMIT', 600);
if (!empty($ExecTimeLimit)) {
$err = error_reporting();
error_reporting(0); // Disable all errors
@@ -1231,7 +1231,7 @@ public function run_jobs(string $userlogin)
@set_time_limit($ExecTimeLimit); // Need more than 240 on Windows 7/64
error_reporting($err);
}
- $MemoryLimit = 0;
+ $MemoryLimit = getDolGlobalString('MAIN_CRON_MEMORY_LIMIT');
if (!empty($MemoryLimit)) {
@ini_set('memory_limit', $MemoryLimit);
}
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 9b74b8a787cfa..3b399063ad276 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -18,9 +18,9 @@ BlockedlogInfoDialog=Log Details
ListOfTrackedEvents=List of tracked events
Fingerprint=Fingerprint
DownloadLogCSV=Export archived logs (CSV)
-DataOfArchivedEvent=Full data of archived event
-DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
-DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK
+DataOfArchivedEvent=Complementary data of archived event
+DataOfArchivedEventHelp=This field contains the complementary data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified.
+DataOfArchivedEventHelp2=The integrity of data on each lines is guaranteed if the status of the line is OK
ImpossibleToReloadObject=Original object (type %s, id %s) not linked (see 'Full datas' column to get unalterable saved data)
BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit.
BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they cannot be validated by a tax audit.
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 6df3685b01a50..7d41c983205fa 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -448,6 +448,7 @@
llxHeader("", $title, $help_url, '', 0, 0, '', '', '', 'mod-project page-card_tasks');
$arrayofselected = is_array($toselect) ? $toselect : array();
+$param = '';
if ($id > 0 || !empty($ref)) {
$result = $object->fetch($id, $ref);