Skip to content

Commit

Permalink
git push origin 3.7Merge branch 'marcosgdf-bug-3383' into 3.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Sep 3, 2015
2 parents 7009c6b + 54214cf commit 846899d
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 14 deletions.
1 change: 1 addition & 0 deletions ChangeLog
View file
Expand Up @@ -25,6 +25,7 @@ FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
FIX [ bug #3431 ] Invoice bank account is not respected
FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it
FIX [ bug #3358 ] Tasks box does not work with PostgreSQL
FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models

NEW: Created new ContratLigne::insert function

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View file
Expand Up @@ -1259,9 +1259,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View file
Expand Up @@ -1219,9 +1219,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/contract/doc/pdf_strato.modules.php
View file
Expand Up @@ -647,9 +647,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $this->recipient->name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($this->recipient->name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
}
Expand Down
8 changes: 5 additions & 3 deletions htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View file
Expand Up @@ -652,9 +652,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetXY($blDestX,$Yoff);
$pdf->MultiCell($blW,3, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY($blDestX,$Yoff+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($blW,2, $carac_client, 0, 'L');
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
}
4 changes: 3 additions & 1 deletion htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View file
Expand Up @@ -674,9 +674,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
6 changes: 4 additions & 2 deletions htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View file
Expand Up @@ -1506,11 +1506,13 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
// Show recipient name
$pdf->SetXY($posx+2,$posy+3);
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View file
Expand Up @@ -643,9 +643,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
}
Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
View file
Expand Up @@ -854,9 +854,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/propale/doc/pdf_azur.modules.php
View file
Expand Up @@ -1389,9 +1389,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}

Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View file
Expand Up @@ -1044,9 +1044,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
}
Expand Down
4 changes: 3 additions & 1 deletion htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View file
Expand Up @@ -1098,9 +1098,11 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
$pdf->SetFont('','B', $default_font_size);
$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');

$posy = $pdf->getY();

// Show recipient information
$pdf->SetFont('','', $default_font_size - 1);
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->SetXY($posx+2,$posy);
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
}
}
Expand Down

0 comments on commit 846899d

Please sign in to comment.