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

Fix: When company name is too long, wrapping overwrite address.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-02-26 14:27:19 +01:00
parent 8c09d4dcbb
commit 16ad5452b6
13 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/commande/doc/pdf_edison.modules.php
View File

@ -611,7 +611,7 @@ class pdf_edison extends ModelePDFCommandes
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -620,7 +620,7 @@ class pdf_edison extends ModelePDFCommandes
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -982,7 +982,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -991,7 +991,7 @@ class pdf_einstein extends ModelePDFCommandes
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }
} }

27
htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
View File

@ -42,7 +42,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
/** /**
* Constructor * Constructor
* *
* @param DoliDB $DB Database handler * @param DoliDB $db Database handler
*/ */
function pdf_expedition_merou($db=0) function pdf_expedition_merou($db=0)
{ {
@ -72,10 +72,11 @@ Class pdf_expedition_merou extends ModelePdfExpedition
/** /**
* \brief Fonction generant le document sur le disque * Fonction generant le document sur le disque
* \param object Objet expedition a generer (ou id si ancienne methode) *
* \param outputlangs Lang output object * @param object Objet expedition a generer (ou id si ancienne methode)
* \return int 1=ok, 0=ko * @param outputlangs Lang output object
* @return int 1=ok, 0=ko
*/ */
function write_file(&$object, $outputlangs) function write_file(&$object, $outputlangs)
{ {
@ -200,8 +201,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
// Description de la ligne produit // Description de la ligne produit
//Creation des cases a cocher //Creation des cases a cocher
$pdf->rect(10+3, $curY+1, 3, 3); $pdf->Rect(10+3, $curY+1, 3, 3);
$pdf->rect(20+3, $curY+1, 3, 3); $pdf->Rect(20+3, $curY+1, 3, 3);
//Insertion de la reference du produit //Insertion de la reference du produit
$pdf->SetXY(30, $curY+1 ); $pdf->SetXY(30, $curY+1 );
$pdf->SetFont('','B', $default_font_size - 3); $pdf->SetFont('','B', $default_font_size - 3);
@ -400,7 +401,7 @@ Class pdf_expedition_merou extends ModelePdfExpedition
//Num Expedition //Num Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$Xoff = 142; $Xoff = 142;
//$pdf->rect($Xoff, $Yoff, 85, 8); //$pdf->Rect($Xoff, $Yoff, 85, 8);
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
@ -542,20 +543,20 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$blW=50; $blW=50;
$Yoff = $Ydef +1; $Yoff = $Ydef +1;
$pdf->Rect($blDestX, $Yoff-1, $blW, 26); // Show recipient frame
//Titre
$pdf->SetFont('','B', $default_font_size - 3); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff-4); $pdf->SetXY($blDestX,$Yoff-4);
$pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L'); $pdf->MultiCell($blW,3, $outputlangs->transnoentities("Recipient"), 0, 'L');
$pdf->Rect($blDestX, $Yoff-1, $blW, 26);
// Show customer/recipient // Show recipient name
$pdf->SetFont('','B', $default_font_size - 3); $pdf->SetFont('','B', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff); $pdf->SetXY($blDestX,$Yoff);
$pdf->MultiCell($blW,3, $carac_client_name, 0, 'L'); $pdf->MultiCell($blW,3, $carac_client_name, 0, 'L');
// Show recipient information
$pdf->SetFont('','', $default_font_size - 3); $pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff+4); $pdf->SetXY($blDestX,$Yoff+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($blW,2, $carac_client, 0, 'L'); $pdf->MultiCell($blW,2, $carac_client, 0, 'L');
} }
} }

4
htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
View File

@ -517,7 +517,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(80, 4, $outputlangs->transnoentities("Recipient").":", 0, 'L'); $pdf->MultiCell(80, 4, $outputlangs->transnoentities("Recipient").":", 0, 'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
// Show recipient name // Show recipient name
@ -527,7 +527,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

12
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
@ -22,7 +22,7 @@
/** /**
* \file htdocs/core/modules/facture/doc/pdf_crabe.modules.php * \file htdocs/core/modules/facture/doc/pdf_crabe.modules.php
* \ingroup facture * \ingroup facture
* \brief File of class to generate customers invoices from crab model * \brief File of class to generate customers invoices from crabe model
*/ */
require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php"); require_once(DOL_DOCUMENT_ROOT."/core/modules/facture/modules_facture.php");
@ -33,10 +33,8 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/** /**
* \class pdf_crabe * Class to manage PDF invoice template Crabe
* \brief Classe permettant de generer les factures au modele Crabe
*/ */
class pdf_crabe extends ModelePDFFactures class pdf_crabe extends ModelePDFFactures
{ {
var $db; var $db;
@ -1222,7 +1220,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -1231,7 +1229,7 @@ class pdf_crabe extends ModelePDFFactures
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }
} }

