From d47a78479ece4870c6fa65efc166731415b9ded3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 5 May 2012 23:59:14 +0200 Subject: [PATCH] Fix: several fixes --- .../core/modules/supplier_order/pdf/pdf_muscadet.modules.php | 4 ++-- htdocs/langs/en_US/bills.lang | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index a4af1ae661f..e8fba3d9b46 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -482,14 +482,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $pdf->SetFont('','', $default_font_size - 1); // If France, show VAT mention if not applicable - if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) + /*if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1) { $pdf->SetFont('','B', $default_font_size - 2); $pdf->SetXY($this->marge_gauche, $posy); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $posy=$pdf->GetY()+4; - } + }*/ // Show payments conditions if ($object->cond_reglement_code || $object->cond_reglement) diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 2cbcbcf9f3a..9a89653f89d 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -127,7 +127,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amou ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status BillFrom=From -BillTo=Bill to +BillTo=To ActionsOnBill=Actions on invoice NewBill=New invoice Prélèvements=Standing order