From 3430a88c72a9381998be62108d2df642890da342 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Nov 2019 10:13:22 +0100 Subject: [PATCH] Fix $conf not defined --- htdocs/comm/propal/class/propal.class.php | 6 +++--- htdocs/compta/facture/class/facture.class.php | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 27d876320c2..ac5b35eef44 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1301,9 +1301,9 @@ class Propal extends CommonObject if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $object->ref_client = ''; if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) { - $object->note_private = ''; - $object->note_public = ''; - } + $object->note_private = ''; + $object->note_public = ''; + } // Create clone $object->context['createfromclone'] = 'createfromclone'; $result = $object->create($user); diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 2ac89f1dace..0ce2930840f 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1006,7 +1006,7 @@ class Facture extends CommonInvoice */ public function createFromClone(User $user, $fromid = 0) { - global $hookmanager; + global $conf, $hookmanager; $error = 0; @@ -1048,11 +1048,10 @@ class Facture extends CommonInvoice $object->close_code = ''; $object->close_note = ''; $object->products = $object->lines; // For backward compatibility - if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) - { - $object->note_private = ''; - $object->note_public = ''; - } + if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) { + $object->note_private = ''; + $object->note_public = ''; + } // Loop on each line of new invoice foreach ($object->lines as $i => $line)