From 6a41edd3c2b1a4f101d35460b6decfb34204971d Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Tue, 10 Aug 2021 13:02:37 +0200
Subject: [PATCH] ok
---
htdocs/admin/pdf.php | 9 +++++++++
htdocs/core/modules/propale/doc/pdf_azur.modules.php | 10 ++++++----
htdocs/langs/en_US/admin.lang | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index cee63fd91fd..83225de223d 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -253,6 +253,15 @@ for ($i = 1; $i <= 6; $i++) {
}
}
+// Show sender name
+
+print '
| '.$langs->trans("MAIN_PDF_NO_SENDER_NAME").' | ';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('MAIN_PDF_NO_SENDER_NAME');
+} else {
+ print $form->selectyesno('MAIN_PDF_NO_SENDER_NAME', (!empty($conf->global->MAIN_PDF_NO_SENDER_NAME)) ? $conf->global->MAIN_PDF_NO_SENDER_NAME : 0, 1);
+}
+print ' |
';
print '';
print '';
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index b56fbc758db..ef8a2fe088c 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1585,10 +1585,12 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetTextColor(0, 0, 60);
// Show sender name
- $pdf->SetXY($posx + 2, $posy + 3);
- $pdf->SetFont('', 'B', $default_font_size);
- $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
- $posy = $pdf->getY();
+ if(empty($conf->global->MAIN_PDF_NO_SENDER_NAME)){
+ $pdf->SetXY($posx + 2, $posy + 3);
+ $pdf->SetFont('', 'B', $default_font_size);
+ $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, $ltrdirection);
+ $posy = $pdf->getY();
+ }
// Show sender information
$pdf->SetXY($posx + 2, $posy);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 98c9e954ac2..36d52f40af1 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1992,6 +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
+MAIN_PDF_NO_SENDER_NAME=Not show sender name in address
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