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

Fix: La mention lgale franaise ne doit s'afficher que si emetteur = FR.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-12-11 02:56:14 +00:00
parent 38d873328e
commit 62b8688fee
2 changed files with 77 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -503,9 +503,9 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('Arial','', 9); $pdf->SetFont('Arial','', 9);
/* /*
* Affiche la mention TVA non applicable selon option * If France, show VAT mention if not applicable
*/ */
if ($this->franchise == 1) if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->SetFont('Arial','B',8); $pdf->SetFont('Arial','B',8);
$pdf->SetXY($this->marge_gauche, $posy); $pdf->SetXY($this->marge_gauche, $posy);

14
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Sylvain SCATTOLINI <sylvain@s-infoservices.com> * Copyright (C) 2005 Sylvain SCATTOLINI <sylvain@s-infoservices.com>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> * Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* *
@ -19,7 +19,6 @@
* or see http://www.gnu.org/ * or see http://www.gnu.org/
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -495,9 +494,12 @@ class pdf_oursin extends ModelePDFFactures
$tab2_height = $tab2_hl * 4; $tab2_height = $tab2_hl * 4;
$pdf->SetFont('Arial','', 9); $pdf->SetFont('Arial','', 9);
// Affiche la mention TVA non applicable selon option
$pdf->SetXY ($this->marges['g'], $tab2_top + 0); $pdf->SetXY ($this->marges['g'], $tab2_top + 0);
if ($this->franchise==1)
/*
* If France, show VAT mention if not applicable
*/
if ($this->emetteur->pays_code == 'FR' && $this->franchise == 1)
{ {
$pdf->MultiCell(100, $tab2_hl, $langs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0); $pdf->MultiCell(100, $tab2_hl, $langs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
} }
@ -691,11 +693,11 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetFont('Arial','',7); $pdf->SetFont('Arial','',7);
if (defined("MAIN_INFO_SIREN") && MAIN_INFO_SIREN) if (defined("MAIN_INFO_SIREN") && MAIN_INFO_SIREN)
{ {
$pdf->MultiCell(80, 4, $langs->transcountry("ProfId1",$this->pays_code).": ".MAIN_INFO_SIREN); $pdf->MultiCell(80, 4, $langs->transcountry("ProfId1",$this->emetteur->pays_code).": ".MAIN_INFO_SIREN);
} }
elseif (defined("MAIN_INFO_SIRET") && MAIN_INFO_SIRET) elseif (defined("MAIN_INFO_SIRET") && MAIN_INFO_SIRET)
{ {
$pdf->MultiCell(80, 4, $langs->transcountry("ProfId2",$this->pays_code).": ".MAIN_INFO_SIRET); $pdf->MultiCell(80, 4, $langs->transcountry("ProfId2",$this->emetteur->pays_code).": ".MAIN_INFO_SIRET);
} }