Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2023-06-04 19:07:04 +02:00
parent eb8d54e464 935a730fbc
commit 89e378bc78
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/class/commande.class.php
View File

@@ -4181,7 +4181,7 @@ class Commande extends CommonOrder
$now = dol_now();
return max($this->date, $this->date_livraison) < ($now - $conf->commande->client->warning_delay);
return max($this->date, $this->delivery_date) < ($now - $conf->commande->client->warning_delay);
}
/**
@@ -4193,7 +4193,7 @@ class Commande extends CommonOrder
{
global $conf, $langs;
if (empty($this->date_livraison)) {
if (empty($this->delivery_date)) {
$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
} else {
$text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');

5
htdocs/contrat/class/api_contracts.class.php
View File

@@ -660,11 +660,6 @@ class Contracts extends DolibarrApi
$object = parent::_cleanObjectDatas($object);
unset($object->address);
unset($object->date_start);
unset($object->date_start_real);
unset($object->date_end);
unset($object->date_end_real);
unset($object->civility_id);
return $object;

2
htdocs/core/lib/security.lib.php
View File

@@ -153,7 +153,7 @@ function dolEncrypt($chain, $key = '', $ciphering = 'AES-256-CTR', $forceseed =
if (empty($forceseed)) {
$ivseed = dolGetRandomBytes($ivlen);
} else {
$ivseed = dol_trunc(md5($forceseed), $ivlen, 'right', 'UTF-8', 1);
$ivseed = dol_substr(md5($forceseed), 0, $ivlen, 'ascii', 1);
}
$newchain = openssl_encrypt($chain, $ciphering, $key, 0, $ivseed);

4
htdocs/projet/tasks/task.php
View File

@@ -498,9 +498,7 @@ if ($id > 0 || !empty($ref)) {
// WYSIWYG editor
include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_SOCIETE) ? $conf->global->FCKEDITOR_ENABLE_SOCIETE : 0);
if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
}
$nbrows = getDolGlobalInt('MAIN_INPUT_DESC_HEIGHT', 0);
$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_details', '', false, true, $cked_enabled, $nbrows);
print $doleditor->Create();
print '</td></tr>';