Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.5' into 3.5_backported
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Mar 19, 2014
2 parents 0909950 + 2f10198 commit 4d32223
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View file
Expand Up @@ -421,6 +421,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View file
Expand Up @@ -420,6 +420,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View file
Expand Up @@ -267,6 +267,7 @@ function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hi
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View file
Expand Up @@ -264,6 +264,7 @@ function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hi
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View file
Expand Up @@ -422,6 +422,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View file
Expand Up @@ -379,6 +379,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
3 changes: 3 additions & 0 deletions htdocs/core/modules/project/pdf/pdf_baleine.modules.php
View file
Expand Up @@ -222,12 +222,15 @@ function write_file($object,$outputlangs)
$pdf->MultiCell(20, 3, $dateend, 0, 'L');


$pageposafter=$pdf->getPage();

$pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut
$nexY = $pdf->GetY();

// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/propale/doc/pdf_azur.modules.php
View file
Expand Up @@ -478,6 +478,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
5 changes: 3 additions & 2 deletions htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View file
Expand Up @@ -234,7 +234,7 @@ function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=
$this->posxdiscount+=($this->postotalht - $this->posxdiscount);
//$this->postotalht;
}

// New page
$pdf->AddPage();
if (! empty($tplidx)) $pdf->useTemplate($tplidx);
Expand Down Expand Up @@ -321,7 +321,7 @@ function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=
{
$pdf->commitTransaction();
}

$nexY = $pdf->GetY();
$pageposafter=$pdf->getPage();
$pdf->setPage($pageposbefore);
Expand Down Expand Up @@ -383,6 +383,7 @@ function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down
1 change: 1 addition & 0 deletions htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View file
Expand Up @@ -410,6 +410,7 @@ function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(210,210,210)));
//$pdf->SetDrawColor(190,190,200);
$pdf->line($this->marge_gauche, $nexY+1, $this->page_largeur - $this->marge_droite, $nexY+1);
Expand Down

0 comments on commit 4d32223

Please sign in to comment.