Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	.github/workflows/pre-commit.yml
	ChangeLog
	dev/tools/codespell/codespell-lines-ignore.txt
	htdocs/comm/mailing/card.php
	htdocs/contact/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php
This commit is contained in:
Laurent Destailleur
2024-02-07 18:30:10 +01:00
parent 428a1758ad 097290fc38
commit eb4f53665d
48 changed files with 242 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/commonobject.class.php
View File

@@ -5610,6 +5610,7 @@ abstract class CommonObject
// If selected model is a filename template (then $modele="modelname" or "modelname:filename")
$tmp = explode(':', $modele, 2);
$saved_model = $modele;
if (!empty($tmp[1])) {
$modele = $tmp[0];
$srctemplatepath = $tmp[1];
@@ -5717,7 +5718,7 @@ abstract class CommonObject
$sav_charset_output = empty($outputlangs->charset_output) ? '' : $outputlangs->charset_output;
// update model_pdf in object
$this->model_pdf = $modele;
$this->model_pdf = $saved_model;
if (in_array(get_class($this), array('Adherent'))) {
$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);
@@ -9526,7 +9527,7 @@ abstract class CommonObject
$this->$field = (float) $obj->$field;
}
} else {
if (isset($obj->$field) && !is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1)) {
if (isset($obj->$field) && (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1))) {
$this->$field = (int) $obj->$field;
} else {
$this->$field = null;
@@ -9541,7 +9542,7 @@ abstract class CommonObject
$this->$field = (float) $obj->$field;
}
} else {
if (isset($obj->$field) && !is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1)) {
if (isset($obj->$field) && (!is_null($obj->$field) || (isset($info['notnull']) && $info['notnull'] == 1))) {
$this->$field = (float) $obj->$field;
} else {
$this->$field = null;