diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 7c294844f36..25d62d58fa6 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -721,6 +721,18 @@ class pdf_standard extends ModeleExpenseReport // Web if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url); + // Receiver Properties + $receiver=new User($this->db); + $receiver->fetch($object->fk_user_author); + $receiver_account=new UserBankAccount($this->db); + $receiver_account->fetch($object->fk_user_author); + $expense_receiver = ''; + $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->convToOutputCharset($this->receiver->address); + $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->convToOutputCharset($this->receiver->zip).' '.$outputlangs->convToOutputCharset($this->receiver->town); + $expense_receiver .= "\n"; + if ($this->receiver->email) $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->receiver->email); + if ($this->receiver_account->iban) $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->transnoentities("IBAN")." : ".$outputlangs->convToOutputCharset($this->receiver_account->iban); + // Show sender $posy=50; $posx=$this->marge_gauche; @@ -745,7 +757,11 @@ class pdf_standard extends ModeleExpenseReport // Show sender information $pdf->SetXY($posx+2, $posy+8); $pdf->SetFont('', '', $default_font_size - 1); - $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); + if (empty($conf->global->EXPENSEREPORT_INVERT_SENDER_RECIPIENT)) { + $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); + } else { + $pdf->MultiCell(80, 4, $expense_receiver, 0, 'L'); + } // Show recipient $posy=50; diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 1ccb0b81402..4356248ba17 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -227,6 +227,7 @@ if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC')) // 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; }