Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-03 15:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Wavyzz:15.0.0
Branches Tags
Wavyzz:develop Wavyzz:23.0 Wavyzz:22.0 Wavyzz:19.0 Wavyzz:14.0 Wavyzz:18.0 Wavyzz:21.0 Wavyzz:20.0 Wavyzz:17.0 Wavyzz:16.0 Wavyzz:15.0 Wavyzz:phpstan-baseline Wavyzz:hregis-fix_dev_mysql_workbench Wavyzz:6.0 Wavyzz:snyk-fix-3e1e5b476824b5bd60a178613c9f4541 Wavyzz:13.0 Wavyzz:12.0 Wavyzz:11.0 Wavyzz:10.0 Wavyzz:9.0 Wavyzz:gh-pages Wavyzz:8.0 Wavyzz:7.0 Wavyzz:3.7 Wavyzz:5.0 Wavyzz:3.6 Wavyzz:4.0 Wavyzz:3.9 Wavyzz:3.8 Wavyzz:3.5 Wavyzz:3.4 Wavyzz:3.3 Wavyzz:3.2 Wavyzz:3.1 Wavyzz:3.0 Wavyzz:2.9 Wavyzz:2.8
Wavyzz:22.0.4 Wavyzz:22.0.3 Wavyzz:22.0.2 Wavyzz:18.0.8 Wavyzz:22.0.1 Wavyzz:21.0.4 Wavyzz:21.0.3 Wavyzz:22.0.0 Wavyzz:21.0.2 Wavyzz:18.0.7 Wavyzz:21.0.1 Wavyzz:21.0.0 Wavyzz:20.0.4 Wavyzz:20.0.3 Wavyzz:20.0.2 Wavyzz:19.0.4 Wavyzz:18.0.6 Wavyzz:20.0.1 Wavyzz:20.0.0 Wavyzz:19.0.3 Wavyzz:19.0.2 Wavyzz:19.0.1 Wavyzz:19.0.0 Wavyzz:18.0.5 Wavyzz:17.0.4 Wavyzz:18.0.4 Wavyzz:18.0.3 Wavyzz:18.0.2 Wavyzz:18.0.1 Wavyzz:18.0.0 Wavyzz:17.0.3 Wavyzz:17.0.2 Wavyzz:17.0.1 Wavyzz:16.0.5 Wavyzz:17.0.0 Wavyzz:16.0.4 Wavyzz:16.0.3 Wavyzz:16.0.2 Wavyzz:16.0.1 Wavyzz:16.0.0 Wavyzz:15.0.3 Wavyzz:15.0.2 Wavyzz:15.0.1 Wavyzz:15.0.0 Wavyzz:14.0.5 Wavyzz:14.0.4 Wavyzz:14.0.3 Wavyzz:13.0.5 Wavyzz:14.0.2 Wavyzz:14.0.1 Wavyzz:14.0.0 Wavyzz:13.0.4 Wavyzz:13.0.3 Wavyzz:13.0.2 Wavyzz:13.0.1 Wavyzz:12.0.5 Wavyzz:13.0.0 Wavyzz:12.0.4 Wavyzz:12.0.3 Wavyzz:12.0.2 Wavyzz:12.0.1 Wavyzz:11.0.5 Wavyzz:12.0.0 Wavyzz:11.0.4 Wavyzz:10.0.7 Wavyzz:11.0.3 Wavyzz:11.0.2 Wavyzz:11.0.1 Wavyzz:11.0.0 Wavyzz:10.0.6 Wavyzz:10.0.5 Wavyzz:10.0.4 Wavyzz:10.0.3 Wavyzz:10.0.2 Wavyzz:10.0.1 Wavyzz:10.0.0 Wavyzz:9.0.4 Wavyzz:8.0.6 Wavyzz:8.0.5 Wavyzz:9.0.3 Wavyzz:9.0.2 Wavyzz:9.0.1 Wavyzz:9.0.0 Wavyzz:7.0.5 Wavyzz:8.0.4 Wavyzz:8.0.3 Wavyzz:7.0.4 Wavyzz:6.0.8 Wavyzz:8.0.2 Wavyzz:8.0.1 Wavyzz:8.0.0 Wavyzz:7.0.3 Wavyzz:7.0.2 Wavyzz:6.0.7 Wavyzz:7.0.1 Wavyzz:6.0.6 Wavyzz:7.0.0 Wavyzz:6.0.5 Wavyzz:6.0.4 Wavyzz:6.0.3 Wavyzz:5.0.7 Wavyzz:6.0.2 Wavyzz:6.0.1 Wavyzz:5.0.6 Wavyzz:6.0.0 Wavyzz:5.0.5 Wavyzz:6.0.0-rc Wavyzz:5.0.4 Wavyzz:6.0.0-beta Wavyzz:5.0.3 Wavyzz:4.0.6 Wavyzz:5.0.2 Wavyzz:5.0.1 Wavyzz:4.0.5 Wavyzz:5.0.0 Wavyzz:4.0.4 Wavyzz:5.0.0-rc2 Wavyzz:5.0.0-rc1 Wavyzz:4.0.3 Wavyzz:3.9.4 Wavyzz:5.0.0-beta Wavyzz:4.0.2 Wavyzz:4.0.1 Wavyzz:4.0.0 Wavyzz:4.0.0-rc2 Wavyzz:3.9.3 Wavyzz:4.0.0-rc Wavyzz:4.0.0-beta Wavyzz:3.9.2 Wavyzz:3.9.1 Wavyzz:3.9.0 Wavyzz:3.8.4 Wavyzz:3.7.4 Wavyzz:3.9.0-rc2 Wavyzz:3.9.0-rc Wavyzz:3.5.8 Wavyzz:3.8.3 Wavyzz:3.7.3 Wavyzz:3.6.6 Wavyzz:3.6.5 Wavyzz:3.7.2 Wavyzz:3.8.2 Wavyzz:3.8.1 Wavyzz:3.8.0 Wavyzz:3.8.0-beta Wavyzz:3.8.beta1_20150712 Wavyzz:3.7.1 Wavyzz:3.6.4 Wavyzz:3.5.7 Wavyzz:3.7.0 Wavyzz:3.6.3 Wavyzz:3.6.2 Wavyzz:3.5.6 Wavyzz:3.7.beta1_20141116 Wavyzz:3.6.1 Wavyzz:3.5.5 Wavyzz:3.6.0 Wavyzz:3.5.4 Wavyzz:3.6.0-beta Wavyzz:3.5.3 Wavyzz:3.6.beta2_20140524 Wavyzz:3.6.beta1_20140514 Wavyzz:3.5.2 Wavyzz:3.6.0-alpha Wavyzz:3.5.1 Wavyzz:3.5.0 Wavyzz:3.4.2 Wavyzz:3.5.beta1_20131120 Wavyzz:3.5.beta1_20131106 Wavyzz:3.4.1 Wavyzz:3.4.0 Wavyzz:3.3.3 Wavyzz:3.3.2 Wavyzz:3.4.beta1_20130502 Wavyzz:3.4.beta1_20130429 Wavyzz:3.3.1 Wavyzz:3.3.0 Wavyzz:3.3.beta2_20120109 Wavyzz:3.3.beta1_20121221 Wavyzz:3.2.3 Wavyzz:3.2.2 Wavyzz:3.2.1 Wavyzz:3.1.3 Wavyzz:3.2.0 Wavyzz:3.1.2 Wavyzz:3.1.1 Wavyzz:3.1.0 Wavyzz:3.0.1 Wavyzz:3.0.0 Wavyzz:2.9.0 Wavyzz:2.8.1
...
compare: Wavyzz:9.0
Branches Tags
Wavyzz:23.0 Wavyzz:develop Wavyzz:22.0 Wavyzz:19.0 Wavyzz:14.0 Wavyzz:18.0 Wavyzz:21.0 Wavyzz:20.0 Wavyzz:17.0 Wavyzz:16.0 Wavyzz:15.0 Wavyzz:phpstan-baseline Wavyzz:hregis-fix_dev_mysql_workbench Wavyzz:6.0 Wavyzz:snyk-fix-3e1e5b476824b5bd60a178613c9f4541 Wavyzz:13.0 Wavyzz:12.0 Wavyzz:11.0 Wavyzz:10.0 Wavyzz:9.0 Wavyzz:gh-pages Wavyzz:8.0 Wavyzz:7.0 Wavyzz:3.7 Wavyzz:5.0 Wavyzz:3.6 Wavyzz:4.0 Wavyzz:3.9 Wavyzz:3.8 Wavyzz:3.5 Wavyzz:3.4 Wavyzz:3.3 Wavyzz:3.2 Wavyzz:3.1 Wavyzz:3.0 Wavyzz:2.9 Wavyzz:2.8
Wavyzz:22.0.4 Wavyzz:22.0.3 Wavyzz:22.0.2 Wavyzz:18.0.8 Wavyzz:22.0.1 Wavyzz:21.0.4 Wavyzz:21.0.3 Wavyzz:22.0.0 Wavyzz:21.0.2 Wavyzz:18.0.7 Wavyzz:21.0.1 Wavyzz:21.0.0 Wavyzz:20.0.4 Wavyzz:20.0.3 Wavyzz:20.0.2 Wavyzz:19.0.4 Wavyzz:18.0.6 Wavyzz:20.0.1 Wavyzz:20.0.0 Wavyzz:19.0.3 Wavyzz:19.0.2 Wavyzz:19.0.1 Wavyzz:19.0.0 Wavyzz:18.0.5 Wavyzz:17.0.4 Wavyzz:18.0.4 Wavyzz:18.0.3 Wavyzz:18.0.2 Wavyzz:18.0.1 Wavyzz:18.0.0 Wavyzz:17.0.3 Wavyzz:17.0.2 Wavyzz:17.0.1 Wavyzz:16.0.5 Wavyzz:17.0.0 Wavyzz:16.0.4 Wavyzz:16.0.3 Wavyzz:16.0.2 Wavyzz:16.0.1 Wavyzz:16.0.0 Wavyzz:15.0.3 Wavyzz:15.0.2 Wavyzz:15.0.1 Wavyzz:15.0.0 Wavyzz:14.0.5 Wavyzz:14.0.4 Wavyzz:14.0.3 Wavyzz:13.0.5 Wavyzz:14.0.2 Wavyzz:14.0.1 Wavyzz:14.0.0 Wavyzz:13.0.4 Wavyzz:13.0.3 Wavyzz:13.0.2 Wavyzz:13.0.1 Wavyzz:12.0.5 Wavyzz:13.0.0 Wavyzz:12.0.4 Wavyzz:12.0.3 Wavyzz:12.0.2 Wavyzz:12.0.1 Wavyzz:11.0.5 Wavyzz:12.0.0 Wavyzz:11.0.4 Wavyzz:10.0.7 Wavyzz:11.0.3 Wavyzz:11.0.2 Wavyzz:11.0.1 Wavyzz:11.0.0 Wavyzz:10.0.6 Wavyzz:10.0.5 Wavyzz:10.0.4 Wavyzz:10.0.3 Wavyzz:10.0.2 Wavyzz:10.0.1 Wavyzz:10.0.0 Wavyzz:9.0.4 Wavyzz:8.0.6 Wavyzz:8.0.5 Wavyzz:9.0.3 Wavyzz:9.0.2 Wavyzz:9.0.1 Wavyzz:9.0.0 Wavyzz:7.0.5 Wavyzz:8.0.4 Wavyzz:8.0.3 Wavyzz:7.0.4 Wavyzz:6.0.8 Wavyzz:8.0.2 Wavyzz:8.0.1 Wavyzz:8.0.0 Wavyzz:7.0.3 Wavyzz:7.0.2 Wavyzz:6.0.7 Wavyzz:7.0.1 Wavyzz:6.0.6 Wavyzz:7.0.0 Wavyzz:6.0.5 Wavyzz:6.0.4 Wavyzz:6.0.3 Wavyzz:5.0.7 Wavyzz:6.0.2 Wavyzz:6.0.1 Wavyzz:5.0.6 Wavyzz:6.0.0 Wavyzz:5.0.5 Wavyzz:6.0.0-rc Wavyzz:5.0.4 Wavyzz:6.0.0-beta Wavyzz:5.0.3 Wavyzz:4.0.6 Wavyzz:5.0.2 Wavyzz:5.0.1 Wavyzz:4.0.5 Wavyzz:5.0.0 Wavyzz:4.0.4 Wavyzz:5.0.0-rc2 Wavyzz:5.0.0-rc1 Wavyzz:4.0.3 Wavyzz:3.9.4 Wavyzz:5.0.0-beta Wavyzz:4.0.2 Wavyzz:4.0.1 Wavyzz:4.0.0 Wavyzz:4.0.0-rc2 Wavyzz:3.9.3 Wavyzz:4.0.0-rc Wavyzz:4.0.0-beta Wavyzz:3.9.2 Wavyzz:3.9.1 Wavyzz:3.9.0 Wavyzz:3.8.4 Wavyzz:3.7.4 Wavyzz:3.9.0-rc2 Wavyzz:3.9.0-rc Wavyzz:3.5.8 Wavyzz:3.8.3 Wavyzz:3.7.3 Wavyzz:3.6.6 Wavyzz:3.6.5 Wavyzz:3.7.2 Wavyzz:3.8.2 Wavyzz:3.8.1 Wavyzz:3.8.0 Wavyzz:3.8.0-beta Wavyzz:3.8.beta1_20150712 Wavyzz:3.7.1 Wavyzz:3.6.4 Wavyzz:3.5.7 Wavyzz:3.7.0 Wavyzz:3.6.3 Wavyzz:3.6.2 Wavyzz:3.5.6 Wavyzz:3.7.beta1_20141116 Wavyzz:3.6.1 Wavyzz:3.5.5 Wavyzz:3.6.0 Wavyzz:3.5.4 Wavyzz:3.6.0-beta Wavyzz:3.5.3 Wavyzz:3.6.beta2_20140524 Wavyzz:3.6.beta1_20140514 Wavyzz:3.5.2 Wavyzz:3.6.0-alpha Wavyzz:3.5.1 Wavyzz:3.5.0 Wavyzz:3.4.2 Wavyzz:3.5.beta1_20131120 Wavyzz:3.5.beta1_20131106 Wavyzz:3.4.1 Wavyzz:3.4.0 Wavyzz:3.3.3 Wavyzz:3.3.2 Wavyzz:3.4.beta1_20130502 Wavyzz:3.4.beta1_20130429 Wavyzz:3.3.1 Wavyzz:3.3.0 Wavyzz:3.3.beta2_20120109 Wavyzz:3.3.beta1_20121221 Wavyzz:3.2.3 Wavyzz:3.2.2 Wavyzz:3.2.1 Wavyzz:3.1.3 Wavyzz:3.2.0 Wavyzz:3.1.2 Wavyzz:3.1.1 Wavyzz:3.1.0 Wavyzz:3.0.1 Wavyzz:3.0.0 Wavyzz:2.9.0 Wavyzz:2.8.1

