From e013fa01a7abb7ff91eb5a96ddf44302967efffc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 29 Oct 2012 11:38:32 +0100
Subject: [PATCH] Fix: Revert direction of option (this information is a legal
issue for most countries). Also, i removed the mandatory test, this is
required for invoices, not proposals. So now, there is no need to hide by
default because test on invoice setup has been removed, so we can show by
default (if defined) and use option to force to hide if we want.
---
htdocs/core/modules/propale/doc/pdf_azur.modules.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 101deb1e4cd..b5109ab8b8a 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -494,7 +494,7 @@ class pdf_azur extends ModelePDFPropales
}
// Show shipping date
- if (isset($object->type) && $object->type != 2 && $object->date_livraison)
+ if ($object->date_livraison)
{
$outputlangs->load("sendings");
$pdf->SetFont('','B', $default_font_size - 2);
@@ -508,7 +508,7 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+1;
}
- elseif (isset($object->type) && $object->type != 2 && ($object->availability_code || $object->availability)) // Show availability conditions
+ elseif ($object->availability_code || $object->availability) // Show availability conditions
{
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
@@ -525,7 +525,7 @@ class pdf_azur extends ModelePDFPropales
}
// Show payments conditions
- if (! empty($conf->global->PROPALE_PDF_PAIEMENT_ENABLED) && ($object->cond_reglement_code || $object->cond_reglement))
+ if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTERMCOND) && ($object->cond_reglement_code || $object->cond_reglement))
{
$pdf->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy);
@@ -541,10 +541,10 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+3;
}
-
- if (! empty($conf->global->PROPALE_PDF_PAIEMENT_ENABLED))
+ if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTERMCOND))
{
// Check a payment mode is defined
+ /* Not required on a proposal
if (empty($object->mode_reglement_code)
&& ! $conf->global->FACTURE_CHQ_NUMBER
&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -557,6 +557,7 @@ class pdf_azur extends ModelePDFPropales
$posy=$pdf->GetY()+1;
}
+ */
// Show payment mode
if ($object->mode_reglement_code
--
GitLab