4
htdocs/core/modules/facture/doc/pdf_oursin.modules.php
View File

@ -905,7 +905,7 @@ class pdf_oursin extends ModelePDFFactures
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -914,7 +914,7 @@ class pdf_oursin extends ModelePDFFactures
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }

10
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -41,10 +41,10 @@ class pdf_soleil extends ModelePDFFicheinter
var $name; var $name;
var $description; var $description;
var $type; var $type;
var $phpmin = array(4,3,0); // Minimum version of PHP required by module var $phpmin = array(4,3,0); // Minimum version of PHP required by module
var $version = 'dolibarr'; var $version = 'dolibarr';
var $page_largeur; var $page_largeur;
var $page_hauteur; var $page_hauteur;
var $format; var $format;
@ -299,7 +299,7 @@ class pdf_soleil extends ModelePDFFicheinter
} }
} }
} }
// Show square // Show square
if ($pagenb == 1) if ($pagenb == 1)
{ {
@ -556,7 +556,7 @@ class pdf_soleil extends ModelePDFFicheinter
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
// Show recipient name // Show recipient name
@ -566,7 +566,7 @@ class pdf_soleil extends ModelePDFFicheinter
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(100,4, $carac_client, 0, 'L'); $pdf->MultiCell(100,4, $carac_client, 0, 'L');
} }
} }

2
htdocs/core/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@ -395,7 +395,7 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
$pdf->SetFont('','B', $default_font_size); $pdf->SetFont('','B', $default_font_size);
$pdf->SetXY(102,47); $pdf->SetXY(102,47);
$pdf->MultiCell(96,5, $carac_client, 0, 'L'); $pdf->MultiCell(96,5, $carac_client, 0, 'L');
$pdf->rect(100, 40, 100, 40); $pdf->Rect(100, 40, 100, 40);
$pdf->SetTextColor(0,0,60); $pdf->SetTextColor(0,0,60);

2
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -617,7 +617,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("DeliveryAddress").":", 0, 'L');
// Cadre client destinataire // Cadre client destinataire
$pdf->rect(100, $posy, 100, $hautcadre); $pdf->Rect(100, $posy, 100, $hautcadre);
// If SHIPPING contact defined on invoice, we use it // If SHIPPING contact defined on invoice, we use it
$usecontact=false; $usecontact=false;

4
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -1031,7 +1031,7 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
// Show recipient name // Show recipient name
@ -1041,7 +1041,7 @@ class pdf_azur extends ModelePDFPropales
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(100,4, $carac_client, 0, 'L'); $pdf->MultiCell(100,4, $carac_client, 0, 'L');
} }
} }

4
htdocs/core/modules/propale/doc/pdf_jaune.modules.php
View File

@ -1031,7 +1031,7 @@ class pdf_jaune extends ModelePDFPropales
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx,$posy-5); $pdf->SetXY($posx,$posy-5);
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L'); $pdf->MultiCell(100, 4, $outputlangs->transnoentities("BillTo").":", 0, 'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
// Show recipient name // Show recipient name
@ -1041,7 +1041,7 @@ class pdf_jaune extends ModelePDFPropales
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(100,4, $carac_client, 0, 'L'); $pdf->MultiCell(100,4, $carac_client, 0, 'L');
} }
} }

4
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -893,7 +893,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -902,7 +902,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }
} }

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

@ -975,7 +975,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->SetFont('','', $default_font_size - 2); $pdf->SetFont('','', $default_font_size - 2);
$pdf->SetXY($posx+2,$posy-5); $pdf->SetXY($posx+2,$posy-5);
$pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L'); $pdf->MultiCell(80,5, $outputlangs->transnoentities("BillTo").":",0,'L');
$pdf->rect($posx, $posy, 100, $hautcadre); $pdf->Rect($posx, $posy, 100, $hautcadre);
// Show recipient name // Show recipient name
$pdf->SetXY($posx+2,$posy+3); $pdf->SetXY($posx+2,$posy+3);
@ -984,7 +984,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
// Show recipient information // Show recipient information
$pdf->SetFont('','', $default_font_size - 1); $pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+8); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell(86,4, $carac_client, 0, 'L'); $pdf->MultiCell(86,4, $carac_client, 0, 'L');
} }
} }