From fb83d66d27213c1ccab9273c766fa9c4de629d50 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 1 Apr 2021 13:04:24 +0200 Subject: [PATCH] NEW Can show the project ref or label into PDF documents --- htdocs/admin/pdf.php | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 3ca68b8d82d..a5c2770a9c4 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -68,15 +68,18 @@ if ($action == 'update') { dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT", GETPOST("MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT"), 'chaine', 0, '', $conf->entity); dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity); - if (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') { - dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity); - dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity); - } elseif (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'showprojectref') { - dolibarr_set_const($db, "PDF_SHOW_PROJECT", GETPOST("PDF_SHOW_PROJECT_REF_OR_LABEL"), 'chaine', 0, '', $conf->entity); - dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity); - } elseif (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'showprojectlabel') { - dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity); - dolibarr_set_const($db, "PDF_SHOW_PROJECT_TITLE", GETPOST("PDF_SHOW_PROJECT_REF_OR_LABEL"), 'chaine', 0, '', $conf->entity); + + if (!empty($conf->projet->enabled)) { + if (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') { + dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity); + dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity); + } elseif (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'showprojectref') { + dolibarr_set_const($db, "PDF_SHOW_PROJECT", GETPOST("PDF_SHOW_PROJECT_REF_OR_LABEL"), 'chaine', 0, '', $conf->entity); + dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity); + } elseif (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'showprojectlabel') { + dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity); + dolibarr_set_const($db, "PDF_SHOW_PROJECT_TITLE", GETPOST("PDF_SHOW_PROJECT_REF_OR_LABEL"), 'chaine', 0, '', $conf->entity); + } } dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", GETPOST("MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"), 'chaine', 0, '', $conf->entity); @@ -303,11 +306,13 @@ print ''; // Show project -print ''.$langs->trans("PDF_SHOW_PROJECT").''; -$tmparray = array('no' => 'No', 'showprojectref' => 'RefProject', 'showprojectlabel' => 'ShowProjectLabel'); -$showprojectref = empty($conf->global->PDF_SHOW_PROJECT) ? (empty($conf->global->PDF_SHOW_PROJECT_TITLE) ? 'no' : 'showprojectlabel') : 'showprojectref'; -print $form->selectarray('PDF_SHOW_PROJECT_REF_OR_LABEL', $tmparray, $showprojectref, 0, 0, 0, '', 1); -print ''; +if (!empty($conf->projet->enabled)) { + print ''.$langs->trans("PDF_SHOW_PROJECT").''; + $tmparray = array('no' => 'No', 'showprojectref' => 'RefProject', 'showprojectlabel' => 'ShowProjectLabel'); + $showprojectref = empty($conf->global->PDF_SHOW_PROJECT) ? (empty($conf->global->PDF_SHOW_PROJECT_TITLE) ? 'no' : 'showprojectlabel') : 'showprojectref'; + print $form->selectarray('PDF_SHOW_PROJECT_REF_OR_LABEL', $tmparray, $showprojectref, 0, 0, 0, '', 1); + print ''; +} //Invert sender and recipient