From 9b75610f9f2caf06af3930598d0297bd068ed971 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 26 Nov 2024 13:14:39 +0100 Subject: [PATCH 1/3] More complete test to show the mention "VATIsNotUsedForInvoice" --- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_octopus.modules.php | 2 +- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 6594616134bc1..0fdcf740020d8 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1228,7 +1228,7 @@ protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlan } // If France, show VAT mention if not applicable - if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) { + if ($this->emetteur->country_code == 'FR' && empty($object->total_tva) && (empty($mysoc->tva_assuj) || ($this->emetteur->isInEEC() && $object->thirdparty->isInEEC()))) { $pdf->SetFont('', 'B', $default_font_size - 2); $pdf->SetXY($this->marge_gauche, $posy); if ($mysoc->forme_juridique_code == 92) { diff --git a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php index afaad9a39af63..06fa8d0c9d53d 100644 --- a/htdocs/core/modules/facture/doc/pdf_octopus.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_octopus.modules.php @@ -1395,7 +1395,7 @@ protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs, $outputlan } // If France, show VAT mention if not applicable - if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) { + if ($this->emetteur->country_code == 'FR' && empty($object->total_tva) && (empty($mysoc->tva_assuj) || ($this->emetteur->isInEEC() && $object->thirdparty->isInEEC()))) { $pdf->SetFont('', 'B', $default_font_size - 2); $pdf->SetXY($this->marge_gauche, $posy); if ($mysoc->forme_juridique_code == 92) { diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 7fb66eb5ae38f..f4f29b0edbdd3 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -1328,7 +1328,7 @@ protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs, $outputlan } // If France, show VAT mention if not applicable - if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) { + if ($this->emetteur->country_code == 'FR' && empty($object->total_tva) && (empty($mysoc->tva_assuj) || ($this->emetteur->isInEEC() && $object->thirdparty->isInEEC()))) { $pdf->SetFont('', '', $default_font_size - 2); $pdf->SetXY($this->marge_gauche, $posy); if ($mysoc->forme_juridique_code == 92) { From 0e02209ad33b04aaf8c9076d1c84955b57eb1aa5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 26 Nov 2024 13:53:10 +0100 Subject: [PATCH 2/3] CSS Test --- htdocs/theme/eldy/global.inc.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index cae8a3a0ca142..42597b8e483e8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4277,7 +4277,16 @@ table.noborder { background: var(--colorbacktabcard1); } -.fichehalfright table.noborder , .fichehalfleft table.noborder{ + +.firstcolumn .div-table-responsive-no-min, .secondcolumn .div-table-responsive-no-min { + overflow-x: unset; +} +.firstcolumn table.noborder, .secondcolumn table.noborder { + box-shadow: 5px 5px 5px #f0f0f0; +} + + +.fichehalfright table.noborder, .fichehalfleft table.noborder { margin: 0px 0px 0px 0px; } table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) { From 4d3a42a219833a69cd8c47b8ed27f791023deb77 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 26 Nov 2024 16:34:17 +0100 Subject: [PATCH 3/3] Debug v21 --- htdocs/admin/security_other.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index 7b412be5824e0..017194f70c4f7 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -167,7 +167,8 @@ print ''; print ''.$langs->trans("SessionTimeOut").''; if (ini_get("session.gc_probability") == 0) { - print $form->textwithpicto('', $langs->trans("SessionsPurgedByExternalSystem", ini_get("session.gc_maxlifetime"))); + // For external cleaning of session, the delay used may be the one into the ini file, so get_cfg_var("session.gc_maxlifetime"), not the one overloaded in runtime. + print $form->textwithpicto('', $langs->trans("SessionsPurgedByExternalSystem", get_cfg_var("session.gc_maxlifetime"))); } else { print $form->textwithpicto('', $langs->trans("SessionExplanation", ini_get("session.gc_probability"), ini_get("session.gc_divisor"), ini_get("session.gc_maxlifetime"))); }