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

Fix: UTF encoding on PDF company if there is no logo.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-02-18 18:18:34 +00:00
parent 6409ef3467
commit 0060695c1b
11 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/admin/company.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -274,11 +274,14 @@ if ((isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<table width="100%" class="notopnoleftnoright"><tr><td valign="center">'; print '<table width="100%" class="notopnoleftnoright"><tr><td valign="center">';
print '<input type="file" class="flat" name="logo" size="50">'; print '<input type="file" class="flat" name="logo" size="50">';
print '</td><td valign="middle" align="right">'; print '</td><td valign="middle" align="right">';
if ($mysoc->logo_mini && file_exists($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_mini)) if ($mysoc->logo_mini)
{ {
print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>'; print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
print ' &nbsp; '; if (file_exists($conf->societe->dir_logos.'/thumbs/'.$mysoc->logo_mini))
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">'; {
print ' &nbsp; ';
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_mini).'">';
}
} }
else else
{ {

2
htdocs/contact/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2007 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be> * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>

5
htdocs/includes/modules/commande/pdf_edison.modules.php
View File

@ -395,9 +395,10 @@ class pdf_edison extends ModelePDFCommandes
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
} }
else if (defined("FAC_PDF_INTITULE")) else
{ {
$pdf->MultiCell(100, 4, FAC_PDF_INTITULE, 0, 'L'); $text=$this->emetteur->nom;
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('Arial','B',13); $pdf->SetFont('Arial','B',13);

5
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -752,9 +752,10 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
} }
else if (defined("FAC_PDF_INTITULE")) else
{ {
$pdf->MultiCell(100, 4, FAC_PDF_INTITULE, 0, 'L'); $text=$this->emetteur->nom;
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('Arial','B',13); $pdf->SetFont('Arial','B',13);

6
htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
View File

@ -355,7 +355,11 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
} }
} }
else $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->nom), 0, 'L'); else
{
$text=$this->emetteur->nom;
$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($text), 0, 'L');
}
//*********************Entete**************************** //*********************Entete****************************
//Nom du Document //Nom du Document

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

@ -925,9 +925,10 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
} }
else if (defined("FAC_PDF_INTITULE")) else
{ {
$pdf->MultiCell(100, 4, FAC_PDF_INTITULE, 0, 'L'); $text=$this->emetteur->nom;
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('Arial','B',13); $pdf->SetFont('Arial','B',13);

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

@ -810,9 +810,10 @@ class pdf_oursin extends ModelePDFFactures
$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
} }
else if (defined("FAC_PDF_INTITULE")) else
{ {
$pdf->MultiCell(80, 6, FAC_PDF_INTITULE, 0, 'L'); $text=$this->emetteur->nom;
$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }

1
htdocs/includes/modules/propale/modules_propale.php
View File

@ -59,6 +59,7 @@ class ModelePDFPropales extends FPDF
$sql.=" FROM ".MAIN_DB_PREFIX."document_model"; $sql.=" FROM ".MAIN_DB_PREFIX."document_model";
$sql.=" WHERE type = '".$type."'"; $sql.=" WHERE type = '".$type."'";
dolibarr_syslog("modules_propale::liste_modeles sql=".$sql, LOG_DEBUG);
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {

5
htdocs/includes/modules/propale/pdf_propale_azur.modules.php
View File

@ -779,9 +779,10 @@ class pdf_propale_azur extends ModelePDFPropales
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L'); $pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
} }
} }
else if (defined("FAC_PDF_INTITULE")) else
{ {
$pdf->MultiCell(100, 4, FAC_PDF_INTITULE, 0, 'L'); $text=$this->emetteur->nom;
$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
} }
$pdf->SetFont('Arial','B',13); $pdf->SetFont('Arial','B',13);

2
mysql/migration/2.5.0-2.6.0.sql
View File

@ -79,6 +79,8 @@ delete from llx_categorie_association where fk_categorie_mere = fk_categorie_fil
alter table llx_societe add price_level tinyint(4) NULL; alter table llx_societe add price_level tinyint(4) NULL;
delete from llx_document_model where nom = 'huitre' and type = 'invoice';
-- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet); -- V4.1 delete from llx_projet_task where fk_projet not in (select rowid from llx_projet);
-- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid); -- V4.1 ALTER TABLE llx_projet_task ADD CONSTRAINT fk_projet_task_fk_projet FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);