This commit is contained in:
Laurent Destailleur 2012-03-18 02:22:54 +01:00
parent dc86095c06
commit 96e9e088e3
7 changed files with 29 additions and 14 deletions

View File

@ -210,22 +210,22 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->Rect(10+3, $curY+1, 3, 3);
$pdf->Rect(20+3, $curY+1, 3, 3);
//Insertion de la reference du produit
$pdf->SetXY(30, $curY+1 );
$pdf->SetXY(30, $curY+1);
$pdf->SetFont('','B', $default_font_size - 3);
$pdf->MultiCell(24, 3, $outputlangs->convToOutputCharset($object->lines[$i]->ref), 0, 'L', 0);
//Insertion du libelle
$pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY(50, $curY+1 );
$pdf->SetXY(50, $curY+1);
//$libelleproduitservice=pdf_getlinedesc($object->$origin,$i,$outputlangs);
$libelleproduitservice = pdf_writelinedesc($pdf,$object->$origin,$i,$outputlangs,90,3,50,$curY+1,1);
//$pdf->writeHTMLCell(90, 3, 50, $curY+1, $outputlangs->convToOutputCharset($libelleproduitservice), 0, 'L', 0);
//Insertion de la quantite commandee
$pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY(140, $curY+1 );
$pdf->SetXY(140, $curY+1);
$pdf->MultiCell(30, 3, $object->lines[$i]->qty_asked, 0, 'C', 0);
//Insertion de la quantite a envoyer
$pdf->SetFont('','', $default_font_size - 3);
$pdf->SetXY(170, $curY+1 );
$pdf->SetXY(170, $curY+1);
$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
//Generation de la page 2

View File

@ -27,13 +27,16 @@ require_once(DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php');
/**
* \class ModeleShippingMethod
* \brief Parent class for shipping method classes
* Parent class for shipping method classes
*/
class ModeleShippingMethod
{
function ModeleShippingMethod($db=0)
/**
* Constructo
*
* @param DoliDB $db Database handler
*/
function ModeleShippingMethod($db)
{
$this->db = $db;
$this->name = "NOT DEFINED";

View File

@ -22,7 +22,9 @@
*/
include_once "methode_expedition.modules.php";
/**
* Class to manage shipment Colsui
*/
class methode_expedition_colsui extends ModeleShippingMethod
{
/**

View File

@ -22,6 +22,9 @@
include_once "methode_expedition.modules.php";
/**
* Class to manage shipment Enl
*/
class methode_expedition_enl extends ModeleShippingMethod
{
/**

View File

@ -23,6 +23,9 @@
include_once "methode_expedition.modules.php";
/**
* Class to manage shipment lettremax
*/
class methode_expedition_lettremax extends ModeleShippingMethod
{
/**

View File

@ -22,6 +22,9 @@
include_once "methode_expedition.modules.php";
/**
* Class to manage shipment Trans
*/
class methode_expedition_trans extends ModeleShippingMethod
{

View File

@ -62,11 +62,12 @@ class ModelePDFCards
/**
* Cree un fichier de cartes de visites en fonction du modele de ADHERENT_CARDS_ADDON_PDF
* @param db Database handler
* @param arrayofmembers Array of members
* @param modele Force modele to use ('' to not force)
* @param outputlangs Objet langs to use for translation
* @return int <0 if KO, >0 if OK
*
* @param DoliDB $db Database handler
* @param array $arrayofmembers Array of members
* @param string $modele Force modele to use ('' to not force)
* @param Translate $outputlangs Objet langs to use for translation
* @return int <0 if KO, >0 if OK
*/
function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs)
{