From 366625f300fc161ac234950928a2fe6940261025 Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 10 Aug 2021 09:50:14 +0200
Subject: [PATCH] const
---
htdocs/admin/pdf.php | 12 ++++++++++++
htdocs/admin/pdf_other.php | 10 ----------
htdocs/core/modules/propale/doc/pdf_azur.modules.php | 4 ++--
htdocs/langs/en_US/admin.lang | 2 +-
4 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index cee63fd91fd..d966f9546e1 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -349,6 +349,18 @@ if ($conf->use_javascript_ajax) {
}
print '';
+// Document ref in title
+
+print '
| '.$langs->trans("MAIN_PDF_REF_IN_TITLE");
+print ' | ';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('MAIN_PDF_REF_IN_TITLE');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("MAIN_PDF_REF_IN_TITLE", $arrval, $conf->global->MAIN_PDF_REF_IN_TITLE);
+}
+print ' |
';
+
// Place customer adress to the ISO location
print '| '.$langs->trans("PlaceCustomerAddressToIsoLocation").' | ';
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index c30765f6162..ed14f2ac119 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -103,16 +103,6 @@ if ($conf->use_javascript_ajax) {
}
print ' |
';
-print '| '.$langs->trans("PDF_REF_IN_TITLE");
-print ' | ';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('PDF_REF_IN_TITLE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("PDF_REF_IN_TITLE", $arrval, $conf->global->PDF_REF_IN_TITLE);
-}
-print ' |
';
-
/*
print '| '.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").' | ';
if ($conf->use_javascript_ajax) {
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index a3883cea5d5..a36833a57c6 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1473,7 +1473,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
- if (!empty($conf->global->PDF_REF_IN_TITLE)) {
+ if (!empty($conf->global->MAIN_PDF_REF_IN_TITLE)) {
$title .= " " . $outputlangs->convToOutputCharset($object->ref);
}
$pdf->MultiCell(100, 4, $title, '', 'R');
@@ -1481,7 +1481,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetFont('', 'B', $default_font_size);
$posy += 5;
- if (empty($conf->global->PDF_REF_IN_TITLE)) {
+ if (empty($conf->global->MAIN_PDF_REF_IN_TITLE)) {
$pdf->SetXY($posx, $posy);
$pdf->SetTextColor(0, 0, 60);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 135c4d54040..9bd9ba05f42 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1992,7 +1992,7 @@ MAIN_PDF_MARGIN_TOP=Top margin on PDF
MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Add picture on proposal line
-PDF_REF_IN_TITLE=Document ref in title
+MAIN_PDF_REF_IN_TITLE=Document ref in title
MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Add electronic sign in PDF
NothingToSetup=There is no specific setup required for this module.
SetToYesIfGroupIsComputationOfOtherGroups=Set this to yes if this group is a computation of other groups
|