Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Uniformize code and remove useless function

Browse Source
This commit is contained in:
Laurent Destailleur
2010-02-24 16:25:34 +00:00
parent 9a2a1f6c06
commit d08e058726
23 changed files with 662 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/includes/modules/livraison/modules_livraison.php
View File

@@ -33,21 +33,13 @@ require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
/**
\class ModelePDFDeliveryOrder
\brief Classe mere des modeles de bon de livraison
* \class ModelePDFDeliveryOrder
* \brief Classe mere des modeles de bon de livraison
*/
class ModelePDFDeliveryOrder extends FPDF
class ModelePDFDeliveryOrder
{
var $error='';
/**
\brief Renvoi le dernier message d'erreur de creation de PDF de bon de livraison
*/
function pdferror()
{
return $this->error;
}
/**
* \brief Renvoi la liste des modeles actifs
*/
@@ -211,7 +203,7 @@ function delivery_order_pdf_create($db, $deliveryid, $modele='', $outputlangs=''
{
$outputlangs->charset_output=$sav_charset_output;
dol_syslog("Erreur dans delivery_order_pdf_create");
dol_print_error($db,$obj->pdferror());
dol_print_error($db,$obj->error);
return 0;
}
}

9
htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
View File

@@ -73,15 +73,6 @@ class pdf_sirocco extends ModelePDFDeliveryOrder
}
/** \brief Renvoi derniere erreur
* \return string Derniere erreur
*/
function pdferror()
{
return $this->error;
}
/**
* \brief Fonction generant le bon de livraison sur le disque
* \param delivery Object livraison a generer

42
htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
View File

@@ -93,14 +93,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->atleastonediscount=0;
}
/**
* \brief Renvoi dernere erreur
* \return string Derniere erreur
*/
function pdferror()
{
return $this->error;
}
/**
* \brief Fonction generant le bon de livraison sur le disque
@@ -364,62 +356,62 @@ class pdf_typhon extends ModelePDFDeliveryOrder
* Pied de page
*/
$this->_pagefoot($pdf,$object,$outputlangs);
// Check product remaining to be delivered
$waitingDelivery = $object->getRemainingDelivered();
if (is_array($waitingDelivery) & !empty($waitingDelivery))
{
$pdf->AddPage('P', 'A4');
$this->_pagehead($pdf, $object, 1, $outputlangs);
$pdf-> SetY(90);
$w=array(40,100,50);
$header=array($outputlangs->transnoentities('Reference'),
$outputlangs->transnoentities('Label'),
$outputlangs->transnoentities('Qty')
);
// Header
for($i=0;$i<count($header);$i++)
{
$pdf->Cell($w[$i],7,$header[$i],1,0,'C');
}
$pdf->Ln();
$pdf->Ln();
// Data
foreach($waitingDelivery as $value)
{
$pdf->Cell($w[0], 6, $value['ref'], 1, 0, 'L');
$pdf->Cell($w[1], 6, $value['label'], 1, 0, 'L');
$pdf->Cell($w[2], 6, $value['qty'], 1, 1, 'R');
$pdf->Cell($w[2], 6, $value['qty'], 1, 1, 'R');
if ($pdf->GetY() > 250)
{
$this->_pagefoot($pdf,$object,$outputlangs);
$pdf->AddPage('P', 'A4');
$pdf->SetFont('Arial','', 9);
$this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf-> SetY(40);
for($i=0;$i<count($header);$i++)
{
$pdf->Cell($w[$i],7,$header[$i],1,0,'C');
}
$pdf->Ln();
}
$pdf->Ln();
}
}
$this->_pagefoot($pdf,$object,$outputlangs);
}
$pdf->AliasNbPages();
$pdf->Close();