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

Restore border into PDF

Browse Source
This commit is contained in:
Laurent Destailleur 2012-10-11 09:42:47 +02:00
parent 8162dd301b
commit 6046feda11
8 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commondocgenerator.class.php
View File

@ -173,13 +173,13 @@ abstract class CommonDocGenerator
* @param float $y Ordinate of first point
* @param float $l ??
* @param float $h ??
* @param int $hidetop Hide top
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom
* @return void
*/
function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
{
if (empty($hidetop)) $pdf->line($x, $y, $x+$l, $y);
if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
$pdf->line($x+$l, $y, $x+$l, $y+$h);
if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
$pdf->line($x, $y+$h, $x, $y);

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

@ -812,6 +812,10 @@ class pdf_einstein extends ModelePDFCommandes
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)

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

@ -353,6 +353,10 @@ class pdf_expedition_rouget extends ModelePdfExpedition
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)

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

@ -940,7 +940,7 @@ class pdf_crabe extends ModelePDFFactures
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom bar of array
* @return void
*/
@ -948,6 +948,10 @@ class pdf_crabe extends ModelePDFFactures
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
@ -1097,11 +1101,11 @@ class pdf_crabe extends ModelePDFFactures
$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : " . $outputlangs->convToOutputCharset($object->ref), '', 'R');
$posy+=1;
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetFont('','', $default_font_size - 2);
if ($object->ref_client)
{
$posy+=5;
$posy+=4;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
@ -1113,7 +1117,7 @@ class pdf_crabe extends ModelePDFFactures
$objectreplacing=new Facture($this->db);
$objectreplacing->fetch($objectidnext);
$posy+=4;
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
@ -1133,7 +1137,7 @@ class pdf_crabe extends ModelePDFFactures
$objectreplaced=new Facture($this->db);
$objectreplaced->fetch($object->fk_facture_source);
$posy+=4;
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CorrectionInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
@ -1146,7 +1150,7 @@ class pdf_crabe extends ModelePDFFactures
if ($object->type != 2)
{
$posy+=4;
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEcheance")." : " . dol_print_date($object->date_lim_reglement,"day",false,$outputlangs,true), '', 'R');
@ -1154,13 +1158,13 @@ class pdf_crabe extends ModelePDFFactures
if ($object->client->code_client)
{
$posy+=4;
$posy+=3;
$pdf->SetXY($posx,$posy);
$pdf->SetTextColor(0,0,60);
$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : " . $outputlangs->transnoentities($object->client->code_client), '', 'R');
}
$posy+=2;
$posy+=1;
// Show list of linked objects
$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);

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

@ -360,6 +360,11 @@ class pdf_soleil extends ModelePDFFicheinter
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
/*
$pdf->SetXY($this->marge_gauche, $tab_top);

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

@ -863,6 +863,11 @@ class pdf_azur extends ModelePDFPropales
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)

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

@ -633,6 +633,10 @@ if ($pageposafter > $pageposbefore) {
{
global $conf;
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)

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

@ -812,7 +812,11 @@ if ($pageposafter > $pageposbefore) {
{
global $conf;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Force to disable hidetop and hidebottom
$hidebottom=0;
if ($hidetop) $hidetop=-1;
$default_font_size = pdf_getPDFFontSize($outputlangs);
// Amount in (at tab_top - 1)
$pdf->SetTextColor(0,0,0);