6 Commits
15.0.0 ... 9.0

Author SHA1 Message Date
Laurent Destailleur
90854dc2bf FIX Use the wrong logo size on PDF 2023-07-30 19:53:56 +02:00
Laurent Destailleur
b44ddaa696 FIX Use the wrong logo size on PDF 2023-07-30 18:04:03 +02:00
Laurent Destailleur
4569cb82b2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2022-03-10 15:52:04 +01:00
Laurent Destailleur
04d33f4594 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2022-03-10 15:51:42 +01:00
Laurent Destailleur
af6e95aa79 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-03-10 15:49:51 +01:00
Laurent Destailleur
5d942c9d1a Fix infinit logs 2022-03-10 15:46:00 +01:00
4 changed files with 36 additions and 4 deletions
Expand all files Collapse all files

10
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@@ -1251,9 +1251,17 @@ class pdf_einstein extends ModelePDFCommandes
// Logo
if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
{
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
$logodir = $conf->mycompany->dir_output;
if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
{
$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
}
else {
$logo = $logodir.'/logos/'.$this->emetteur->logo;
}
if (is_readable($logo))
{
$height=pdf_getHeightForLogo($logo);

10
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@@ -1563,9 +1563,17 @@ class pdf_crabe extends ModelePDFFactures
// Logo
if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
{
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
$logodir = $conf->mycompany->dir_output;
if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
{
$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
}
else {
$logo = $logodir.'/logos/'.$this->emetteur->logo;
}
if (is_readable($logo))
{
$height=pdf_getHeightForLogo($logo);

10
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@@ -1453,9 +1453,17 @@ class pdf_azur extends ModelePDFPropales
// Logo
if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
{
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
$logodir = $conf->mycompany->dir_output;
if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
{
$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
}
else {
$logo = $logodir.'/logos/'.$this->emetteur->logo;
}
if (is_readable($logo))
{
$height=pdf_getHeightForLogo($logo);

10
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@@ -1449,9 +1449,17 @@ class pdf_cyan extends ModelePDFPropales
// Logo
if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
{
$logo=$conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
if ($this->emetteur->logo)
{
$logodir = $conf->mycompany->dir_output;
if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
{
$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
}
else {
$logo = $logodir.'/logos/'.$this->emetteur->logo;
}
if (is_readable($logo))
{
$height=pdf_getHeightForLogo($logo);