lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: several fixes

Browse Source
This commit is contained in:
Laurent Destailleur 2012-05-05 23:59:14 +02:00
parent 33b9c5af45
commit 5ea6b99593
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -478,14 +478,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
// If France, show VAT mention if not applicable // 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->SetFont('','B', $default_font_size - 2);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
$posy=$pdf->GetY()+4; $posy=$pdf->GetY()+4;
} }*/
// Show payments conditions // Show payments conditions
if ($object->cond_reglement_code || $object->cond_reglement) if ($object->cond_reglement_code || $object->cond_reglement)

2
htdocs/langs/en_US/bills.lang
View File

@ -127,7 +127,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amou
ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount 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 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
BillFrom=From BillFrom=From
BillTo=Bill to BillTo=To
ActionsOnBill=Actions on invoice ActionsOnBill=Actions on invoice
NewBill=New invoice NewBill=New invoice
Prélèvements=Standing order Prélèvements=Standing order