Php/dolibarr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing Bug in Lieferschein

Browse Source
This commit is contained in:
BlubbFish 2020-05-29 16:07:42 +02:00
parent 6a91888426
commit 2d7555d3b0
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/livraison/doc/pdf_thwlieferschein.modules.php
View File

@ -5,6 +5,7 @@
* Copyright (C) 2008 Chiptronik * Copyright (C) 2008 Chiptronik
* Copyright (C) 2011-2019 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2011-2019 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2020 Philip Schell <dev@blubbfish.net>
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -146,7 +147,9 @@ class pdf_thwlieferschein extends ModelePDFDeliveryOrder
// Get source company // Get source company
$this->emetteur = $mysoc; $this->emetteur = $mysoc;
if (empty($this->emetteur->country_code)) $this->emetteur->country_code=substr($langs->defaultlang, -2); // By default, if was not defined if (empty($this->emetteur->country_code)) {
$this->emetteur->country_code=substr($langs->defaultlang, -2); // By default, if was not defined
}
// Define position of columns // Define position of columns
$this->posxdesc = $this->marge_gauche+1; $this->posxdesc = $this->marge_gauche+1;
@ -172,7 +175,6 @@ class pdf_thwlieferschein extends ModelePDFDeliveryOrder
$this->atleastonediscount = 0; $this->atleastonediscount = 0;
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Function to build pdf onto disk * Function to build pdf onto disk
@ -189,7 +191,9 @@ class pdf_thwlieferschein extends ModelePDFDeliveryOrder
// phpcs:enable // phpcs:enable
global $user, $langs, $conf, $mysoc, $hookmanager; global $user, $langs, $conf, $mysoc, $hookmanager;
if (! is_object($outputlangs)) $outputlangs=$langs; if (! is_object($outputlangs)) {
$outputlangs = $langs;
}
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
@ -341,7 +345,7 @@ class pdf_thwlieferschein extends ModelePDFDeliveryOrder
if(empty($object->note_public)) { if(empty($object->note_public)) {
$object->note_public = $hinweis_wichtig; $object->note_public = $hinweis_wichtig;
} else { } else {
$object->note_public = $hinweis_wichtig + "<br><br>" + $object->note_public; $object->note_public = $hinweis_wichtig."<br><br>".$object->note_public;
} }
// Affiche notes // Affiche notes