Merge pull request #10810 from mwelters/patch-1
NEW improve Expensereport, Inverse Receiver
This commit is contained in:
Laurent Destailleur
GitHub
commit
2b87c8b663
@ -4,6 +4,8 @@
|
||||
* Copyright (C) 2016-2018 Philippe Grand <philippe.grand@atoo-net.com>
|
||||
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
|
||||
* Copyright (C) 2018 Francis Appels <francis.appels@z-application.com>
|
||||
* Copyright (C) 2019 Markus Welters <markus@welters.de>
|
||||
* Copyright (C) 2019 Rafael Ingenleuf <ingenleuf@welters.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -32,8 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
||||
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
|
||||
|
||||
/**
|
||||
* Class to generate expense report based on standard model
|
||||
@ -121,7 +124,7 @@ class pdf_standard extends ModeleExpenseReport
|
||||
*/
|
||||
public function __construct($db)
|
||||
{
|
||||
global $conf, $langs, $mysoc;
|
||||
global $conf, $langs, $mysoc, $user;
|
||||
|
||||
// Translations
|
||||
$langs->loadLangs(array("main", "trips", "projects"));
|
||||
@ -156,6 +159,7 @@ class pdf_standard extends ModeleExpenseReport
|
||||
|
||||
// Get source company
|
||||
$this->emetteur=$mysoc;
|
||||
|
||||
if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default, if was not defined
|
||||
|
||||
// Define position of columns
|
||||
@ -626,7 +630,8 @@ class pdf_standard extends ModeleExpenseReport
|
||||
*/
|
||||
private function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
|
||||
{
|
||||
global $conf, $langs, $hookmanager;
|
||||
// global $conf, $langs, $hookmanager;
|
||||
global $user, $langs, $conf, $mysoc, $db, $hookmanager;
|
||||
|
||||
// Load traductions files requiredby by page
|
||||
$outputlangs->loadLangs(array("main", "trips", "companies"));
|
||||
@ -711,15 +716,23 @@ class pdf_standard extends ModeleExpenseReport
|
||||
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->address);
|
||||
$carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
|
||||
$carac_emetteur .= "\n";
|
||||
// Phone
|
||||
if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
|
||||
// Fax
|
||||
if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '' ).$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
|
||||
// EMail
|
||||
if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
|
||||
// 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(0, '', $object->fk_user_author);
|
||||
$expense_receiver = '';
|
||||
$expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->convToOutputCharset($receiver->address);
|
||||
$expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->convToOutputCharset($receiver->zip).' '.$outputlangs->convToOutputCharset($receiver->town);
|
||||
$expense_receiver .= "\n";
|
||||
if ($receiver->email) $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($receiver->email);
|
||||
if ($receiver_account->iban) $expense_receiver .= ($expense_receiver ? "\n" : '' ).$outputlangs->transnoentities("IBAN")." : ".$outputlangs->convToOutputCharset($receiver_account->iban);
|
||||
|
||||
// Show sender
|
||||
$posy=50;
|
||||
$posx=$this->marge_gauche;
|
||||
@ -736,19 +749,28 @@ class pdf_standard extends ModeleExpenseReport
|
||||
$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
|
||||
$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, 'L');
|
||||
|
||||
// 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->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');
|
||||
$pdf->SetXY($posx+2, $posy+8);
|
||||
$pdf->SetFont('', '', $default_font_size - 1);
|
||||
$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
|
||||
} else {
|
||||
$pdf->SetXY($posx+2, $posy+3);
|
||||
$pdf->SetFont('', 'B', $default_font_size);
|
||||
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset(dolGetFirstLastname($receiver->firstname, $receiver->lastname)), 0, 'L');
|
||||
$pdf->SetXY($posx+2, $posy+8);
|
||||
$pdf->SetFont('', '', $default_font_size - 1);
|
||||
$pdf->MultiCell(80, 4, $expense_receiver, 0, 'L');
|
||||
}
|
||||
|
||||
if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
|
||||
|
||||
// Show recipient
|
||||
$posy=50;
|
||||
$posx=100;
|
||||
$posx=10;
|
||||
|
||||
// Show recipient frame
|
||||
$pdf->SetTextColor(0, 0, 0);
|
||||
@ -760,7 +782,8 @@ class pdf_standard extends ModeleExpenseReport
|
||||
// Informations for trip (dates and users workflow)
|
||||
if ($object->fk_user_author > 0) {
|
||||
$userfee=new User($this->db);
|
||||
$userfee->fetch($object->fk_user_author); $posy+=3;
|
||||
$userfee->fetch($object->fk_user_author);
|
||||
$posy+=3;
|
||||
$pdf->SetXY($posx+2, $posy);
|
||||
$pdf->SetFont('', '', 10);
|
||||
$pdf->MultiCell(96, 4, $outputlangs->transnoentities("AUTHOR")." : ".dolGetFirstLastname($userfee->firstname, $userfee->lastname), 0, 'L');
|
||||
|
||||
@ -607,7 +607,7 @@ class Expedition extends CommonObject
|
||||
$this->getUrlTrackingStatus($obj->tracking_number);
|
||||
|
||||
/*
|
||||
* Thirparty
|
||||
* Thirdparty
|
||||
*/
|
||||
$result=$this->fetch_thirdparty();
|
||||
|
||||
|
||||
@ -233,7 +233,7 @@ Limit=Limit
|
||||
Limits=Limits
|
||||
Logout=Abmelden
|
||||
NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus <b>% s </ b>
|
||||
Connection=Benutzername
|
||||
Connection=Anmelden
|
||||
Setup=Einstellungen
|
||||
Alert=Warnung
|
||||
MenuWarnings=Benachrichtigungen
|
||||
|
||||
@ -444,7 +444,7 @@ class Reception extends CommonObject
|
||||
$this->getUrlTrackingStatus($obj->tracking_number);
|
||||
|
||||
/*
|
||||
* Thirparty
|
||||
* Thirdparty
|
||||
*/
|
||||
$result=$this->fetch_thirdparty();
|
||||
|
||||
|
||||
@ -1457,7 +1457,7 @@ class Societe extends CommonObject
|
||||
* Delete a third party from database and all its dependencies (contacts, rib...)
|
||||
*
|
||||
* @param int $id Id of third party to delete
|
||||
* @param User $fuser User who ask to delete thirparty
|
||||
* @param User $fuser User who ask to delete thirdparty
|
||||
* @param int $call_trigger 0=No, 1=yes
|
||||
* @return int <0 if KO, 0 if nothing done, >0 if OK
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user