lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#3700 New Switch EXPENSEREPORT_INVERT_SENDER_RECIPIENT

Browse Source
This commit is contained in:
markus 2019-03-09 18:22:37 +01:00
parent ef003cf15c
commit b8ec0b20b0
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -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;

1
htdocs/master.inc.php
View File

@ -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;
}