fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265

This commit is contained in:
Philippe GRAND 2021-08-22 22:28:53 +02:00
parent e439e0f14d
commit ba9ede39bf
2 changed files with 3 additions and 3 deletions

View File

@ -262,10 +262,10 @@ if (empty($reshook)) {
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
$outputlangs = $langs;
$newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
$newlang = GETPOST('lang_id', 'aZ09');
}
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
$newlang = $object->thirdparty->default_lang;
}
if (!empty($newlang)) {

View File

@ -258,7 +258,7 @@ class Propalmergepdfproduct extends CommonObject
$line->import_key = $obj->import_key;
if ($conf->global->MAIN_MULTILANGS) {
if (!empty($conf->global->MAIN_MULTILANGS)) {
$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
} else {
$this->lines[$obj->file_name] = $line;