Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
06cb2abe4f
26
ChangeLog
26
ChangeLog
@ -209,6 +209,32 @@ Following changes may create regressions for some external modules, but were nec
|
|||||||
* Rename the substitution for project label instead of project title in substitution variables
|
* Rename the substitution for project label instead of project title in substitution variables
|
||||||
|
|
||||||
|
|
||||||
|
***** ChangeLog for 16.0.3 compared to 16.0.2 *****
|
||||||
|
|
||||||
|
FIX: $sign is useless
|
||||||
|
FIX: #18304 Member subscription confirmation email sent even if mandatory fields are missing
|
||||||
|
FIX: #19828
|
||||||
|
FIX: #19877
|
||||||
|
FIX: #22509 default value on integer fields don't retrieve by setSaveQuery
|
||||||
|
FIX: #22786
|
||||||
|
FIX: #22813
|
||||||
|
FIX: #22824 Accountancy - Journal - Search on subledger when list of subledger is disabled
|
||||||
|
FIX: Backup using the low memory mode
|
||||||
|
FIX: Bankaccounts API fetch with 'id' and 'socid'
|
||||||
|
FIX: base64_decode should be forbiden in dol_eval
|
||||||
|
FIX: Broken Permissions check, $object is null.
|
||||||
|
FIX: compute next value when year is on one digit for reset counter
|
||||||
|
FIX: copy same behaviour in other accountancy files
|
||||||
|
FIX: Fix the position of the verification condition of the test field in case of multi entities
|
||||||
|
FIX: for #22882
|
||||||
|
FIX: for #22952
|
||||||
|
FIX: merge errors on mailing card
|
||||||
|
FIX: PaymentBankTransfer Type page management with Select and Input on create.php
|
||||||
|
FIX: remove not initialized variable
|
||||||
|
FIX: SQL request parenthesis
|
||||||
|
FIX: Use the Hook addMoreActionsButtons resPrint
|
||||||
|
FIX: Wrong Extrafields Element For Assets
|
||||||
|
|
||||||
***** ChangeLog for 16.0.2 compared to 16.0.1 *****
|
***** ChangeLog for 16.0.2 compared to 16.0.1 *****
|
||||||
|
|
||||||
FIX: 16.0 - computed extrafields are not displayed if the object has no other extrafields
|
FIX: 16.0 - computed extrafields are not displayed if the object has no other extrafields
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
# Use bzip2 instead of gzip
|
# Force use of gzip compression by dpkg-buildpackage
|
||||||
compression = "bzip2"
|
compression = "gzip"
|
||||||
compression-level = 9
|
#compression-level = 9
|
||||||
|
|||||||
@ -678,7 +678,7 @@ if ($nboftargetok) {
|
|||||||
mkdir($DESTI.'/standard');
|
mkdir($DESTI.'/standard');
|
||||||
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
if (-d $DESTI.'/standard') { $NEWDESTI=$DESTI.'/standard'; }
|
||||||
}
|
}
|
||||||
|
|
||||||
print "Remove target $FILENAMETGZ.tgz...\n";
|
print "Remove target $FILENAMETGZ.tgz...\n";
|
||||||
unlink("$NEWDESTI/$FILENAMETGZ.tgz");
|
unlink("$NEWDESTI/$FILENAMETGZ.tgz");
|
||||||
|
|
||||||
@ -1064,7 +1064,8 @@ if ($nboftargetok) {
|
|||||||
$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
|
$ret=`mv $BUILDROOT/*_all.deb "$NEWDESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
|
$ret=`mv $BUILDROOT/*.dsc "$NEWDESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
|
$ret=`mv $BUILDROOT/*.orig.tar.gz "$NEWDESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.debian.tar.xz "$NEWDESTI/"`;
|
#$ret=`mv $BUILDROOT/*.debian.tar.xz "$NEWDESTI/"`; # xz file is generated when build/debian/sources/option
|
||||||
|
$ret=`mv $BUILDROOT/*.debian.tar.gz "$NEWDESTI/"`;
|
||||||
$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
|
$ret=`mv $BUILDROOT/*.changes "$NEWDESTI/"`;
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
@ -1146,7 +1147,8 @@ if ($nboftargetok) {
|
|||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_all.deb"=>'Dolibarr installer for Debian-Ubuntu (DoliDeb)',
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'none', # none means it won't be published on SF
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}_amd64.changes"=>'none', # none means it won't be published on SF
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'none', # none means it won't be published on SF
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.dsc"=>'none', # none means it won't be published on SF
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'none', # none means it won't be published on SF
|
#"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.xz"=>'none', # none means it won't be published on SF
|
||||||
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEB}.debian.tar.gz"=>'none', # none means it won't be published on SF
|
||||||
"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none', # none means it won't be published on SF
|
"$DESTI/package_debian-ubuntu/${FILENAMEDEBSHORT}.orig.tar.gz"=>'none', # none means it won't be published on SF
|
||||||
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
|
"$DESTI/package_windows/$FILENAMEEXEDOLIWAMP.exe"=>'Dolibarr installer for Windows (DoliWamp)',
|
||||||
"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
|
"$DESTI/standard/$FILENAMETGZ.tgz"=>'Dolibarr ERP-CRM',
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
|
||||||
* Copyright (C) 2017 Nicolas ZABOURI <info@inovea-conseil.com>
|
* Copyright (C) 2017 Nicolas ZABOURI <info@inovea-conseil.com>
|
||||||
* Copyright (C) 2018-2022 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2018-2022 Frédéric France <frederic.france@netlogic.fr>
|
||||||
|
* Copyright (C) 2022 Antonin MARCHAL <antonin@letempledujeu.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -1758,7 +1759,12 @@ class ExtraFields
|
|||||||
dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
|
dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
|
||||||
}
|
}
|
||||||
} elseif ($type == 'radio') {
|
} elseif ($type == 'radio') {
|
||||||
$value = $langs->trans($param['options'][$value]);
|
if (!isset($param['options'][$value])) {
|
||||||
|
$langs->load('errors');
|
||||||
|
$value = $langs->trans('ErrorNoValueForRadioType');
|
||||||
|
} else {
|
||||||
|
$value = $langs->trans($param['options'][$value]);
|
||||||
|
}
|
||||||
} elseif ($type == 'checkbox') {
|
} elseif ($type == 'checkbox') {
|
||||||
$value_arr = explode(',', $value);
|
$value_arr = explode(',', $value);
|
||||||
$value = '';
|
$value = '';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user