Rely on MAIN_INVERT_SENDER_RECIPIENT

Dolibarr · Apr 1, 2019 · c08b69d · c08b69d
1 parent f942917
commit c08b69d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -750,7 +750,7 @@ private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 			$pdf->SetTextColor(0, 0, 60);
 
 			// Show sender information
-			if (empty($conf->global->EXPENSEREPORT_INVERT_SENDER_RECIPIENT)) {
+			if (empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
 				$pdf->SetXY($posx+2, $posy+3);
 				$pdf->SetFont('', 'B', $default_font_size);
 				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
@@ -227,7 +227,6 @@
 
 	// For some countries, we need to invert our address with customer address
 	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->EXPENSEREPORT_INVERT_SENDER_RECIPIENT)) $conf->global->EXPENSEREPORT_INVERT_SENDER_RECIPIENT=1;
 }